增加基于Region的权重流量策略

discovery-common/src/main/java/com/nepxion/discovery/common/entity/InstanceEntity.java

@@ -22,6 +22,7 @@ public class InstanceEntity implements Serializable {
 
     private String serviceId;
     private String version;
+    private String region;
     private String host;
     private int port;
     private Map<String, String> metadata;
@@ -42,6 +43,14 @@ public class InstanceEntity implements Serializable {
         this.version = version;
     }
 
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
     public String getHost() {
         return host;
     }

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java

@@ -93,7 +93,7 @@ public class ServiceTopology extends AbstractTopology {
     public static final String NO_FILTER = ConsoleLocale.getString("no_service_cluster_filter");
 
     private LocationEntity groupLocationEntity = new LocationEntity(120, 250, 280, 0);
-    private LocationEntity nodeLocationEntity = new LocationEntity(0, 0, 120, 100);
+    private LocationEntity nodeLocationEntity = new LocationEntity(0, 0, 120, 120);
     private TopologyEntity serviceGroupEntity = new TopologyEntity(TopologyEntityType.SERVICE_GROUP, TopologyStyleType.LARGE, true);
     private TopologyEntity notServiceGroupEntity = new TopologyEntity(TopologyEntityType.GATEWAY_GROUP, TopologyStyleType.LARGE, true);
     private TopologyEntity serviceNodeEntity = new TopologyEntity(TopologyEntityType.SERVICE, TopologyStyleType.MIDDLE, false);
@@ -404,6 +404,9 @@ public class ServiceTopology extends AbstractTopology {
                 stringBuilder.append(" -> V").append(instance.getDynamicVersion());
             }
             stringBuilder.append("]");
+            if (StringUtils.isNotEmpty(instance.getRegion())) {
+                stringBuilder.append("\n [Region=").append(instance.getRegion()).append("]");
+            }
         }
 
         return ButtonManager.getHtmlText(stringBuilder.toString());

discovery-console/src/main/java/com/nepxion/discovery/console/endpoint/ConsoleEndpoint.java

@@ -216,12 +216,14 @@ public class ConsoleEndpoint {
             Map<String, String> metadata = serviceInstance.getMetadata();
             String serviceId = serviceInstance.getServiceId().toLowerCase();
             String version = metadata.get(DiscoveryConstant.VERSION);
+            String region = metadata.get(DiscoveryConstant.REGION);
             String host = serviceInstance.getHost();
             int port = serviceInstance.getPort();
 
             InstanceEntity instanceEntity = new InstanceEntity();
             instanceEntity.setServiceId(serviceId);
             instanceEntity.setVersion(version);
+            instanceEntity.setRegion(region);
             instanceEntity.setHost(host);
             instanceEntity.setPort(port);
             instanceEntity.setMetadata(metadata);