增加图形化灰度发布功能

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/constant/ConsoleConstant.java

@@ -17,5 +17,4 @@ public class ConsoleConstant {
 
     public static final String FILTER = "filter";
     public static final String PLUGIN = "plugin";
-    public static final String NO_FILTER_DESCRIPTION = "[No filter]";
 }
\ No newline at end of file

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

@@ -82,6 +82,8 @@ import com.nepxion.swing.textfield.number.JNumberTextField;
 public class ServiceTopology extends AbstractTopology {
     private static final long serialVersionUID = 1L;
 
+    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 TopologyEntity serviceGroupEntity = new TopologyEntity(TopologyEntityType.SERVICE, true, true);
@@ -225,7 +227,7 @@ public class ServiceTopology extends AbstractTopology {
         String filter = getValidFilter(instances);
         String plugin = getValidPlugin(instances);
 
-        if (!StringUtils.equals(filterId, ConsoleConstant.NO_FILTER_DESCRIPTION) && !StringUtils.equals(filterId, filter)) {
+        if (!StringUtils.equals(filterId, NO_FILTER) && !StringUtils.equals(filterId, filter)) {
             return;
         }
 
@@ -305,7 +307,7 @@ public class ServiceTopology extends AbstractTopology {
         if (filters.contains("")) {
             filters.remove("");
         }
-        filters.add(ConsoleConstant.NO_FILTER_DESCRIPTION);
+        filters.add(NO_FILTER);
 
         return filters.toArray();
     }
@@ -514,7 +516,7 @@ public class ServiceTopology extends AbstractTopology {
                 globalFilter = filterPanel.getFilter();
 
                 String title = ConsoleLocale.getString("title_service_cluster_gray_release");
-                if (!StringUtils.equals(globalFilter, ConsoleConstant.NO_FILTER_DESCRIPTION)) {
+                if (!StringUtils.equals(globalFilter, NO_FILTER)) {
                     title += " [" + globalFilter + "]";
                 }
                 background.setTitle(title);
@@ -671,7 +673,7 @@ public class ServiceTopology extends AbstractTopology {
 
             setLayout(new FiledLayout(FiledLayout.COLUMN, FiledLayout.FULL, 5));
             add(filterComboBox);
-            add(new JLabel(ConsoleConstant.NO_FILTER_DESCRIPTION + " - " + ConsoleLocale.getString("no_service_cluster_filter")));
+            add(new JLabel(NO_FILTER + " - " + ConsoleLocale.getString("description_no_service_cluster_filter")));
         }
 
         @SuppressWarnings("unchecked")

discovery-console-desktop/src/main/resources/com/nepxion/discovery/console/desktop/locale/Locale.properties

@@ -14,8 +14,9 @@ rule_control_mode_to_config_center=推送到远程配置中心
 rule_control_mode_to_service=推送到服务
 
 title_service_cluster_gray_release=服务集群灰度发布
-service_cluster_filter=服务集群过滤
-no_service_cluster_filter=表示不过滤，执行跨服务集群灰度发布
+service_cluster_filter=服务集群选取
+no_service_cluster_filter=全部服务集群
+description_no_service_cluster_filter=便于执行跨服务集群灰度发布
 
 title_service_gray_router=服务灰度路由
 service_list=服务列表

discovery-console-desktop/src/main/resources/com/nepxion/discovery/console/desktop/locale/Locale_zh_CN.properties

@@ -14,8 +14,9 @@ rule_control_mode_to_config_center=\u63a8\u9001\u5230\u8fdc\u7a0b\u914d\u7f6e\u4
 rule_control_mode_to_service=\u63a8\u9001\u5230\u670d\u52a1
 
 title_service_cluster_gray_release=\u670d\u52a1\u96c6\u7fa4\u7070\u5ea6\u53d1\u5e03
-service_cluster_filter=\u670d\u52a1\u96c6\u7fa4\u8fc7\u6ee4
-no_service_cluster_filter=\u8868\u793a\u4e0d\u8fc7\u6ee4\uff0c\u6267\u884c\u8de8\u670d\u52a1\u96c6\u7fa4\u7070\u5ea6\u53d1\u5e03
+service_cluster_filter=\u670d\u52a1\u96c6\u7fa4\u9009\u53d6
+no_service_cluster_filter=\u5168\u90e8\u670d\u52a1\u96c6\u7fa4
+description_no_service_cluster_filter=\u4fbf\u4e8e\u6267\u884c\u8de8\u670d\u52a1\u96c6\u7fa4\u7070\u5ea6\u53d1\u5e03
 
 title_service_gray_router=\u670d\u52a1\u7070\u5ea6\u8def\u7531
 service_list=\u670d\u52a1\u5217\u8868