增加图形化灰度发布功能

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/controller/ServiceController.java

@@ -186,6 +186,9 @@ public class ServiceController {
         try {
             return JacksonSerializer.fromJson(result, typeReference);
         } catch (Exception e) {
+            ServiceErrorHandler errorHandler = (ServiceErrorHandler) restTemplate.getErrorHandler();
+            result = errorHandler.getCause();
+
             throw new IllegalArgumentException(result);
         }
     }

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

@@ -53,6 +53,7 @@ import com.nepxion.swing.button.JBasicButton;
 import com.nepxion.swing.button.JBasicToggleButton;
 import com.nepxion.swing.button.JClassicButton;
 import com.nepxion.swing.combobox.JBasicComboBox;
+import com.nepxion.swing.dialog.JExceptionDialog;
 import com.nepxion.swing.handle.HandleManager;
 import com.nepxion.swing.listener.DisplayAbilityListener;
 import com.nepxion.swing.locale.SwingLocale;
@@ -256,7 +257,15 @@ public class RouterTopology extends AbstractTopology {
                     return;
                 }
 
-                RouterEntity routerEntity = ServiceController.routes(instance, routerPath);
+                RouterEntity routerEntity = null;
+                try {
+                    routerEntity = ServiceController.routes(instance, routerPath);
+                } catch (Exception ex) {
+                    JExceptionDialog.traceException(HandleManager.getFrame(RouterTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                    return;
+                }
+
                 route(routerEntity);
 
                 layoutActionListener.actionPerformed(null);

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

@@ -728,7 +728,16 @@ public class ServiceTopology extends AbstractTopology {
 
                     if (group != null) {
                         String serviceId = (String) group.getUserObject();
-                        List<ResultEntity> results = ServiceController.versionUpdate(serviceId, dynamicVersion);
+                        List<ResultEntity> results = null;
+                        try {
+                            results = ServiceController.versionUpdate(serviceId, dynamicVersion);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(group);
+
+                            return;
+                        }
 
                         showResult(results);
 
@@ -736,7 +745,16 @@ public class ServiceTopology extends AbstractTopology {
                     } else if (node != null) {
                         InstanceEntity instance = (InstanceEntity) node.getUserObject();
 
-                        String result = ServiceController.versionUpdate(instance, dynamicVersion);
+                        String result = null;
+                        try {
+                            result = ServiceController.versionUpdate(instance, dynamicVersion);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(node);
+
+                            return;
+                        }
 
                         showResult(result);
 
@@ -755,7 +773,16 @@ public class ServiceTopology extends AbstractTopology {
                 public void execute(ActionEvent e) {
                     if (group != null) {
                         String serviceId = (String) group.getUserObject();
-                        List<ResultEntity> results = ServiceController.versionClear(serviceId);
+                        List<ResultEntity> results = null;
+                        try {
+                            results = ServiceController.versionClear(serviceId);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(group);
+
+                            return;
+                        }
 
                         showResult(results);
 
@@ -763,7 +790,16 @@ public class ServiceTopology extends AbstractTopology {
                     } else if (node != null) {
                         InstanceEntity instance = (InstanceEntity) node.getUserObject();
 
-                        String result = ServiceController.versionClear(instance);
+                        String result = null;
+                        try {
+                            result = ServiceController.versionClear(instance);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(node);
+
+                            return;
+                        }
 
                         showResult(result);
 
@@ -789,7 +825,16 @@ public class ServiceTopology extends AbstractTopology {
 
                     if (group != null) {
                         String serviceId = (String) group.getUserObject();
-                        List<ResultEntity> results = ServiceController.configUpdate(serviceId, dynamicRule);
+                        List<ResultEntity> results = null;
+                        try {
+                            results = ServiceController.configUpdate(serviceId, dynamicRule);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(group);
+
+                            return;
+                        }
 
                         showResult(results);
 
@@ -797,7 +842,16 @@ public class ServiceTopology extends AbstractTopology {
                     } else if (node != null) {
                         InstanceEntity instance = (InstanceEntity) node.getUserObject();
 
-                        String result = ServiceController.configUpdate(instance, dynamicRule);
+                        String result = null;
+                        try {
+                            result = ServiceController.configUpdate(instance, dynamicRule);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(node);
+
+                            return;
+                        }
 
                         showResult(result);
 
@@ -816,7 +870,16 @@ public class ServiceTopology extends AbstractTopology {
                 public void execute(ActionEvent e) {
                     if (group != null) {
                         String serviceId = (String) group.getUserObject();
-                        List<ResultEntity> results = ServiceController.configClear(serviceId);
+                        List<ResultEntity> results = null;
+                        try {
+                            results = ServiceController.configClear(serviceId);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(group);
+
+                            return;
+                        }
 
                         showResult(results);
 
@@ -824,7 +887,16 @@ public class ServiceTopology extends AbstractTopology {
                     } else if (node != null) {
                         InstanceEntity instance = (InstanceEntity) node.getUserObject();
 
-                        String result = ServiceController.configClear(instance);
+                        String result = null;
+                        try {
+                            result = ServiceController.configClear(instance);
+                        } catch (Exception ex) {
+                            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+
+                            refreshGrayState(node);
+
+                            return;
+                        }
 
                         showResult(result);
 

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

@@ -16,7 +16,7 @@ clear_router=清除路由
 router_path_invalid=路由路径不能为空
 
 get_service_instances_failure=获取服务和实例列表失败
-query_data_failure=查询数据失败，可能该实例已下线
+query_data_failure=查询数据失败，可能相关实例已下线
 
 select_a_group=请选择一个服务集群
 select_a_node=请选择一个服务

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

@@ -16,7 +16,7 @@ clear_router=\u6e05\u9664\u8def\u7531
 router_path_invalid=\u8def\u7531\u8def\u5f84\u4e0d\u80fd\u4e3a\u7a7a
 
 get_service_instances_failure=\u83b7\u53d6\u670d\u52a1\u548c\u5b9e\u4f8b\u5217\u8868\u5931\u8d25
-query_data_failure=\u67e5\u8be2\u6570\u636e\u5931\u8d25\uff0c\u53ef\u80fd\u8be5\u5b9e\u4f8b\u5df2\u4e0b\u7ebf
+query_data_failure=\u67e5\u8be2\u6570\u636e\u5931\u8d25\uff0c\u53ef\u80fd\u76f8\u5173\u5b9e\u4f8b\u5df2\u4e0b\u7ebf
 
 select_a_group=\u8bf7\u9009\u62e9\u4e00\u4e2a\u670d\u52a1\u96c6\u7fa4
 select_a_node=\u8bf7\u9009\u62e9\u4e00\u4e2a\u670d\u52a1