fix:fix nearby router properties loading bug. (#1381)

Co-authored-by: Haotian Zhang <skyebefreeman@qq.com>

CHANGELOG.md

@@ -9,3 +9,4 @@
 - [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1378)
 - [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1379)
 - [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1380)
+- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1381)

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterAutoConfiguration.java

@@ -45,7 +45,6 @@
 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;
@@ -60,7 +59,6 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnPolarisRouterEnabled
 @LoadBalancerClients(defaultConfiguration = LoadBalancerConfiguration.class)
-@Import({PolarisNearByRouterProperties.class, PolarisMetadataRouterProperties.class, PolarisRuleBasedRouterProperties.class})
 public class RouterAutoConfiguration {
 
 	@Bean

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 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnPolarisRouterEnabled
+@Import({PolarisNearByRouterProperties.class, PolarisMetadataRouterProperties.class, PolarisRuleBasedRouterProperties.class})
 public class RouterConfigModifierAutoConfiguration {
 
 	@Bean

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

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,

spring-cloud-tencent-dependencies/pom.xml

@@ -74,7 +74,7 @@
 		<revision>1.14.0-2020.0.6-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>1.15.4-SNAPSHOT</polaris.version>
+		<polaris.version>1.15.5-SNAPSHOT</polaris.version>
 
 		<!-- Dependencies -->
 		<guava.version>32.0.1-jre</guava.version>