Merge branch '2021.0' of https://github.com/Tencent/spring-cloud-tencent into test/trans_headers_test

CHANGELOG.md

@@ -5,7 +5,7 @@
 - [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/595)
 - [Optimize: remove useless code for rest template router](https://github.com/Tencent/spring-cloud-tencent/pull/601)
 - [Optimize: optimize configuration conditional & optimize config data tips](https://github.com/Tencent/spring-cloud-tencent/pull/603)
-- [Automatically transmit some headers specified by a environment varaible that directly defines header keys.](https://github.com/Tencent/spring-cloud-tencent/pull/606)
+- [Automatically transmit some headers specified by an environment variable that directly defines header keys.](https://github.com/Tencent/spring-cloud-tencent/pull/606)
 - [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/607)
 - [Optimize: InstanceId of PolarisRegistration and PolarisServiceRegistry](https://github.com/Tencent/spring-cloud-tencent/pull/610)
 - [ fix pr #606 cause ci fail](https://github.com/Tencent/spring-cloud-tencent/pull/613)
@@ -16,5 +16,7 @@
 - [Feature: support new label expression](https://github.com/Tencent/spring-cloud-tencent/pull/627)
 - [feat:report the labels when using RestTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/629)
 - [Bugfix: fix throw npe when router context is null](https://github.com/Tencent/spring-cloud-tencent/pull/635)
-- [fix:cancel reporting useless metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/639)
 - [Optimize:optimize transfer](https://github.com/Tencent/spring-cloud-tencent/pull/636)
+- [fix:cancel reporting useless metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/639)
+- [Feature: support read config file from local file system](https://github.com/Tencent/spring-cloud-tencent/pull/640)
+- [fix:optimize expression parser V1.](https://github.com/Tencent/spring-cloud-tencent/pull/642)

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

@@ -42,6 +42,9 @@ import org.springframework.util.CollectionUtils;
 public class ConfigurationModifier implements PolarisConfigModifier {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationModifier.class);
 
+	private static final String DATA_SOURCE_POLARIS = "polaris";
+	private static final String DATA_SOURCE_LOCAL = "local";
+
 	private final PolarisConfigProperties polarisConfigProperties;
 
 	private final PolarisContextProperties polarisContextProperties;
@@ -54,6 +57,27 @@ public class ConfigurationModifier implements PolarisConfigModifier {
 
 	@Override
 	public void modify(ConfigurationImpl configuration) {
+		if (StringUtils.equalsIgnoreCase(polarisConfigProperties.getDataSource(), DATA_SOURCE_POLARIS)) {
+			initByPolarisDataSource(configuration);
+		}
+		else if (StringUtils.equalsIgnoreCase(polarisConfigProperties.getDataSource(), DATA_SOURCE_LOCAL)) {
+			initByLocalDataSource(configuration);
+		}
+		else {
+			throw new RuntimeException("Unsupported config data source");
+		}
+	}
+
+	private void initByLocalDataSource(ConfigurationImpl configuration) {
+		configuration.getConfigFile().getServerConnector().setConnectorType("localFile");
+
+		String localFileRootPath = polarisConfigProperties.getLocalFileRootPath();
+		configuration.getConfigFile().getServerConnector().setPersistDir(localFileRootPath);
+
+		LOGGER.info("[SCT] Run spring cloud tencent config with local data source. localFileRootPath = {}", localFileRootPath);
+	}
+
+	private void initByPolarisDataSource(ConfigurationImpl configuration) {
 		// set connector type
 		configuration.getConfigFile().getServerConnector().setConnectorType("polaris");
 
@@ -76,6 +100,8 @@ public class ConfigurationModifier implements PolarisConfigModifier {
 		checkAddressAccessible(configAddresses);
 
 		configuration.getConfigFile().getServerConnector().setAddresses(configAddresses);
+
+		LOGGER.info("[SCT] Run spring cloud tencent config in polaris data source.");
 	}
 
 	@Override

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

@@ -70,6 +70,20 @@ public class PolarisConfigProperties {
 	 */
 	private List<ConfigFileGroup> groups;
 
+	/**
+	 * Where to load config file. default is polaris.
+	 * <br>
+	 * polaris: load from polaris server.
+	 * <br>
+	 * local: load from local file system.
+	 */
+	private String dataSource = "polaris";
+
+	/**
+	 * The root path of config files, only used in local mode.
+	 */
+	private String localFileRootPath = "./polaris/backup/config";
+
 	public boolean isEnabled() {
 		return enabled;
 	}
@@ -133,4 +147,20 @@ public class PolarisConfigProperties {
 	public void setPreference(boolean preference) {
 		this.preference = preference;
 	}
+
+	public String getDataSource() {
+		return dataSource;
+	}
+
+	public void setDataSource(String dataSource) {
+		this.dataSource = dataSource;
+	}
+
+	public String getLocalFileRootPath() {
+		return localFileRootPath;
+	}
+
+	public void setLocalFileRootPath(String localFileRootPath) {
+		this.localFileRootPath = localFileRootPath;
+	}
 }

spring-cloud-starter-tencent-polaris-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -65,6 +65,18 @@
       "type": "java.lang.Boolean",
       "defaultValue": true,
       "description": "Whether shutdown server if connect to config server failed."
+    },
+    {
+      "name": "spring.cloud.polaris.config.data-source",
+      "type": "java.lang.String",
+      "defaultValue": "polaris",
+      "description": "Where to load config file, polaris or local."
+    },
+    {
+      "name": "spring.cloud.polaris.config.local-file-root-path",
+      "type": "java.lang.String",
+      "defaultValue": "./polaris/backup/config",
+      "description": "Where to load config file, polaris or local."
     }
   ]
 }

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionParserV1.java

@@ -53,7 +53,7 @@ public class ExpressionParserV1 implements ExpressionParser {
 
 	@Override
 	public String parseHeaderKey(String expression) {
-		return expression.substring(LABEL_HEADER_PREFIX_LEN, expression.length() - 1);
+		return StringUtils.substring(expression, LABEL_HEADER_PREFIX_LEN, expression.length() - 1);
 	}
 
 	@Override
@@ -63,7 +63,7 @@ public class ExpressionParserV1 implements ExpressionParser {
 
 	@Override
 	public String parseQueryKey(String expression) {
-		return expression.substring(LABEL_QUERY_PREFIX_LEN, expression.length() - 1);
+		return StringUtils.substring(expression, LABEL_QUERY_PREFIX_LEN, expression.length() - 1);
 	}
 
 	@Override
@@ -73,7 +73,7 @@ public class ExpressionParserV1 implements ExpressionParser {
 
 	@Override
 	public String parseCookieKey(String expression) {
-		return expression.substring(LABEL_COOKIE_PREFIX_LEN, expression.length() - 1);
+		return StringUtils.substring(expression, LABEL_COOKIE_PREFIX_LEN, expression.length() - 1);
 	}
 
 	@Override

spring-cloud-tencent-dependencies/pom.xml

@@ -73,7 +73,7 @@
 		<revision>1.8.0-2021.0.3-SNAPSHOT</revision>
 
 		<!-- Dependencies -->
-		<polaris.version>1.8.0</polaris.version>
+		<polaris.version>1.9.1</polaris.version>
 		<guava.version>31.0.1-jre</guava.version>
 		<logback.version>1.2.11</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>

spring-cloud-tencent-examples/polaris-config-example/src/main/resources/bootstrap.yml

@@ -11,6 +11,8 @@ spring:
       namespace: default
       config:
         auto-refresh: true # auto refresh when config file changed
+#        data-source: local # config data source default is polaris.
+#        local-file-root-path: # set root path for reading config file, when in local data source
         groups:
           - name: ${spring.application.name} # group name
             files: [ "config/application.properties", "config/bootstrap.yml" ] # config/application.properties takes precedence over config/bootstrap.yml