File tree 2 files changed +9
-3
lines changed
spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/adapters/web
2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change 36
36
<properties >
37
37
<!-- spring-cloud-dependencies do not import spring-boot-dependencies, spring-boot-dependencies
38
38
import spring-framework-bom. No need configure spring version. -->
39
- <spring-cloud .version>2023.0.0 </spring-cloud .version>
40
- <spring-boot .version>3.2.2 </spring-boot .version>
41
- <servicecomb .version>2.8.15 </servicecomb .version>
39
+ <spring-cloud .version>2023.0.1 </spring-cloud .version>
40
+ <spring-boot .version>3.2.4 </spring-boot .version>
41
+ <servicecomb .version>2.8.16 </servicecomb .version>
42
42
</properties >
43
43
44
44
<modules >
Original file line number Diff line number Diff line change 24
24
import org .springframework .beans .factory .annotation .Autowired ;
25
25
import org .springframework .boot .autoconfigure .condition .ConditionalOnClass ;
26
26
import org .springframework .boot .autoconfigure .condition .ConditionalOnProperty ;
27
+ import org .springframework .cloud .client .loadbalancer .DeferringLoadBalancerInterceptor ;
27
28
import org .springframework .cloud .client .loadbalancer .LoadBalancerInterceptor ;
28
29
import org .springframework .cloud .client .loadbalancer .RestTemplateCustomizer ;
29
30
import org .springframework .cloud .client .serviceregistry .Registration ;
@@ -81,6 +82,11 @@ public RestTemplateCustomizer restTemplateCustomizer(List<ClientHttpRequestInter
81
82
LoadBalancerInterceptor loadBalancerInterceptor = null ;
82
83
83
84
for (ClientHttpRequestInterceptor interceptor : interceptors ) {
85
+ // DeferringLoadBalancerInterceptor can not put it inside restTemplate intercepter,
86
+ // it will duplicate choose service by loadbalance.
87
+ if (interceptor instanceof DeferringLoadBalancerInterceptor ) {
88
+ continue ;
89
+ }
84
90
if (interceptor instanceof LoadBalancerInterceptor ) {
85
91
loadBalancerInterceptor = (LoadBalancerInterceptor ) interceptor ;
86
92
continue ;
You can’t perform that action at this time.
0 commit comments