fix: fix context autoconfigure

Author: fuyuwei01

spring-cloud-tencent-polaris-context/pom.xml

@@ -119,6 +119,11 @@
 		</dependency>
 		<!-- Polaris dependencies end -->
 
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-bootstrap</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

spring-cloud-tencent-polaris-context/src/main/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 {
 
 }

spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java

@@ -21,10 +21,12 @@
 import java.util.Map;
 
 import com.tencent.polaris.api.utils.StringUtils;
+import org.apache.commons.logging.Log;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
 import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
@@ -34,13 +36,19 @@
  *
  * @author Haotian Zhang
  */
-public class TsfCoreEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
+public final class TsfCoreEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
 
 	/**
 	 * run before {@link ConfigDataEnvironmentPostProcessor}.
 	 */
 	public static final int ORDER = ConfigDataEnvironmentPostProcessor.ORDER - 1;
 
+	private final Log LOGGER;
+
+	private TsfCoreEnvironmentPostProcessor(DeferredLogFactory logFactory) {
+		this.LOGGER = logFactory.getLog(getClass());
+	}
+
 	@Override
 	public int getOrder() {
 		return ORDER;
@@ -51,17 +59,78 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 		String tsfAppId = environment.getProperty("tsf_app_id");
 		if (StringUtils.isNotBlank(tsfAppId)) {
 			Map<String, Object> defaultProperties = new HashMap<>();
+			//默认开启polaris
+			defaultProperties.put("spring.cloud.polaris.enabled", "true");
+			// tsf_application_id
+			String tsfApplicationId = environment.getProperty("tsf_application_id");
+			if (StringUtils.isBlank(tsfApplicationId)) {
+				LOGGER.error("tsf_application_id is empty");
+			}
+
+			// tsf_group_id
+			String tsfGroupId = environment.getProperty("tsf_group_id");
+			if (StringUtils.isBlank(tsfGroupId)) {
+				LOGGER.error("tsf_group_id is empty");
+			}
+
+			// tsf_namespace_id
+			String tsfNamespaceId = environment.getProperty("tsf_namespace_id");
+			if (StringUtils.isBlank(tsfNamespaceId)) {
+				LOGGER.error("tsf_namespace_id is empty");
+			}
+			else {
+				defaultProperties.put("spring.cloud.polaris.namespace", tsfNamespaceId);
+			}
+
+			// tsf_consul_ip
+			String tsfConsulIp = environment.getProperty("tsf_consul_ip");
+			if (StringUtils.isBlank(tsfConsulIp)) {
+				LOGGER.error("tsf_consul_ip is empty");
+			}
+
+			// tsf_consul_port
+			String tsfConsulPort = environment.getProperty("tsf_consul_port");
+			if (StringUtils.isBlank(tsfConsulPort)) {
+				LOGGER.error("tsf_consul_port is empty");
+			}
+
+			// tsf_token
+			String tsfConsulToken = environment.getProperty("tsf_token");
+			if (StringUtils.isBlank(tsfConsulToken)) {
+				LOGGER.error("tsf_token is empty");
+			}
 
-			// TODO 接入consul配置后需要改动这个选项的判断
 			// tse_polaris_enable
-			defaultProperties.put("spring.cloud.polaris.config.enabled", environment.getProperty("tse_polaris_enable", "false"));
+			String tsePolarisEnable = environment.getProperty("tse_polaris_enable", "false");
+			if (StringUtils.equals(tsePolarisEnable, "true")) {
+				defaultProperties.put("spring.cloud.polaris.config.enabled", "true");
+			}
+			else {
+				defaultProperties.put("spring.cloud.polaris.contract.report.enabled", "false");
+				defaultProperties.put("spring.cloud.polaris.config.enabled", "true");
+				defaultProperties.put("spring.cloud.polaris.config.internal-enabled", "false");
+				defaultProperties.put("spring.cloud.polaris.config.data-source", "consul");
+				defaultProperties.put("spring.cloud.polaris.config.address", "http://" + tsfConsulIp + ":" + tsfConsulPort);
+				defaultProperties.put("spring.cloud.polaris.config.port", tsfConsulPort);
+				defaultProperties.put("spring.cloud.polaris.config.token", tsfConsulToken);
+				defaultProperties.put("spring.cloud.polaris.config.groups[0].namespace", "config");
+				defaultProperties.put("spring.cloud.polaris.config.groups[0].name", "application");
+				defaultProperties.put("spring.cloud.polaris.config.groups[0].files[0]", tsfApplicationId + "/" + tsfGroupId + "/");
+				defaultProperties.put("spring.cloud.polaris.config.groups[0].files[1]", tsfNamespaceId + "/");
+			}
 
 			// tse_polaris_ip
 			defaultProperties.put("spring.cloud.polaris.address", "grpc://" + environment.getProperty("tse_polaris_ip", "") + ":8091");
 
-			// tse_polaris_ip
+			// tsf_sctt_extensions_port
 			defaultProperties.put("spring.cloud.polaris.stat.port", environment.getProperty("tsf_sctt_extensions_port", "11134"));
 
+			// rule based router fail over type
+			defaultProperties.put("spring.cloud.polaris.router.rule-router.fail-over", "none");
+
+			// namespace affinity router
+			defaultProperties.put("spring.cloud.polaris.router.namespace-router.enabled", "true");
+
 			MapPropertySource propertySource = new MapPropertySource("tsf-polaris-properties", defaultProperties);
 			environment.getPropertySources().addFirst(propertySource);
 		}