fix:fix gray release examples bug.

CHANGELOG.md

@@ -18,3 +18,4 @@
 - fix:fix circuit breaker bean load order bug when using Nacos discovery.
 - refactor:refactor Polaris registration.
 - feat:added automatic optimization for dynamic config refresh type.
+- fix:fix gray release examples bug.

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-frontend/src/main/java/com/tencent/cloud/polaris/router/grayrelease/front/FrontController.java

@@ -1,49 +1,50 @@
-/*
+/*
- * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
- *
+ *
- * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
- *
+ *
- * Licensed under the BSD 3-Clause License (the "License");
+ * Licensed under the BSD 3-Clause License (the "License");
- * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
- *
+ *
- * https://opensource.org/licenses/BSD-3-Clause
+ * https://opensource.org/licenses/BSD-3-Clause
- *
+ *
- * Unless required by applicable law or agreed to in writing, software distributed
+ * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
+ * specific language governing permissions and limitations under the License.
- *
+ *
- */
+ */
-
+
-package com.tencent.cloud.polaris.router.grayrelease.front;
+package com.tencent.cloud.polaris.router.grayrelease.front;
-
+
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
+import org.springframework.core.env.Environment;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.RestController;
-@RestController
+
-@RequestMapping("/router/gray")
+@RestController
-public class FrontController {
+@RequestMapping("/router/gray")
-
+public class FrontController {
-	@Autowired
+
-	private Environment environment;
+	@Autowired
-
+	private Environment environment;
-	@Autowired
+
-	private RouterService routerService;
+	@Autowired
-
+	private RouterService routerService;
-	/**
+
-	 * Get information of callee.
+	/**
-	 * @return information of callee
+	 * Get information of callee.
-	 */
+	 * @return information of callee
-	@GetMapping("/rest")
+	 */
-	public String rest() {
+	@GetMapping("/rest")
-		String env = System.getenv("SCT_METADATA_CONTENT_env");
+	public String rest(@RequestHeader("uid") int user) {
-		String appName = environment.getProperty("spring.application.name");
+		String env = System.getenv("SCT_METADATA_CONTENT_env");
-		String curName = appName + "[" + env + "]";
+		String appName = environment.getProperty("spring.application.name");
-		String resp = routerService.rest();
+		String curName = appName + "[" + env + "]";
-		return curName + " -> " + resp;
+		String resp = routerService.rest(user);
-	}
+		return curName + " -> " + resp;
-}
+	}
+}

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-frontend/src/main/java/com/tencent/cloud/polaris/router/grayrelease/front/RouterService.java

@@ -20,6 +20,7 @@ package com.tencent.cloud.polaris.router.grayrelease.front;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * Router callee feign client.
@@ -30,6 +31,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 public interface RouterService {
 
 	@GetMapping("/router/gray/rest")
-	String rest();
+	String rest(@RequestHeader("uid") int user);
 
 }

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-middle/src/main/java/com/tencent/cloud/polaris/router/grayrelease/middle/MiddleController.java

@@ -1,49 +1,50 @@
-/*
+/*
- * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
- *
+ *
- * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
- *
+ *
- * Licensed under the BSD 3-Clause License (the "License");
+ * Licensed under the BSD 3-Clause License (the "License");
- * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
- *
+ *
- * https://opensource.org/licenses/BSD-3-Clause
+ * https://opensource.org/licenses/BSD-3-Clause
- *
+ *
- * Unless required by applicable law or agreed to in writing, software distributed
+ * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
+ * specific language governing permissions and limitations under the License.
- */
+ */
-
+
-
+
-package com.tencent.cloud.polaris.router.grayrelease.middle;
+package com.tencent.cloud.polaris.router.grayrelease.middle;
-
+
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
+import org.springframework.core.env.Environment;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.RestController;
-@RestController
+
-@RequestMapping("/router/gray")
+@RestController
-public class MiddleController {
+@RequestMapping("/router/gray")
-
+public class MiddleController {
-	@Autowired
+
-	private Environment environment;
+	@Autowired
-
+	private Environment environment;
-	@Autowired
+
-	private RouterService routerService;
+	@Autowired
-
+	private RouterService routerService;
-	/**
+
-	 * Get information of callee.
+	/**
-	 * @return information of callee
+	 * Get information of callee.
-	 */
+	 * @return information of callee
-	@GetMapping("/rest")
+	 */
-	public String rest() {
+	@GetMapping("/rest")
-		String env = System.getenv("SCT_METADATA_CONTENT_env");
+	public String rest(@RequestHeader("uid") int user) {
-		String appName = environment.getProperty("spring.application.name");
+		String env = System.getenv("SCT_METADATA_CONTENT_env");
-		String curName = appName + "[" + env + "]";
+		String appName = environment.getProperty("spring.application.name");
-		String resp = routerService.rest();
+		String curName = appName + "[" + env + "]";
-		return curName + " -> " + resp;
+		String resp = routerService.rest(user);
-	}
+		return curName + " -> " + resp;
-}
+	}
+}

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-middle/src/main/java/com/tencent/cloud/polaris/router/grayrelease/middle/RouterService.java

@@ -20,6 +20,7 @@ package com.tencent.cloud.polaris.router.grayrelease.middle;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * Router callee feign client.
@@ -30,6 +31,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 public interface RouterService {
 
 	@GetMapping("/router/gray/rest")
-	String rest();
+	String rest(@RequestHeader("uid") int user);
 
 }