diff --git a/CHANGELOG.md b/CHANGELOG.md index 500fed55..82d0e87b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,4 +7,5 @@ - [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260) - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262) - [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263) -- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272) \ No newline at end of file +- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272) +- [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1274) \ No newline at end of file diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-callee-service/src/main/java/com/tencent/cloud/lane/callee/LaneRouterCalleeController.java b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-callee-service/src/main/java/com/tencent/cloud/lane/callee/LaneRouterCalleeController.java index 9ff9f0d4..d10859db 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-callee-service/src/main/java/com/tencent/cloud/lane/callee/LaneRouterCalleeController.java +++ b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-callee-service/src/main/java/com/tencent/cloud/lane/callee/LaneRouterCalleeController.java @@ -59,8 +59,8 @@ public class LaneRouterCalleeController { */ @GetMapping("/sum") public String sum(@RequestParam int value1, @RequestParam int value2) { - LOG.info("Lane {} Callee Service [{}:{}] is called and sum is [{}].", lane, ip, port, value1 + value2); - return String.format("Lane %s Callee Service [%s:%s] is called and sum is [%s].", lane, ip, port, value1 + value2); + LOG.info("Lane [{}] Callee Service [{} - {}:{}] is called and sum is [{}].", lane, appName, ip, port, value1 + value2); + return String.format("Lane [%s] Callee Service [%s - %s:%s] is called and sum is [%s].", lane, appName, ip, port, value1 + value2); } /** @@ -69,8 +69,8 @@ public class LaneRouterCalleeController { */ @GetMapping("/info") public String info() { - LOG.info("Lane {} [{}] Service [{}:{}] is called.", lane, appName, ip, port); - return String.format("Lane %s [%s] Service [%s:%s] is called.", lane, appName, ip, port); + LOG.info("Lane [{}] Service [{} - {}:{}] is called.", lane, appName, ip, port); + return String.format("Lane [%s] Service [%s - %s:%s] is called.", lane, appName, ip, port); } /** @@ -85,7 +85,7 @@ public class LaneRouterCalleeController { throws UnsupportedEncodingException { LOG.info(URLDecoder.decode(metadataStr, UTF_8)); metadataStr = URLDecoder.decode(metadataStr, UTF_8); - return String.format("Lane %s: %s", lane, metadataStr); + return String.format("Lane [%s]: %s", lane, metadataStr); } } diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-caller-service/src/main/java/com/tencent/cloud/lane/caller/LaneRouterCallerController.java b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-caller-service/src/main/java/com/tencent/cloud/lane/caller/LaneRouterCallerController.java index 6384a5fa..90f990db 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-caller-service/src/main/java/com/tencent/cloud/lane/caller/LaneRouterCallerController.java +++ b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-caller-service/src/main/java/com/tencent/cloud/lane/caller/LaneRouterCallerController.java @@ -66,7 +66,7 @@ public class LaneRouterCallerController { @GetMapping("/feign") public String feign(@RequestParam int value1, @RequestParam int value2) { String value = quickstartCalleeService.sum(value1, value2); - return String.format("Lane %s Caller Service %s: %s", lane, appName, value); + return String.format("Lane [%s] Caller Service [%s - %s:%s] -> %s", lane, appName, ip, port, value); } /** @@ -75,8 +75,8 @@ public class LaneRouterCallerController { */ @GetMapping("/rest") public String rest() { - String value = restTemplate.getForObject("http://QuickstartCalleeService/quickstart/callee/info", String.class); - return String.format("Lane %s Caller Service %s: %s", lane, appName, value); + String value = restTemplate.getForObject("http://LaneCalleeService/lane/callee/info", String.class); + return String.format("Lane [%s] Caller Service [%s - %s:%s] -> %s", lane, appName, ip, port, value); } /** @@ -99,8 +99,8 @@ public class LaneRouterCallerController { */ @GetMapping("/info") public String info() { - LOG.info("Lane {} [{}] Service [{}:{}] is called.", lane, appName, ip, port); - return String.format("Lane %s [%s] Service [%s:%s] is called.", lane, appName, ip, port); + LOG.info("Lane {} Service [{} - {}:{}] is called.", lane, appName, ip, port); + return String.format("Lane [%s] Service [%s - %s:%s] is called.", lane, appName, ip, port); } /** diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml index ddfe6192..efd0edff 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml +++ b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml @@ -23,11 +23,6 @@ spring-cloud-starter-tencent-polaris-router - - com.tencent.cloud - spring-cloud-tencent-gateway-plugin - - org.springframework.cloud spring-cloud-starter-gateway