Skip to content

Commit fb2971b

Browse files
feat:support consul service update task. (#1413)
Co-authored-by: Haotian Zhang <skyebefreeman@qq.com>
1 parent 6b3f430 commit fb2971b

File tree

6 files changed

+27
-8
lines changed

6 files changed

+27
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
- [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1410)
2323
- [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1411)
2424
- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1412)
25+
- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1413)

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717

1818
package com.tencent.cloud.polaris.registry;
1919

20-
import com.tencent.cloud.common.metadata.MetadataContext;
2120
import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
22-
import com.tencent.polaris.api.pojo.ServiceKey;
2321
import com.tencent.polaris.assembly.api.AssemblyAPI;
2422
import org.slf4j.Logger;
2523
import org.slf4j.LoggerFactory;
@@ -73,9 +71,6 @@ protected void register() {
7371
LOGGER.debug("Registration disabled.");
7472
return;
7573
}
76-
if (assemblyAPI != null) {
77-
assemblyAPI.initService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, MetadataContext.LOCAL_SERVICE));
78-
}
7974
super.register();
8075
}
8176

spring-cloud-tencent-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<revision>1.14.0-2023.0.0-RC2</revision>
7575

7676
<!-- Polaris SDK version -->
77-
<polaris.version>1.15.7-SNAPSHOT</polaris.version>
77+
<polaris.version>1.15.8-SNAPSHOT</polaris.version>
7878

7979
<!-- Dependencies -->
8080
<guava.version>32.0.1-jre</guava.version>

spring-cloud-tencent-examples/tsf-example/consumer-demo/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.tencent.cloud</groupId>
17-
<artifactId>spring-cloud-starter-tencent-all</artifactId>
17+
<artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
18+
</dependency>
19+
20+
<dependency>
21+
<groupId>com.tencent.cloud</groupId>
22+
<artifactId>spring-cloud-starter-tencent-polaris-config</artifactId>
23+
</dependency>
24+
25+
<dependency>
26+
<groupId>com.tencent.cloud</groupId>
27+
<artifactId>spring-cloud-starter-tencent-polaris-contract</artifactId>
1828
</dependency>
1929

2030
<dependency>

spring-cloud-tencent-examples/tsf-example/provider-demo/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.tencent.cloud</groupId>
17-
<artifactId>spring-cloud-starter-tencent-all</artifactId>
17+
<artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
18+
</dependency>
19+
20+
<dependency>
21+
<groupId>com.tencent.cloud</groupId>
22+
<artifactId>spring-cloud-starter-tencent-polaris-config</artifactId>
23+
</dependency>
24+
25+
<dependency>
26+
<groupId>com.tencent.cloud</groupId>
27+
<artifactId>spring-cloud-starter-tencent-polaris-contract</artifactId>
1828
</dependency>
1929

2030
<dependency>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
7777
if (StringUtils.isBlank(tsfNamespaceId)) {
7878
LOGGER.error("tsf_namespace_id is empty");
7979
}
80+
else {
81+
defaultProperties.put("spring.cloud.polaris.namespace", tsfNamespaceId);
82+
}
8083

8184
// tsf_consul_ip
8285
String tsfConsulIp = environment.getProperty("tsf_consul_ip");

0 commit comments

Comments
 (0)