修正Group为空的Bug

Alleninggx · Jul 9, 2019 · cac3062 · cac3062
1 parent 43e414f
commit cac3062
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/...k/src/main/java/com/nepxion/discovery/plugin/framework/adapter/AbstractPluginAdapter.java b/...k/src/main/java/com/nepxion/discovery/plugin/framework/adapter/AbstractPluginAdapter.java
@@ -170,7 +170,13 @@ public String getRegion() {
 
     @Override
     public String getServerGroupKey(Server server) {
-        return getServerMetadata(server).get(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY);
+        String groupKey = getServerMetadata(server).get(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY);
+
+        if (StringUtils.isEmpty(groupKey)) {
+            groupKey = DiscoveryConstant.GROUP;
+        }
+
+        return groupKey;
     }
 
     @Override
@@ -227,7 +233,13 @@ public Map<String, String> getInstanceMetadata(ServiceInstance serviceInstance)
 
     @Override
     public String getInstanceGroupKey(ServiceInstance serviceInstance) {
-        return getInstanceMetadata(serviceInstance).get(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY);
+        String groupKey = getInstanceMetadata(serviceInstance).get(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY);
+
+        if (StringUtils.isEmpty(groupKey)) {
+            groupKey = DiscoveryConstant.GROUP;
+        }
+
+        return groupKey;
     }
 
     @Override

diff --git a/...va/com/nepxion/discovery/plugin/framework/listener/register/RegisterListenerExecutor.java b/...va/com/nepxion/discovery/plugin/framework/listener/register/RegisterListenerExecutor.java
@@ -28,7 +28,6 @@ public void onRegister(Registration registration) {
     public void onDeregister(Registration registration) {
         for (RegisterListener registerListener : registerListenerList) {
             registerListener.onDeregister(registration);
-
         }
     }
 

diff --git a/discovery-springcloud-example-gateway/src/main/resources/bootstrap.properties b/discovery-springcloud-example-gateway/src/main/resources/bootstrap.properties
@@ -112,7 +112,6 @@ spring.application.strategy.trace.debug.enabled=true
 # spring.application.strategy.hystrix.threadlocal.supported=true
 
 # Spring cloud gateway config
-# 跟Hystrix会冲突。开启Hystrix后，下面项必须注释掉
 # spring.cloud.gateway.discovery.locator.enabled=true
 spring.cloud.gateway.discovery.locator.lowerCaseServiceId=true
 spring.cloud.gateway.routes[0].id=discovery-springcloud-example-a
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ public void onRegister(Registration registration) { @@
         public void onDeregister(Registration registration) {
             for (RegisterListener registerListener : registerListenerList) {
                 registerListener.onDeregister(registration);
             }
         }
@@ Expand Down @@