fix:fix restTemplateCustomizer bean conflict causing service to fail …

…to start properly.

CHANGELOG.md

@@ -22,3 +22,4 @@
 - [fix:fix rule-based router when using RestTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/1201)
 - [fix:fix sct-all wrong spring boot version obtain.](https://github.com/Tencent/spring-cloud-tencent/pull/1205)
 - [fix:fix swagger not working bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1225)
+- fix:fix restTemplateCustomizer bean conflict causing service to fail to start properly.

pom.xml

@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.13.0-2020.0.6</revision>
+		<revision>1.13.1-2020.0.6</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>5.3.25</spring.framework.version>

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerAutoConfiguration.java

@@ -36,6 +36,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Auto-configuration of loadbalancer for Polaris.
@@ -52,23 +53,38 @@
 public class PolarisLoadBalancerAutoConfiguration {
 
 	@Bean
-	public RestTemplateCustomizer restTemplateCustomizer(
+	public RestTemplateCustomizer polarisRestTemplateCustomizer(
 			@Autowired(required = false) RetryLoadBalancerInterceptor retryLoadBalancerInterceptor,
 			@Autowired(required = false) LoadBalancerInterceptor loadBalancerInterceptor) {
 		return restTemplate -> {
 			List<ClientHttpRequestInterceptor> list = new ArrayList<>(restTemplate.getInterceptors());
 			// LoadBalancerInterceptor must invoke before EnhancedRestTemplateInterceptor
-			if (retryLoadBalancerInterceptor != null || loadBalancerInterceptor != null) {
-				int addIndex = list.size();
+			int addIndex = list.size();
+			if (CollectionUtils.containsInstance(list, retryLoadBalancerInterceptor) || CollectionUtils.containsInstance(list, loadBalancerInterceptor)) {
+				ClientHttpRequestInterceptor enhancedRestTemplateInterceptor = null;
 				for (int i = 0; i < list.size(); i++) {
 					if (list.get(i) instanceof EnhancedRestTemplateInterceptor) {
+						enhancedRestTemplateInterceptor = list.get(i);
 						addIndex = i;
 					}
 				}
-				list.add(addIndex,
-						retryLoadBalancerInterceptor != null
-								? retryLoadBalancerInterceptor
-								: loadBalancerInterceptor);
+				if (enhancedRestTemplateInterceptor != null) {
+					list.remove(addIndex);
+					list.add(enhancedRestTemplateInterceptor);
+				}
+			}
+			else {
+				if (retryLoadBalancerInterceptor != null || loadBalancerInterceptor != null) {
+					for (int i = 0; i < list.size(); i++) {
+						if (list.get(i) instanceof EnhancedRestTemplateInterceptor) {
+							addIndex = i;
+						}
+					}
+					list.add(addIndex,
+							retryLoadBalancerInterceptor != null
+									? retryLoadBalancerInterceptor
+									: loadBalancerInterceptor);
+				}
 			}
 			restTemplate.setInterceptors(list);
 		};

spring-cloud-tencent-dependencies/pom.xml

@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.13.0-2020.0.6</revision>
+		<revision>1.13.1-2020.0.6</revision>
 
 		<!-- Dependencies -->
 		<polaris.version>1.15.0</polaris.version>