Skip to content

Commit b940de6

Browse files
authored
[#1255] upgrade cloud/boot/servicecomb version (#1256)
1 parent dd1bdc2 commit b940de6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<properties>
3737
<!-- spring-cloud-dependencies do not import spring-boot-dependencies, spring-boot-dependencies
3838
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>
4242
</properties>
4343

4444
<modules>

spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/adapters/web/WebConfiguration.java

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
27+
import org.springframework.cloud.client.loadbalancer.DeferringLoadBalancerInterceptor;
2728
import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
2829
import org.springframework.cloud.client.loadbalancer.RestTemplateCustomizer;
2930
import org.springframework.cloud.client.serviceregistry.Registration;
@@ -81,6 +82,11 @@ public RestTemplateCustomizer restTemplateCustomizer(List<ClientHttpRequestInter
8182
LoadBalancerInterceptor loadBalancerInterceptor = null;
8283

8384
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+
}
8490
if (interceptor instanceof LoadBalancerInterceptor) {
8591
loadBalancerInterceptor = (LoadBalancerInterceptor) interceptor;
8692
continue;

0 commit comments

Comments
 (0)