diff --git a/pom.xml b/pom.xml index b8e933663..e88de2ce3 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ - 2.0.3.0-2024.0.1-SNAPSHOT + 2.1.0.0-2024.0.1-SNAPSHOT 6.2.8 diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerClientConfiguration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerClientConfiguration.java index eb9fe0470..cacd097ed 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerClientConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerClientConfiguration.java @@ -98,7 +98,6 @@ public class PolarisLoadBalancerClientConfiguration { return new PolarisRingHashLoadBalancer(name, loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), polarisSDKContextManager.getRouterAPI()); } - @Bean @ConditionalOnMissingBean @Conditional(PolarisShortestResponseTimeStrategyCondition.class) @@ -118,7 +117,6 @@ public class PolarisLoadBalancerClientConfiguration { return new PolarisLeastConnectionLoadBalancer(name, loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), polarisSDKContextManager.getRouterAPI()); } - @Bean @ConditionalOnMissingBean @Conditional(DefaultStrategyCondition.class) @@ -160,6 +158,7 @@ public class PolarisLoadBalancerClientConfiguration { } } + static class DefaultStrategyCondition implements Condition { @Override diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index bff254c95..478a7b7ce 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,10 +71,10 @@ - 2.0.3.0-2024.0.1-SNAPSHOT + 2.1.0.0-2024.0.1-SNAPSHOT - 2.0.3.0-SNAPSHOT + 2.1.0.0-SNAPSHOT 2.2.0