From 1ee3975010e58fd80d83e4e2c145aaab9afa50d8 Mon Sep 17 00:00:00 2001 From: andrew shan <45474304+andrewshan@users.noreply.github.com> Date: Mon, 15 Apr 2024 10:33:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=A4=9A=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E4=B8=AD=E5=BF=83=E5=9C=BA=E6=99=AF=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E9=9B=85=E4=B8=8A=E4=B8=8B=E7=BA=BF=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=99=A8=E7=9B=B8=E4=BA=92=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#1263)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../adapter/transformer/NacosRegistrationTransformer.java | 5 +++++ .../transformer/PolarisRegistrationTransformer.java | 6 ++++-- .../enhancement/transformer/RegistrationTransformer.java | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a159139d5..6e6d96227 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,3 +6,4 @@ - [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1256) - [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260) - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262) +- [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263) \ No newline at end of file diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosRegistrationTransformer.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosRegistrationTransformer.java index 553e829d4..5d0f3f6c4 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosRegistrationTransformer.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosRegistrationTransformer.java @@ -28,6 +28,11 @@ import org.springframework.cloud.client.serviceregistry.Registration; public class NacosRegistrationTransformer implements RegistrationTransformer { + @Override + public String getRegistry() { + return "nacos"; + } + @Override public void transformCustom(DefaultInstance instance, Registration registration) { if (registration instanceof NacosRegistration nacosRegistration) { diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisRegistrationTransformer.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisRegistrationTransformer.java index 8c4000a76..20df4f183 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisRegistrationTransformer.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisRegistrationTransformer.java @@ -20,6 +20,8 @@ package com.tencent.cloud.rpc.enhancement.transformer; public class PolarisRegistrationTransformer implements RegistrationTransformer { - - + @Override + public String getRegistry() { + return "polaris"; + } } diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/RegistrationTransformer.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/RegistrationTransformer.java index c79fe3401..7996ebd78 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/RegistrationTransformer.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/RegistrationTransformer.java @@ -32,6 +32,8 @@ import org.springframework.cloud.client.serviceregistry.Registration; */ public interface RegistrationTransformer { + String getRegistry(); + default Instance transform(Registration registration) { DefaultInstance instance = new DefaultInstance(); transformDefault(instance, registration); @@ -40,6 +42,7 @@ public interface RegistrationTransformer { } default void transformDefault(DefaultInstance instance, Registration registration) { + instance.setRegistry(getRegistry()); instance.setNamespace(MetadataContext.LOCAL_NAMESPACE); instance.setService(registration.getServiceId()); instance.setProtocol(registration.getScheme());