代码回退

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

@@ -104,9 +104,8 @@ public class ServiceTopology extends AbstractTopology {
     private JBasicMenuItem executeGrayRouterMenuItem;
     private JBasicRadioButtonMenuItem pushAsyncModeRadioButtonMenuItem;
     private JBasicRadioButtonMenuItem pushSyncModeRadioButtonMenuItem;
-    private JBasicRadioButtonMenuItem ruleToAllClustersRadioButtonMenuItem;
-    private JBasicRadioButtonMenuItem ruleToOneClusterRadioButtonMenuItem;
-    private JBasicRadioButtonMenuItem ruleToOneServiceRadioButtonMenuItem;
+    private JBasicRadioButtonMenuItem ruleToConfigCenterRadioButtonMenuItem;
+    private JBasicRadioButtonMenuItem ruleToServiceRadioButtonMenuItem;
     private FilterPanel filterPanel;
     private GrayPanel grayPanel;
     private JBasicTextArea resultTextArea;
@@ -160,21 +159,18 @@ public class ServiceTopology extends AbstractTopology {
         pushModeButtonGroup.add(pushAsyncModeRadioButtonMenuItem);
         pushModeButtonGroup.add(pushSyncModeRadioButtonMenuItem);
 
-        ruleToAllClustersRadioButtonMenuItem = new JBasicRadioButtonMenuItem(ConsoleLocale.getString("rule_to_all_clusters"), ConsoleLocale.getString("rule_to_all_clusters"), true);
-        ruleToOneClusterRadioButtonMenuItem = new JBasicRadioButtonMenuItem(ConsoleLocale.getString("rule_to_one_cluster"), ConsoleLocale.getString("rule_to_one_cluster"));
-        ruleToOneServiceRadioButtonMenuItem = new JBasicRadioButtonMenuItem(ConsoleLocale.getString("rule_to_one_service"), ConsoleLocale.getString("rule_to_one_service"));
+        ruleToConfigCenterRadioButtonMenuItem = new JBasicRadioButtonMenuItem(ConsoleLocale.getString("rule_control_mode_to_config_center"), ConsoleLocale.getString("rule_control_mode_to_config_center"), true);
+        ruleToServiceRadioButtonMenuItem = new JBasicRadioButtonMenuItem(ConsoleLocale.getString("rule_control_mode_to_service"), ConsoleLocale.getString("rule_control_mode_to_service"));
         ButtonGroup ruleToButtonGroup = new ButtonGroup();
-        ruleToButtonGroup.add(ruleToAllClustersRadioButtonMenuItem);
-        ruleToButtonGroup.add(ruleToOneClusterRadioButtonMenuItem);
-        ruleToButtonGroup.add(ruleToOneServiceRadioButtonMenuItem);
+        ruleToButtonGroup.add(ruleToConfigCenterRadioButtonMenuItem);
+        ruleToButtonGroup.add(ruleToServiceRadioButtonMenuItem);
 
         JBasicPopupMenu pushControlPopupMenu = new JBasicPopupMenu();
         pushControlPopupMenu.add(pushAsyncModeRadioButtonMenuItem);
         pushControlPopupMenu.add(pushSyncModeRadioButtonMenuItem);
         pushControlPopupMenu.addSeparator();
-        pushControlPopupMenu.add(ruleToAllClustersRadioButtonMenuItem);
-        pushControlPopupMenu.add(ruleToOneClusterRadioButtonMenuItem);
-        pushControlPopupMenu.add(ruleToOneServiceRadioButtonMenuItem);
+        pushControlPopupMenu.add(ruleToConfigCenterRadioButtonMenuItem);
+        pushControlPopupMenu.add(ruleToServiceRadioButtonMenuItem);
 
         JClassicMenuButton pushControllMenubutton = new JClassicMenuButton(ConsoleLocale.getString("push_control_mode"), ConsoleIconFactory.getSwingIcon("component/advanced_16.png"), ConsoleLocale.getString("push_control_mode"));
         pushControllMenubutton.setPopupMenu(pushControlPopupMenu);
@@ -835,7 +831,7 @@ public class ServiceTopology extends AbstractTopology {
             toolBar.add(clearRuleButton);
             ButtonManager.updateUI(toolBar);
 
-            ruleInfoLabel = new JLabel(ConsoleLocale.getString("description_gray_rule_to_one_cluster"), IconFactory.getSwingIcon("question_message.png"), SwingConstants.LEADING);
+            ruleInfoLabel = new JLabel(ConsoleLocale.getString("description_gray_rule_to_config_center"), IconFactory.getSwingIcon("question_message.png"), SwingConstants.LEADING);
 
             JPanel layoutPanel = new JPanel();
             layoutPanel.setLayout(new FiledLayout(FiledLayout.COLUMN, FiledLayout.FULL, 5));
@@ -856,8 +852,8 @@ public class ServiceTopology extends AbstractTopology {
             this.group = group;
             this.node = null;
 
-            boolean versionControlEnabled = ruleToOneClusterRadioButtonMenuItem.isSelected();
-            boolean ruleControlEnabled = ruleToOneClusterRadioButtonMenuItem.isSelected();
+            boolean versionControlEnabled = ruleToConfigCenterRadioButtonMenuItem.isSelected();
+            boolean ruleControlEnabled = ruleToConfigCenterRadioButtonMenuItem.isSelected();
             if (!versionControlEnabled && !ruleControlEnabled) {
                 for (Iterator<TNode> iterator = group.children(); iterator.hasNext();) {
                     TNode node = iterator.next();
@@ -896,14 +892,14 @@ public class ServiceTopology extends AbstractTopology {
             clearRuleButton.setEnabled(ruleControlEnabled);
 
             String ruleInfo = null;
-            if (ruleToOneClusterRadioButtonMenuItem.isSelected()) {
+            if (ruleToConfigCenterRadioButtonMenuItem.isSelected()) {
                 String filter = getFilter(group);
                 String serviceId = group.getUserObject().toString();
                 String config = ServiceController.remoteConfigView(filter, serviceId);
                 dynamicRuleTextArea.setText(config);
-                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_one_cluster");
+                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_config_center");
             } else {
-                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_one_service");
+                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_service");
             }
 
             ruleInfoLabel.setText(ruleInfo);
@@ -915,7 +911,7 @@ public class ServiceTopology extends AbstractTopology {
             Instance instance = (Instance) node.getUserObject();
 
             boolean versionControlEnabled = instance.isDiscoveryControlEnabled();
-            boolean ruleControlEnabled = instance.isDiscoveryControlEnabled() && instance.isConfigRestControlEnabled() && !ruleToOneClusterRadioButtonMenuItem.isSelected();
+            boolean ruleControlEnabled = instance.isDiscoveryControlEnabled() && instance.isConfigRestControlEnabled() && !ruleToConfigCenterRadioButtonMenuItem.isSelected();
 
             if (versionTabbedPane.getTabCount() == 1) {
                 versionTabbedPane.addTab(ConsoleLocale.getString("label_local_version"), localVersionPanel, ConsoleLocale.getString("label_local_version"));
@@ -939,10 +935,10 @@ public class ServiceTopology extends AbstractTopology {
             clearRuleButton.setEnabled(ruleControlEnabled);
 
             String ruleInfo = null;
-            if (ruleToOneClusterRadioButtonMenuItem.isSelected()) {
-                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_one_cluster");
+            if (ruleToConfigCenterRadioButtonMenuItem.isSelected()) {
+                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_config_center");
             } else {
-                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_one_service");
+                ruleInfo = ConsoleLocale.getString("description_gray_rule_to_service");
             }
 
             ruleInfoLabel.setText(ruleInfo);
@@ -1060,7 +1056,7 @@ public class ServiceTopology extends AbstractTopology {
                     if (group != null) {
                         String serviceId = group.getUserObject().toString();
 
-                        if (ruleToOneClusterRadioButtonMenuItem.isSelected()) {
+                        if (ruleToConfigCenterRadioButtonMenuItem.isSelected()) {
                             String filter = getFilter(group);
                             String result = null;
                             try {
@@ -1121,7 +1117,7 @@ public class ServiceTopology extends AbstractTopology {
                 public void execute(ActionEvent e) {
                     if (group != null) {
                         String serviceId = group.getUserObject().toString();
-                        if (ruleToOneClusterRadioButtonMenuItem.isSelected()) {
+                        if (ruleToConfigCenterRadioButtonMenuItem.isSelected()) {
                             String filter = getFilter(group);
                             String result = null;
                             try {

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

@@ -12,9 +12,8 @@ refresh_gray_state=刷新灰度状态
 push_control_mode=推送模式设置
 push_async_mode=异步推送
 push_sync_mode=同步推送
-rule_to_all_clusters=规则通过远程配置中心，推送到所有服务集群
-rule_to_one_cluster=规则通过远程配置中心，推送到单个服务集群
-rule_to_one_service=规则通过Rest方式，推送到单个服务
+rule_control_mode_to_config_center=规则推送到远程配置中心
+rule_control_mode_to_service=规则推送到服务
 
 title_service_cluster_gray_release=服务集群灰度发布
 service_cluster_filter=服务集群选取
@@ -41,9 +40,8 @@ button_batch_update_version=批量更新灰度版本
 button_batch_clear_version=批量清除灰度版本
 button_update_rule=更新灰度规则
 button_clear_rule=清除灰度规则
-description_gray_rule_to_all_clusters=灰度规则，输入的格式为XML。目前采用的推送模式是 [推送到所有服务集群]，从工具栏的“全局推送”入口进行推送
-description_gray_rule_to_one_cluster=灰度规则，输入的格式为XML。目前采用的推送模式是 [推送到单个服务集群]，从界面上选取单个服务集群进行推送
-description_gray_rule_to_one_service=灰度规则，输入的格式为XML。目前采用的推送模式是 [推送到单个服务]，从界面上选取单个服务进行推送
+description_gray_rule_to_config_center=灰度规则，输入的格式为XML。目前采用的推送模式是 [推送到远程配置中心]，只支持批量服务推送，不支持单个服务推送
+description_gray_rule_to_service=灰度规则，输入的格式为XML。目前采用的推送模式是 [推送到服务]
 button_batch_update_rule=批量更新灰度规则
 button_batch_clear_rule=批量清除灰度规则
 description_gray_version=灰度版本，输入的格式为[dynamicVersion]或者[dynamicVersion];[localVersion]，例如1.1或者1.1;1.0，前者直接更新灰度版本为1.1，后者只是把满足初始版本为1.0条件的服务更新灰度版本为1.1

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

@@ -12,9 +12,8 @@ refresh_gray_state=\u5237\u65b0\u7070\u5ea6\u72b6\u6001
 push_control_mode=\u63a8\u9001\u6a21\u5f0f\u8bbe\u7f6e
 push_async_mode=\u5f02\u6b65\u63a8\u9001
 push_sync_mode=\u540c\u6b65\u63a8\u9001
-rule_to_all_clusters=\u89c4\u5219\u901a\u8fc7\u8fdc\u7a0b\u914d\u7f6e\u4e2d\u5fc3\uff0c\u63a8\u9001\u5230\u6240\u6709\u670d\u52a1\u96c6\u7fa4
-rule_to_one_cluster=\u89c4\u5219\u901a\u8fc7\u8fdc\u7a0b\u914d\u7f6e\u4e2d\u5fc3\uff0c\u63a8\u9001\u5230\u5355\u4e2a\u670d\u52a1\u96c6\u7fa4
-rule_to_one_service=\u89c4\u5219\u901a\u8fc7Rest\u65b9\u5f0f\uff0c\u63a8\u9001\u5230\u5355\u4e2a\u670d\u52a1
+rule_control_mode_to_config_center=\u89c4\u5219\u63a8\u9001\u5230\u8fdc\u7a0b\u914d\u7f6e\u4e2d\u5fc3
+rule_control_mode_to_service=\u89c4\u5219\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\u9009\u53d6
@@ -41,9 +40,8 @@ button_batch_update_version=\u6279\u91cf\u66f4\u65b0\u7070\u5ea6\u7248\u672c
 button_batch_clear_version=\u6279\u91cf\u6e05\u9664\u7070\u5ea6\u7248\u672c
 button_update_rule=\u66f4\u65b0\u7070\u5ea6\u89c4\u5219
 button_clear_rule=\u6e05\u9664\u7070\u5ea6\u89c4\u5219
-description_gray_rule_to_all_clusters=\u7070\u5ea6\u89c4\u5219\uff0c\u8f93\u5165\u7684\u683c\u5f0f\u4e3aXML\u3002\u76ee\u524d\u91c7\u7528\u7684\u63a8\u9001\u6a21\u5f0f\u662f [\u63a8\u9001\u5230\u6240\u6709\u670d\u52a1\u96c6\u7fa4]\uff0c\u4ece\u5de5\u5177\u680f\u7684\u201c\u5168\u5c40\u63a8\u9001\u201d\u5165\u53e3\u8fdb\u884c\u63a8\u9001
-description_gray_rule_to_one_cluster=\u7070\u5ea6\u89c4\u5219\uff0c\u8f93\u5165\u7684\u683c\u5f0f\u4e3aXML\u3002\u76ee\u524d\u91c7\u7528\u7684\u63a8\u9001\u6a21\u5f0f\u662f [\u63a8\u9001\u5230\u5355\u4e2a\u670d\u52a1\u96c6\u7fa4]\uff0c\u4ece\u754c\u9762\u4e0a\u9009\u53d6\u5355\u4e2a\u670d\u52a1\u96c6\u7fa4\u8fdb\u884c\u63a8\u9001
-description_gray_rule_to_one_service=\u7070\u5ea6\u89c4\u5219\uff0c\u8f93\u5165\u7684\u683c\u5f0f\u4e3aXML\u3002\u76ee\u524d\u91c7\u7528\u7684\u63a8\u9001\u6a21\u5f0f\u662f [\u63a8\u9001\u5230\u5355\u4e2a\u670d\u52a1]\uff0c\u4ece\u754c\u9762\u4e0a\u9009\u53d6\u5355\u4e2a\u670d\u52a1\u8fdb\u884c\u63a8\u9001
+description_gray_rule_to_config_center=\u7070\u5ea6\u89c4\u5219\uff0c\u8f93\u5165\u7684\u683c\u5f0f\u4e3aXML\u3002\u76ee\u524d\u91c7\u7528\u7684\u63a8\u9001\u6a21\u5f0f\u662f [\u63a8\u9001\u5230\u8fdc\u7a0b\u914d\u7f6e\u4e2d\u5fc3]\uff0c\u53ea\u652f\u6301\u6279\u91cf\u670d\u52a1\u63a8\u9001\uff0c\u4e0d\u652f\u6301\u5355\u4e2a\u670d\u52a1\u63a8\u9001
+description_gray_rule_to_service=\u7070\u5ea6\u89c4\u5219\uff0c\u8f93\u5165\u7684\u683c\u5f0f\u4e3aXML\u3002\u76ee\u524d\u91c7\u7528\u7684\u63a8\u9001\u6a21\u5f0f\u662f [\u63a8\u9001\u5230\u670d\u52a1]
 button_batch_update_rule=\u6279\u91cf\u66f4\u65b0\u7070\u5ea6\u89c4\u5219
 button_batch_clear_rule=\u6279\u91cf\u6e05\u9664\u7070\u5ea6\u89c4\u5219
 description_gray_version=\u7070\u5ea6\u7248\u672c\uff0c\u8f93\u5165\u7684\u683c\u5f0f\u4e3a[dynamicVersion]\u6216\u8005[dynamicVersion];[localVersion]\uff0c\u4f8b\u59821.1\u6216\u80051.1;1.0\uff0c\u524d\u8005\u76f4\u63a5\u66f4\u65b0\u7070\u5ea6\u7248\u672c\u4e3a1.1\uff0c\u540e\u8005\u53ea\u662f\u628a\u6ee1\u8db3\u521d\u59cb\u7248\u672c\u4e3a1.0\u6761\u4ef6\u7684\u670d\u52a1\u66f4\u65b0\u7070\u5ea6\u7248\u672c\u4e3a1.1