From aca2982657cbe546aed36d4920bac97de9686e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= <pointer_v@qq.com>
Date: Wed, 21 Feb 2024 10:58:01 +0800
Subject: [PATCH] fix:fix restTemplateCustomizer bean conflict causing service
 to fail to start properly.

---
 changes/changes-1.13.0.md                     |  1 +
 .../PolarisLoadBalancerAutoConfiguration.java | 30 ++++++++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/changes/changes-1.13.0.md b/changes/changes-1.13.0.md
index 6525f5b0..168274dd 100644
--- a/changes/changes-1.13.0.md
+++ b/changes/changes-1.13.0.md
@@ -20,3 +20,4 @@
 - [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/1186)
 - [feat: support nacos namespace mapping](https://github.com/Tencent/spring-cloud-tencent/pull/1191)
 - [fix:fix sct-all wrong spring boot version obtain.](https://github.com/Tencent/spring-cloud-tencent/pull/1204)
+- fix:fix restTemplateCustomizer bean conflict causing service to fail to start properly.
diff --git a/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/config/PolarisLoadBalancerAutoConfiguration.java b/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/config/PolarisLoadBalancerAutoConfiguration.java
index 1a657844..019c60cc 100644
--- a/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/config/PolarisLoadBalancerAutoConfiguration.java
+++ b/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/config/PolarisLoadBalancerAutoConfiguration.java
@@ -35,6 +35,7 @@ import org.springframework.cloud.netflix.ribbon.RibbonClients;
 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 Ribbon for Polaris.
@@ -55,23 +56,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);
 		};