fix: gramma issues for lane router example & optimize the gateway dep…

…endency (#1343)
Tencent · Jul 16, 2024 · 67f0386 · 67f0386
1 parent 3199499
commit 67f0386
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,4 +9,5 @@
 - [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1339)
 - [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1340)
 - [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1341)
-- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1342)
+- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1342)
+- [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1343)
diff --git a/...allee-service/src/main/java/com/tencent/cloud/lane/callee/LaneRouterCalleeController.java b/...allee-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 String sum(@RequestParam int value1, @RequestParam int value2) {
 	 */
 	@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 String echoHeader(@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METAD
 			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/...aller-service/src/main/java/com/tencent/cloud/lane/caller/LaneRouterCallerController.java b/...aller-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 String feign(@RequestParam int value1, @RequestParam int value2) {
 	 */
 	@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 Mono<String> webclient() {
 	 */
 	@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/...-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml b/...-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml
@@ -23,11 +23,6 @@
 			<artifactId>spring-cloud-starter-tencent-polaris-router</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.tencent.cloud</groupId>
-			<artifactId>spring-cloud-tencent-gateway-plugin</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-gateway</artifactId>