From b264579012518275855a016adeb14452fd51f6f1 Mon Sep 17 00:00:00 2001
From: chenglu <1285823170@qq.com>
Date: Thu, 7 Jan 2021 17:48:57 +0800
Subject: [PATCH] update the Nacos instance by real group name, not use the
default group name
---
.../cloud/nacos/registry/NacosServiceRegistry.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
index ad5f1a12..97ab7310 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
@@ -40,7 +40,11 @@ import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
* @author eshun
*/
public class NacosServiceRegistry implements ServiceRegistry {
-
+
+ private static final String STATUS_UP = "UP";
+
+ private static final String STATUS_DOWN = "DOWN";
+
private static final Logger log = LoggerFactory.getLogger(NacosServiceRegistry.class);
private final NacosDiscoveryProperties nacosDiscoveryProperties;
@@ -119,7 +123,7 @@ public class NacosServiceRegistry implements ServiceRegistry {
@Override
public void setStatus(Registration registration, String status) {
- if (!"UP".equalsIgnoreCase(status) && !"DOWN".equalsIgnoreCase(status)) {
+ if (!STATUS_UP.equalsIgnoreCase(status) && !STATUS_DOWN.equalsIgnoreCase(status)) {
log.warn("can't support status {},please choose UP or DOWN", status);
return;
}
@@ -128,7 +132,7 @@ public class NacosServiceRegistry implements ServiceRegistry {
Instance instance = getNacosInstanceFromRegistration(registration);
- if ("DOWN".equalsIgnoreCase(status)) {
+ if (STATUS_DOWN.equalsIgnoreCase(status)) {
instance.setEnabled(false);
}
else {
@@ -138,7 +142,7 @@ public class NacosServiceRegistry implements ServiceRegistry {
try {
Properties nacosProperties = nacosDiscoveryProperties.getNacosProperties();
nacosServiceManager.getNamingMaintainService(nacosProperties)
- .updateInstance(serviceId, instance);
+ .updateInstance(serviceId, nacosDiscoveryProperties.getGroup(), instance);
}
catch (Exception e) {
throw new RuntimeException("update nacos instance status fail", e);