Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
谢捷峰
discovery
Commits
31d895e5
Commit
31d895e5
authored
Jul 19, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加图形化灰度发布功能
parent
4179fbf1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
7 deletions
+38
-7
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
+38
-7
No files found.
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
View file @
31d895e5
...
@@ -19,6 +19,7 @@ import java.awt.BorderLayout;
...
@@ -19,6 +19,7 @@ import java.awt.BorderLayout;
import
java.awt.Dimension
;
import
java.awt.Dimension
;
import
java.awt.Point
;
import
java.awt.Point
;
import
java.awt.event.ActionEvent
;
import
java.awt.event.ActionEvent
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
...
@@ -218,15 +219,33 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -218,15 +219,33 @@ public class ServiceTopology extends AbstractTopology {
TElementManager
.
addGroupChildren
(
dataBox
,
group
);
TElementManager
.
addGroupChildren
(
dataBox
,
group
);
}
}
private
Object
[]
filterServices
(
TNode
node
)
{
Object
[]
services
=
instanceMap
.
keySet
().
toArray
();
List
<
Object
>
filterServices
=
new
ArrayList
<
Object
>();
for
(
Object
service
:
services
)
{
TGroup
group
=
getGroup
(
service
.
toString
());
// node.getParent() != group 表示自己不能路由自己,暂时不禁止
if
(
group
!=
null
&&
StringUtils
.
isNotEmpty
(
group
.
getClientProperty
(
"plugin"
).
toString
()))
{
filterServices
.
add
(
service
);
}
}
return
filterServices
.
toArray
();
}
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
private
void
locateGroups
()
{
private
TGroup
getGroup
(
String
serviceId
)
{
List
<
TGroup
>
groups
=
TElementManager
.
getGroups
(
dataBox
);
List
<
TElement
>
elements
=
dataBox
.
getAllElements
();
for
(
TGroup
group
:
groups
)
{
for
(
TElement
element
:
elements
)
{
String
key
=
group
.
getUserObject
().
toString
();
if
(
element
instanceof
TGroup
)
{
if
(
groupLocationMap
.
containsKey
(
key
))
{
if
(
StringUtils
.
equals
(
element
.
getUserObject
().
toString
(),
serviceId
))
{
group
.
setLocation
(
groupLocationMap
.
get
(
key
));
return
(
TGroup
)
element
;
}
}
}
}
}
return
null
;
}
}
private
String
getGroupName
(
String
serviceId
,
int
count
,
String
plugin
)
{
private
String
getGroupName
(
String
serviceId
,
int
count
,
String
plugin
)
{
...
@@ -267,6 +286,17 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -267,6 +286,17 @@ public class ServiceTopology extends AbstractTopology {
}
}
}
}
@SuppressWarnings
(
"unchecked"
)
private
void
locateGroups
()
{
List
<
TGroup
>
groups
=
TElementManager
.
getGroups
(
dataBox
);
for
(
TGroup
group
:
groups
)
{
String
key
=
group
.
getUserObject
().
toString
();
if
(
groupLocationMap
.
containsKey
(
key
))
{
group
.
setLocation
(
groupLocationMap
.
get
(
key
));
}
}
}
private
void
showTopology
(
boolean
reloaded
)
{
private
void
showTopology
(
boolean
reloaded
)
{
dataBox
.
clear
();
dataBox
.
clear
();
groupLocationMap
.
clear
();
groupLocationMap
.
clear
();
...
@@ -474,7 +504,8 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -474,7 +504,8 @@ public class ServiceTopology extends AbstractTopology {
routerTopology
.
setPreferredSize
(
new
Dimension
(
1280
,
900
));
routerTopology
.
setPreferredSize
(
new
Dimension
(
1280
,
900
));
}
}
routerTopology
.
setServices
(
instanceMap
.
keySet
().
toArray
());
Object
[]
filterServices
=
filterServices
(
node
);
routerTopology
.
setServices
(
filterServices
);
routerTopology
.
setInstance
(
instance
);
routerTopology
.
setInstance
(
instance
);
JBasicOptionPane
.
showOptionDialog
(
HandleManager
.
getFrame
(
ServiceTopology
.
this
),
routerTopology
,
ConsoleLocale
.
getString
(
"execute_gray_router"
),
JBasicOptionPane
.
DEFAULT_OPTION
,
JBasicOptionPane
.
PLAIN_MESSAGE
,
ConsoleIconFactory
.
getSwingIcon
(
"banner/navigator.png"
),
new
Object
[]
{
SwingLocale
.
getString
(
"close"
)
},
null
,
true
);
JBasicOptionPane
.
showOptionDialog
(
HandleManager
.
getFrame
(
ServiceTopology
.
this
),
routerTopology
,
ConsoleLocale
.
getString
(
"execute_gray_router"
),
JBasicOptionPane
.
DEFAULT_OPTION
,
JBasicOptionPane
.
PLAIN_MESSAGE
,
ConsoleIconFactory
.
getSwingIcon
(
"banner/navigator.png"
),
new
Object
[]
{
SwingLocale
.
getString
(
"close"
)
},
null
,
true
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment