Skip to content

Commit 1ee3975

Browse files
authored
fix: 解决多注册中心场景下,优雅上下线处理器相互覆盖的问题 (#1263)
1 parent e5f0690 commit 1ee3975

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
- [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1256)
77
- [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260)
88
- [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262)
9+
- [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263)

spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosRegistrationTransformer.java

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828

2929
public class NacosRegistrationTransformer implements RegistrationTransformer {
3030

31+
@Override
32+
public String getRegistry() {
33+
return "nacos";
34+
}
35+
3136
@Override
3237
public void transformCustom(DefaultInstance instance, Registration registration) {
3338
if (registration instanceof NacosRegistration nacosRegistration) {

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisRegistrationTransformer.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
public class PolarisRegistrationTransformer implements RegistrationTransformer {
2222

23-
24-
23+
@Override
24+
public String getRegistry() {
25+
return "polaris";
26+
}
2527
}

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/RegistrationTransformer.java

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
*/
3333
public interface RegistrationTransformer {
3434

35+
String getRegistry();
36+
3537
default Instance transform(Registration registration) {
3638
DefaultInstance instance = new DefaultInstance();
3739
transformDefault(instance, registration);
@@ -40,6 +42,7 @@ default Instance transform(Registration registration) {
4042
}
4143

4244
default void transformDefault(DefaultInstance instance, Registration registration) {
45+
instance.setRegistry(getRegistry());
4346
instance.setNamespace(MetadataContext.LOCAL_NAMESPACE);
4447
instance.setService(registration.getServiceId());
4548
instance.setProtocol(registration.getScheme());

0 commit comments

Comments
 (0)