Skip to content

D
discovery
Commit 9ef5d31c by Nepxion
Options

增加图形化灰度发布功能

parent 278b6cde
Showing with 20 additions and 30 deletions
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
...@@ -119,11 +119,11 @@ public class ServiceTopology extends AbstractTopology { ...@@ -119,11 +119,11 @@ public class ServiceTopology extends AbstractTopology {
TGroup group = TElementManager.getSelectedGroup(dataBox); TGroup group = TElementManager.getSelectedGroup(dataBox);
TNode node = TElementManager.getSelectedNode(dataBox); TNode node = TElementManager.getSelectedNode(dataBox);
executeGrayRouterMenuItem.setVisible(node != null && hasPlugin(node)); executeGrayRouterMenuItem.setVisible(node != null && isPlugin(node));
TElement element = TElementManager.getSelectedElement(dataBox); TElement element = TElementManager.getSelectedElement(dataBox);
executeGrayReleaseMenuItem.setVisible(element != null && hasPlugin(element)); executeGrayReleaseMenuItem.setVisible(element != null && isPlugin(element));
refreshGrayStateMenuItem.setVisible(element != null && hasPlugin(element)); refreshGrayStateMenuItem.setVisible(element != null && isPlugin(element));
if (group != null || node != null || element != null) { if (group != null || node != null || element != null) {
return popupMenu; return popupMenu;
...@@ -215,7 +215,7 @@ public class ServiceTopology extends AbstractTopology { ...@@ -215,7 +215,7 @@ public class ServiceTopology extends AbstractTopology {
TElementManager.addGroupChildren(dataBox, group); TElementManager.addGroupChildren(dataBox, group);
} }
private boolean hasPlugin(TElement element) { private boolean isPlugin(TElement element) {
String plugin = getPlugin(element); String plugin = getPlugin(element);
return StringUtils.isNotEmpty(plugin); return StringUtils.isNotEmpty(plugin);
...@@ -232,7 +232,7 @@ public class ServiceTopology extends AbstractTopology { ...@@ -232,7 +232,7 @@ public class ServiceTopology extends AbstractTopology {
for (Object service : services) { for (Object service : services) {
TGroup group = getGroup(service.toString()); TGroup group = getGroup(service.toString());
// node.getParent() != group 表示自己不能路由自己，暂时不禁止 // node.getParent() != group 表示自己不能路由自己，暂时不禁止
if (group != null && hasPlugin(group)) { if (group != null && isPlugin(group)) {
filterServices.add(service); filterServices.add(service);
} }
} }
...@@ -438,20 +438,16 @@ public class ServiceTopology extends AbstractTopology { ...@@ -438,20 +438,16 @@ public class ServiceTopology extends AbstractTopology {
return; return;
} }
if (group != null) { if (group != null && !isPlugin(group)) {
if (StringUtils.isEmpty(group.getClientProperty("plugin").toString())) { JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("group_not_for_gray_release"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("group_not_for_gray_release"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
return; return;
}
} }
if (node != null) { if (node != null && !isPlugin(node)) {
if (StringUtils.isEmpty(node.getClientProperty("plugin").toString())) { JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("node_not_for_gray_release"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("node_not_for_gray_release"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
return; return;
}
} }
boolean hasException = false; boolean hasException = false;
...@@ -503,12 +499,10 @@ public class ServiceTopology extends AbstractTopology { ...@@ -503,12 +499,10 @@ public class ServiceTopology extends AbstractTopology {
return; return;
} }
if (node != null) { if (node != null && !isPlugin(node)) {
if (StringUtils.isEmpty(node.getClientProperty("plugin").toString())) { JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("node_not_for_gray_router"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("node_not_for_gray_router"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
return; return;
}
} }
InstanceEntity instance = (InstanceEntity) node.getUserObject(); InstanceEntity instance = (InstanceEntity) node.getUserObject();
...@@ -544,20 +538,16 @@ public class ServiceTopology extends AbstractTopology { ...@@ -544,20 +538,16 @@ public class ServiceTopology extends AbstractTopology {
return; return;
} }
if (group != null) { if (group != null && !isPlugin(group)) {
if (StringUtils.isEmpty(group.getClientProperty("plugin").toString())) { JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("group_not_for_refresh_gray_state"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("group_not_for_refresh_gray_state"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
return; return;
}
} }
if (node != null) { if (node != null && !isPlugin(node)) {
if (StringUtils.isEmpty(node.getClientProperty("plugin").toString())) { JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("node_not_for_refresh_gray_state"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
JBasicOptionPane.showMessageDialog(HandleManager.getFrame(ServiceTopology.this), ConsoleLocale.getString("node_not_for_refresh_gray_state"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
return; return;
}
} }
if (group != null) { if (group != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment