fix: fix TSF context bootstrap configuration (#1395)

Tencent · Aug 28, 2024 · f8f8073 · f8f8073
1 parent cc927d6
commit f8f8073
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,3 +31,4 @@
 - [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1420)
 - [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1421)
 - [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1422)
+- [fix: fix TSF context bootstrap configuration](https://github.com/Tencent/spring-cloud-tencent/pull/1424)
diff --git a/...in/java/com/tencent/cloud/polaris/context/tsf/consul/TsfConsulBootstrapConfiguration.java b/...in/java/com/tencent/cloud/polaris/context/tsf/consul/TsfConsulBootstrapConfiguration.java
@@ -17,13 +17,11 @@
 
 package com.tencent.cloud.polaris.context.tsf.consul;
 
-import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
-
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration(proxyBeanMethods = false)
-@Import({PolarisContextAutoConfiguration.class, TsfConsulAutoConfiguration.class})
+@Import({TsfConsulAutoConfiguration.class})
 public class TsfConsulBootstrapConfiguration {
 
 }
diff --git a/.../main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java b/.../main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java
@@ -59,7 +59,8 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 		String tsfAppId = environment.getProperty("tsf_app_id");
 		if (StringUtils.isNotBlank(tsfAppId)) {
 			Map<String, Object> defaultProperties = new HashMap<>();
-
+			// enable polaris as default
+			defaultProperties.put("spring.cloud.polaris.enabled", "true");
 			// tsf_application_id
 			String tsfApplicationId = environment.getProperty("tsf_application_id");
 			if (StringUtils.isBlank(tsfApplicationId)) {