From 5bb4320a86399acff325fcf75d8e6c2bdb90c647 Mon Sep 17 00:00:00 2001 From: Haotian Zhang Date: Thu, 18 Apr 2024 10:37:43 +0800 Subject: [PATCH] fix:fix nearby router properties loading bug. (#1272) --- CHANGELOG.md | 3 ++- pom.xml | 2 +- .../cloud/polaris/router/config/RouterAutoConfiguration.java | 2 -- .../router/config/RouterConfigModifierAutoConfiguration.java | 4 ++++ .../polaris/router/config/FeignAutoConfigurationTest.java | 1 + .../polaris/router/config/RouterAutoConfigurationTests.java | 1 + spring-cloud-tencent-dependencies/pom.xml | 4 ++-- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e6d9622..500fed55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,5 @@ - [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1256) - [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260) - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262) -- [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263) \ No newline at end of file +- [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263) +- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272) \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3162d670..48515c6d 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - 1.14.0-2023.0.0-RC1 + 1.14.0-2023.0.0-SNAPSHOT 6.1.4 diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterAutoConfiguration.java index 592dfb9d..ae6ba71f 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterAutoConfiguration.java @@ -44,7 +44,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.core.annotation.Order; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.web.client.RestTemplate; @@ -59,7 +58,6 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE; @Configuration(proxyBeanMethods = false) @ConditionalOnPolarisRouterEnabled @LoadBalancerClients(defaultConfiguration = LoadBalancerConfiguration.class) -@Import({PolarisNearByRouterProperties.class, PolarisMetadataRouterProperties.class, PolarisRuleBasedRouterProperties.class}) public class RouterAutoConfiguration { @Bean diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterConfigModifierAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterConfigModifierAutoConfiguration.java index 782135dc..e1de4a37 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterConfigModifierAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterConfigModifierAutoConfiguration.java @@ -19,11 +19,14 @@ package com.tencent.cloud.polaris.router.config; import com.tencent.cloud.polaris.router.RouterConfigModifier; +import com.tencent.cloud.polaris.router.config.properties.PolarisMetadataRouterProperties; import com.tencent.cloud.polaris.router.config.properties.PolarisNearByRouterProperties; +import com.tencent.cloud.polaris.router.config.properties.PolarisRuleBasedRouterProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; /** * RouterConfigModifierAutoConfiguration. @@ -32,6 +35,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration(proxyBeanMethods = false) @ConditionalOnPolarisRouterEnabled +@Import({PolarisNearByRouterProperties.class, PolarisMetadataRouterProperties.class, PolarisRuleBasedRouterProperties.class}) public class RouterConfigModifierAutoConfiguration { @Bean diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/FeignAutoConfigurationTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/FeignAutoConfigurationTest.java index 774ca3ac..b76bb779 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/FeignAutoConfigurationTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/FeignAutoConfigurationTest.java @@ -39,6 +39,7 @@ public class FeignAutoConfigurationTest { .withConfiguration(AutoConfigurations.of( MetadataAutoConfiguration.class, RouterAutoConfiguration.class, + RouterConfigModifierAutoConfiguration.class, PolarisContextAutoConfiguration.class, FeignAutoConfiguration.class, ApplicationContextAwareUtils.class diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/RouterAutoConfigurationTests.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/RouterAutoConfigurationTests.java index a27c9e7c..c2bb3373 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/RouterAutoConfigurationTests.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/RouterAutoConfigurationTests.java @@ -42,6 +42,7 @@ public class RouterAutoConfigurationTests { TestRestTemplatesConfiguration.class, MetadataAutoConfiguration.class, RouterAutoConfiguration.class, + RouterConfigModifierAutoConfiguration.class, RouterBootstrapAutoConfiguration.class, PolarisContextAutoConfiguration.class, RouterAutoConfiguration.RouterLabelRestTemplateConfig.class, diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index c8893a64..ba1c4326 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,10 +71,10 @@ - 1.14.0-2023.0.0-RC1 + 1.14.0-2023.0.0-SNAPSHOT - 1.15.4 + 1.15.5-SNAPSHOT 32.0.1-jre