This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 621a0a68c [SCB-2851]interoperate with spring cloud using nacos (#4192)
621a0a68c is described below
commit 621a0a68c56cd4f55c929dd3ae969dff94a5fa65
Author: liubao68 <[email protected]>
AuthorDate: Fri Jan 12 14:38:27 2024 +0800
[SCB-2851]interoperate with spring cloud using nacos (#4192)
---
.../org/apache/servicecomb/registry/nacos/NacosDiscoveryInstance.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git
a/service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscoveryInstance.java
b/service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscoveryInstance.java
index 7104498ed..93c8369a6 100644
---
a/service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscoveryInstance.java
+++
b/service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscoveryInstance.java
@@ -134,6 +134,10 @@ public class NacosDiscoveryInstance extends
AbstractDiscoveryInstance {
private static List<String> readEndpoints(Instance instance) {
if
(StringUtils.isEmpty(instance.getMetadata().get(NacosConst.PROPERTY_ENDPOINT)))
{
+ // interoperate with spring cloud using nacos
+ if (StringUtils.isNotEmpty(instance.getIp()) && instance.getPort() > 0) {
+ return List.of("rest://" + instance.getIp() + ":" +
instance.getPort());
+ }
return Collections.emptyList();
}
return
Arrays.asList(instance.getMetadata().get(NacosConst.PROPERTY_ENDPOINT)