From ed706f85d518fffa6960ba8f289f2c02bc71f2c2 Mon Sep 17 00:00:00 2001 From: Haotian Zhang Date: Fri, 28 Jun 2024 09:56:27 +0800 Subject: [PATCH] feat:support consul service update task. (#1329) --- CHANGELOG.md | 3 ++- pom.xml | 2 +- .../registry/PolarisAutoServiceRegistration.java | 5 ----- spring-cloud-tencent-dependencies/pom.xml | 4 ++-- .../tsf-example/consumer-demo/pom.xml | 12 +++++++++++- .../tsf-example/provider-demo/pom.xml | 12 +++++++++++- .../tsf/env/TsfCoreEnvironmentPostProcessor.java | 3 +++ 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fbfb76df..7d0fb7fcf 100644 --- 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) \ No newline at end of file +- [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) \ No newline at end of file diff --git a/pom.xml b/pom.xml index b8e59d4da..c882ce590 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - 1.14.0-2022.0.5-RC2 + 1.14.0-2022.0.5-SNAPSHOT 6.0.17 diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java index 96b359096..563ec8ef6 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/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 index f805cd855..01dc14713 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,10 +71,10 @@ - 1.14.0-2022.0.5-RC2 + 1.14.0-2022.0.5-SNAPSHOT - 1.15.7 + 1.15.8-SNAPSHOT 32.0.1-jre diff --git a/spring-cloud-tencent-examples/tsf-example/consumer-demo/pom.xml b/spring-cloud-tencent-examples/tsf-example/consumer-demo/pom.xml index ca0dc4358..6c839dd70 100644 --- 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 @@ com.tencent.cloud - spring-cloud-starter-tencent-all + spring-cloud-starter-tencent-polaris-discovery + + + + com.tencent.cloud + spring-cloud-starter-tencent-polaris-config + + + + com.tencent.cloud + spring-cloud-starter-tencent-polaris-contract diff --git a/spring-cloud-tencent-examples/tsf-example/provider-demo/pom.xml b/spring-cloud-tencent-examples/tsf-example/provider-demo/pom.xml index 202b268a8..f5ed608fc 100644 --- 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 @@ com.tencent.cloud - spring-cloud-starter-tencent-all + spring-cloud-starter-tencent-polaris-discovery + + + + com.tencent.cloud + spring-cloud-starter-tencent-polaris-config + + + + com.tencent.cloud + spring-cloud-starter-tencent-polaris-contract diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java index 05a706c68..1ebd2d2bc 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java +++ b/spring-cloud-tencent-polaris-context/src/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");