fix:fix rule-based router when using RestTemplate.

Tencent · Nov 8, 2023 · beb1a5a · beb1a5a
1 parent 27861fc
commit beb1a5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,3 +19,4 @@
 - [fix:remove bcprov-jdk15on dependency.](https://github.com/Tencent/spring-cloud-tencent/pull/1177)
 - [feat:support configuration encryption.](https://github.com/Tencent/spring-cloud-tencent/pull/1181)
 - [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/1185)
+- [fix:fix rule-based router when using RestTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/1200)
diff --git a/...router/src/main/java/com/tencent/cloud/polaris/router/config/RouterAutoConfiguration.java b/...router/src/main/java/com/tencent/cloud/polaris/router/config/RouterAutoConfiguration.java
@@ -35,6 +35,7 @@
 import com.tencent.cloud.polaris.router.interceptor.RuleBasedRouterRequestInterceptor;
 import com.tencent.cloud.polaris.router.resttemplate.RouterLabelRestTemplateInterceptor;
 import com.tencent.cloud.polaris.router.spi.SpringWebRouterLabelResolver;
+import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedRestTemplateInterceptor;
 
 import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -117,7 +118,13 @@ public RouterLabelRestTemplateInterceptor routerLabelRestTemplateInterceptor(
 		public SmartInitializingSingleton addRouterLabelInterceptorForRestTemplate(RouterLabelRestTemplateInterceptor interceptor) {
 			return () -> restTemplates.forEach(restTemplate -> {
 				List<ClientHttpRequestInterceptor> list = new ArrayList<>(restTemplate.getInterceptors());
-				list.add(interceptor);
+				int addIndex = list.size();
+				for (int i = 0; i < list.size(); i++) {
+					if (list.get(i) instanceof EnhancedRestTemplateInterceptor) {
+						addIndex = i;
+					}
+				}
+				list.add(addIndex, interceptor);
 				restTemplate.setInterceptors(list);
 			});
 		}

diff --git a/...c/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java b/...c/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java
@@ -52,7 +52,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -176,7 +175,6 @@ public EnhancedLoadBalancerClientAspect enhancedLoadBalancerClientAspect() {
 	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
 	protected static class PolarisRestTemplateAutoConfiguration {
 
-		@LoadBalanced
 		@Autowired(required = false)
 		private List<RestTemplate> restTemplates = Collections.emptyList();