SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1266 from spring-operator/polish-urls-remaining-master

Browse Source 
URL Cleanup
This commit is contained in:
Marcin Grzejszczak
2019-03-29 11:45:59 +01:00
committed by GitHub
parent 7351cfa6f2 17fc38aa98
commit 79767c32ea
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleController.java
View File

@@ -38,13 +38,13 @@ public class SampleController {
@RequestMapping("/")
public String hi() throws InterruptedException {
Thread.sleep(this.random.nextInt(1000));
String s = this.restTemplate.getForObject("http://zipkin/hi2", String.class);
String s = this.restTemplate.getForObject("https://zipkin/hi2", String.class);
return "hi/" + s;
}
@RequestMapping("/call")
public String traced() {
String s = this.restTemplate.getForObject("http://zipkin/call", String.class);
String s = this.restTemplate.getForObject("https://zipkin/call", String.class);
return "call/" + s;
}

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/sockjs-0.3.4.js
View File

@@ -289,7 +289,7 @@ SockJS = (function () {
return (p + utils.random_number(max)).slice(-t);
};
// Assuming that url looks like: http://asdasd:111/asd
// Assuming that url looks like: https://asdasd:111/asd
utils.getOrigin = function (url) {
url += '/';
var parts = url.split('/').slice(0, 3);
@@ -383,7 +383,7 @@ SockJS = (function () {
throw new Error('Only basic urls are supported in SockJS');
}
// '//abc' --> 'http://abc'
// '//abc' --> 'https://abc'
if (url.indexOf('//') === 0) {
url = dl.protocol + url;
}