feat:support consul service update task. (#1329)

Tencent · Jun 28, 2024 · ed706f8 · ed706f8
1 parent 94df107
commit ed706f8
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,4 +20,5 @@
 - [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1317)
 - [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1319)
 - [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1322)
-- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1324)
+- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1324)
+- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1329)
diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2022.0.5-RC2</revision>
+		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>6.0.17</spring.framework.version>

diff --git a/...very/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java b/...very/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java
@@ -17,9 +17,7 @@
 
 package com.tencent.cloud.polaris.registry;
 
-import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
-import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,9 +71,6 @@ protected void register() {
 			LOGGER.debug("Registration disabled.");
 			return;
 		}
-		if (assemblyAPI != null) {
-			assemblyAPI.initService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, MetadataContext.LOCAL_SERVICE));
-		}
 		super.register();
 	}
 

diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
@@ -71,10 +71,10 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2022.0.5-RC2</revision>
+		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>1.15.7</polaris.version>
+		<polaris.version>1.15.8-SNAPSHOT</polaris.version>
 
 		<!-- Dependencies -->
 		<guava.version>32.0.1-jre</guava.version>

diff --git a/spring-cloud-tencent-examples/tsf-example/consumer-demo/pom.xml b/spring-cloud-tencent-examples/tsf-example/consumer-demo/pom.xml
@@ -14,7 +14,17 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>
-			<artifactId>spring-cloud-starter-tencent-all</artifactId>
+			<artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-polaris-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-polaris-contract</artifactId>
 		</dependency>
 
 		<dependency>

diff --git a/spring-cloud-tencent-examples/tsf-example/provider-demo/pom.xml b/spring-cloud-tencent-examples/tsf-example/provider-demo/pom.xml
@@ -14,7 +14,17 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>
-			<artifactId>spring-cloud-starter-tencent-all</artifactId>
+			<artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-polaris-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-polaris-contract</artifactId>
 		</dependency>
 
 		<dependency>

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
@@ -77,6 +77,9 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 			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");