增加图形化灰度发布功能

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

@@ -20,6 +20,7 @@ import org.springframework.web.client.RestTemplate;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.nepxion.discovery.console.desktop.context.PropertiesContext;
 import com.nepxion.discovery.console.desktop.entity.InstanceEntity;
+import com.nepxion.discovery.console.desktop.entity.ResultEntity;
 import com.nepxion.discovery.console.desktop.entity.RouterEntity;
 import com.nepxion.discovery.console.desktop.serializer.JacksonSerializer;
 
@@ -35,49 +36,61 @@ public class ServiceController {
 
         String json = restTemplate.getForEntity(url, String.class).getBody();
 
-        return JacksonSerializer.fromJson(json, new TypeReference<Map<String, List<InstanceEntity>>>() {
+        return convert(json, new TypeReference<Map<String, List<InstanceEntity>>>() {
         });
     }
 
-    @SuppressWarnings("unchecked")
     public static List<String> getVersions(InstanceEntity instance) {
         String url = "http://" + instance.getHost() + ":" + instance.getPort() + "/version/view";
 
-        return restTemplate.getForEntity(url, List.class).getBody();
+        String json = restTemplate.getForEntity(url, String.class).getBody();
+
+        return convert(json, new TypeReference<List<String>>() {
+        });
     }
 
-    @SuppressWarnings("unchecked")
     public static List<String> getRules(InstanceEntity instance) {
         String url = "http://" + instance.getHost() + ":" + instance.getPort() + "/config/view";
 
-        return restTemplate.getForEntity(url, List.class).getBody();
+        String json = restTemplate.getForEntity(url, String.class).getBody();
+
+        return convert(json, new TypeReference<List<String>>() {
+        });
     }
 
     public static RouterEntity routes(InstanceEntity instance, String routeServiceIds) {
         String url = "http://" + instance.getHost() + ":" + instance.getPort() + "/router/routes";
 
-        return restTemplate.postForEntity(url, routeServiceIds, RouterEntity.class).getBody();
+        String json = restTemplate.postForEntity(url, routeServiceIds, String.class).getBody();
+
+        return convert(json, new TypeReference<RouterEntity>() {
+        });
     }
 
-    public static String configUpdate(String serviceId, String config) {
+    public static List<ResultEntity> configUpdate(String serviceId, String config) {
         String url = getUrl() + "/console/config/update-sync/" + serviceId;
 
         // 解决中文乱码
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-
         HttpEntity<String> entity = new HttpEntity<String>(config, headers);
 
-        return restTemplate.postForEntity(url, entity, String.class).getBody();
+        String json = restTemplate.postForEntity(url, entity, String.class).getBody();
+
+        return convert(json, new TypeReference<List<ResultEntity>>() {
+        });
     }
 
-    public static String configClear(String serviceId) {
+    public static List<ResultEntity> configClear(String serviceId) {
         String url = getUrl() + "/console/config/clear/" + serviceId;
 
-        return restTemplate.postForEntity(url, null, String.class).getBody();
+        String json = restTemplate.postForEntity(url, null, String.class).getBody();
+
+        return convert(json, new TypeReference<List<ResultEntity>>() {
+        });
     }
 
-    public static String getUrl() {
+    private static String getUrl() {
         String url = PropertiesContext.getProperties().getString("url");
         if (!url.endsWith("/")) {
             url += "/";
@@ -85,4 +98,12 @@ public class ServiceController {
 
         return url;
     }
+
+    private static <T> T convert(String json, TypeReference<T> typeReference) {
+        try {
+            return JacksonSerializer.fromJson(json, typeReference);
+        } catch (Exception e) {
+            throw new IllegalArgumentException(json);
+        }
+    }
 }
\ No newline at end of file

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/entity/ResultEntity.java

+package com.nepxion.discovery.console.desktop.entity;
+
+/**
+ * <p>Title: Nepxion Discovery</p>
+ * <p>Description: Nepxion Discovery</p>
+ * <p>Copyright: Copyright (c) 2017-2050</p>
+ * <p>Company: Nepxion</p>
+ * @author Haojun Ren
+ * @version 1.0
+ */
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public class ResultEntity implements Serializable {
+    private static final long serialVersionUID = -3322655604556025836L;
+
+    private String serviceId;
+    private String url;
+    private String result;
+
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        return EqualsBuilder.reflectionEquals(this, object);
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+    }
+}
\ No newline at end of file

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

@@ -42,6 +42,7 @@ import com.nepxion.cots.twaver.element.TNode;
 import com.nepxion.cots.twaver.graph.TGraphManager;
 import com.nepxion.discovery.console.desktop.controller.ServiceController;
 import com.nepxion.discovery.console.desktop.entity.InstanceEntity;
+import com.nepxion.discovery.console.desktop.entity.ResultEntity;
 import com.nepxion.discovery.console.desktop.icon.ConsoleIconFactory;
 import com.nepxion.discovery.console.desktop.locale.ConsoleLocale;
 import com.nepxion.discovery.console.desktop.util.UIUtil;
@@ -95,6 +96,7 @@ public class ServiceTopology extends AbstractTopology {
     private GrayPanel grayPanel;
     private RouterTopology routerTopology;
     private LayoutDialog layoutDialog;
+    private JBasicTextArea resultTextArea;
 
     public ServiceTopology() {
         initializeToolBar();
@@ -296,8 +298,8 @@ public class ServiceTopology extends AbstractTopology {
 
         try {
             updateGrayState(node);
-        } catch (Exception ex) {
-            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+        } catch (Exception e) {
+            JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), e);
 
             group.removeChild(node);
             dataBox.removeElement(node);
@@ -316,8 +318,8 @@ public class ServiceTopology extends AbstractTopology {
 
             try {
                 updateGrayState(node);
-            } catch (Exception ex) {
-                JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), ex);
+            } catch (Exception e) {
+                JExceptionDialog.traceException(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("query_data_failure"), e);
 
                 iterator.remove();
                 dataBox.removeElement(node);
@@ -327,6 +329,17 @@ public class ServiceTopology extends AbstractTopology {
         updateGroup(group);
     }
 
+    private void showResult(Object result) {
+        if (resultTextArea == null) {
+            resultTextArea = new JBasicTextArea();
+            resultTextArea.setLineWrap(true);
+            resultTextArea.setPreferredSize(new Dimension(800, 800));
+        }
+        resultTextArea.setText(result.toString());
+
+        JBasicOptionPane.showOptionDialog(HandleManager.getFrame(ServiceTopology.this), new JBasicScrollPane(resultTextArea), "执行结果", JBasicOptionPane.DEFAULT_OPTION, JBasicOptionPane.PLAIN_MESSAGE, ConsoleIconFactory.getSwingIcon("banner/edit.png"), new Object[] { SwingLocale.getString("close") }, null, true);
+    }
+
     @Override
     public void showLayout() {
         if (layoutDialog == null) {
@@ -601,18 +614,25 @@ public class ServiceTopology extends AbstractTopology {
 
                 public void execute(ActionEvent e) {
                     String dynamicRule = dynamicRuleTextArea.getText();
+                    if (StringUtils.isEmpty(dynamicRule)) {
+                        JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), "规则不能为空", SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
+
+                        return;
+                    }
 
                     if (group != null) {
                         String serviceId = (String) group.getUserObject();
-                        String result = ServiceController.configUpdate(serviceId, dynamicRule);
+                        List<ResultEntity> results = ServiceController.configUpdate(serviceId, dynamicRule);
+
+                        showResult(results);
 
-                        System.out.println(result);
                         refreshGrayState(group);
                     } else if (node != null) {
                         InstanceEntity instance = (InstanceEntity) node.getUserObject();
 
                         refreshGrayState(node);
                     }
+
                 }
             };
 
@@ -626,9 +646,10 @@ public class ServiceTopology extends AbstractTopology {
                 public void execute(ActionEvent e) {
                     if (group != null) {
                         String serviceId = (String) group.getUserObject();
-                        String result = ServiceController.configClear(serviceId);
+                        List<ResultEntity> results = ServiceController.configClear(serviceId);
+
+                        showResult(results);
 
-                        System.out.println(result);
                         refreshGrayState(group);
                     } else if (node != null) {
                         InstanceEntity instance = (InstanceEntity) node.getUserObject();