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
82c42e9c
Commit
82c42e9c
authored
Nov 11, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
界面增加显示Metadata功能
parent
804ddb6c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
0 deletions
+62
-0
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
+58
-0
discovery-console-desktop/src/main/resources/com/nepxion/discovery/console/desktop/locale/Locale.properties
+2
-0
discovery-console-desktop/src/main/resources/com/nepxion/discovery/console/desktop/locale/Locale_zh_CN.properties
+2
-0
No files found.
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
View file @
82c42e9c
...
...
@@ -104,6 +104,7 @@ public class ServiceTopology extends AbstractTopology {
private
JBasicMenuItem
executeGrayReleaseMenuItem
;
private
JBasicMenuItem
refreshGrayStateMenuItem
;
private
JBasicMenuItem
executeGrayRouterMenuItem
;
private
JBasicMenuItem
showMetadataActionMenuItem
;
private
JBasicRadioButtonMenuItem
pushAsyncModeRadioButtonMenuItem
;
private
JBasicRadioButtonMenuItem
pushSyncModeRadioButtonMenuItem
;
private
JBasicRadioButtonMenuItem
ruleToConfigCenterRadioButtonMenuItem
;
...
...
@@ -111,6 +112,7 @@ public class ServiceTopology extends AbstractTopology {
private
GlobalGrayPanel
globalGrayPanel
;
private
GrayPanel
grayPanel
;
private
JBasicTextArea
resultTextArea
;
private
JBasicTextArea
metadataTextArea
;
private
RouterTopology
routerTopology
;
private
LayoutDialog
layoutDialog
;
...
...
@@ -128,9 +130,11 @@ public class ServiceTopology extends AbstractTopology {
executeGrayReleaseMenuItem
=
new
JBasicMenuItem
(
createExecuteGrayReleaseAction
());
refreshGrayStateMenuItem
=
new
JBasicMenuItem
(
createRefreshGrayStateAction
());
executeGrayRouterMenuItem
=
new
JBasicMenuItem
(
createExecuteGrayRouterAction
());
showMetadataActionMenuItem
=
new
JBasicMenuItem
(
createShowMetadataAction
());
popupMenu
.
add
(
executeGrayReleaseMenuItem
,
0
);
popupMenu
.
add
(
executeGrayRouterMenuItem
,
1
);
popupMenu
.
add
(
refreshGrayStateMenuItem
,
2
);
popupMenu
.
add
(
showMetadataActionMenuItem
,
3
);
}
@Override
...
...
@@ -145,6 +149,7 @@ public class ServiceTopology extends AbstractTopology {
TElement
element
=
TElementManager
.
getSelectedElement
(
dataBox
);
executeGrayReleaseMenuItem
.
setVisible
(
element
!=
null
&&
isPlugin
(
element
));
refreshGrayStateMenuItem
.
setVisible
(
element
!=
null
&&
isPlugin
(
element
));
showMetadataActionMenuItem
.
setVisible
(
node
!=
null
);
if
(
group
!=
null
||
node
!=
null
||
element
!=
null
)
{
return
popupMenu
;
...
...
@@ -184,6 +189,7 @@ public class ServiceTopology extends AbstractTopology {
toolBar
.
add
(
new
JClassicButton
(
createExecuteGrayReleaseAction
()));
toolBar
.
add
(
new
JClassicButton
(
createExecuteGrayRouterAction
()));
toolBar
.
add
(
new
JClassicButton
(
createRefreshGrayStateAction
()));
toolBar
.
add
(
new
JClassicButton
(
createShowMetadataAction
()));
toolBar
.
add
(
new
JClassicButton
(
createPushGlobalConfigAction
()));
toolBar
.
add
(
pushControllMenubutton
);
toolBar
.
addSeparator
();
...
...
@@ -491,6 +497,30 @@ public class ServiceTopology extends AbstractTopology {
JBasicOptionPane
.
showOptionDialog
(
HandleManager
.
getFrame
(
this
),
new
JBasicScrollPane
(
resultTextArea
),
ConsoleLocale
.
getString
(
"execute_result"
),
JBasicOptionPane
.
DEFAULT_OPTION
,
JBasicOptionPane
.
PLAIN_MESSAGE
,
ConsoleIconFactory
.
getSwingIcon
(
"banner/edit.png"
),
new
Object
[]
{
SwingLocale
.
getString
(
"close"
)
},
null
,
true
);
}
private
void
showMetadata
(
Instance
instance
)
{
Map
<
String
,
String
>
metadata
=
instance
.
getMetadata
();
StringBuilder
stringBuilder
=
new
StringBuilder
();
for
(
Map
.
Entry
<
String
,
String
>
entry
:
metadata
.
entrySet
())
{
String
key
=
entry
.
getKey
();
String
value
=
entry
.
getValue
();
stringBuilder
.
append
(
key
).
append
(
"="
).
append
(
value
).
append
(
"\n"
);
}
if
(
metadataTextArea
==
null
)
{
metadataTextArea
=
new
JBasicTextArea
();
metadataTextArea
.
setLineWrap
(
true
);
metadataTextArea
.
setPreferredSize
(
new
Dimension
(
800
,
600
));
}
String
result
=
stringBuilder
.
toString
();
if
(
StringUtils
.
isNotEmpty
(
result
))
{
result
=
result
.
substring
(
0
,
result
.
lastIndexOf
(
"\n"
));
}
metadataTextArea
.
setText
(
result
);
JBasicOptionPane
.
showOptionDialog
(
HandleManager
.
getFrame
(
this
),
new
JBasicScrollPane
(
metadataTextArea
),
ConsoleLocale
.
getString
(
"show_metadata"
),
JBasicOptionPane
.
DEFAULT_OPTION
,
JBasicOptionPane
.
PLAIN_MESSAGE
,
ConsoleIconFactory
.
getSwingIcon
(
"banner/property.png"
),
new
Object
[]
{
SwingLocale
.
getString
(
"close"
)
},
null
,
true
);
}
@Override
public
void
showLayout
()
{
if
(
layoutDialog
==
null
)
{
...
...
@@ -693,6 +723,34 @@ public class ServiceTopology extends AbstractTopology {
return
action
;
}
private
JSecurityAction
createShowMetadataAction
()
{
JSecurityAction
action
=
new
JSecurityAction
(
ConsoleLocale
.
getString
(
"show_metadata"
),
ConsoleIconFactory
.
getSwingIcon
(
"component/file_chooser_16.png"
),
ConsoleLocale
.
getString
(
"show_metadata"
))
{
private
static
final
long
serialVersionUID
=
1L
;
public
void
execute
(
ActionEvent
e
)
{
TNode
node
=
TElementManager
.
getSelectedNode
(
dataBox
);
if
(
node
==
null
)
{
JBasicOptionPane
.
showMessageDialog
(
HandleManager
.
getFrame
(
ServiceTopology
.
this
),
ConsoleLocale
.
getString
(
"select_a_node"
),
SwingLocale
.
getString
(
"warning"
),
JBasicOptionPane
.
WARNING_MESSAGE
);
return
;
}
Object
userObject
=
node
.
getUserObject
();
if
(
userObject
==
null
||
!(
userObject
instanceof
Instance
))
{
JBasicOptionPane
.
showMessageDialog
(
HandleManager
.
getFrame
(
ServiceTopology
.
this
),
ConsoleLocale
.
getString
(
"node_has_no_metadata"
),
SwingLocale
.
getString
(
"warning"
),
JBasicOptionPane
.
WARNING_MESSAGE
);
return
;
}
Instance
instance
=
(
Instance
)
userObject
;
showMetadata
(
instance
);
}
};
return
action
;
}
private
JSecurityAction
createPushGlobalConfigAction
()
{
JSecurityAction
action
=
new
JSecurityAction
(
ConsoleLocale
.
getString
(
"push_global_config"
),
ConsoleIconFactory
.
getSwingIcon
(
"netbean/ease_both_16.png"
),
ConsoleLocale
.
getString
(
"push_global_config"
))
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
discovery-console-desktop/src/main/resources/com/nepxion/discovery/console/desktop/locale/Locale.properties
View file @
82c42e9c
...
...
@@ -12,6 +12,7 @@ execute_gray_release=执行灰度发布
execute_gray_router
=
执行灰度路由
refresh_gray_state
=
刷新灰度状态
push_global_config
=
全链路灰度发布
show_metadata
=
查看元数据
push_control_mode
=
推送模式设置
push_async_mode
=
异步推送
push_sync_mode
=
同步推送
...
...
@@ -64,6 +65,7 @@ node_not_for_gray_release=该服务不能执行灰度发布
node_not_for_gray_router
=
该服务不能执行执行灰度路由
group_not_for_refresh_gray_state
=
该服务集群不能刷新灰度状态
node_not_for_refresh_gray_state
=
该服务不能刷新灰度状态
node_has_no_metadata
=
该服务不包含元数据
not_for_push_global_config
=
全链路灰度发布,只能在“规则推送到远程配置中心”模式下运行
select_a_global_group
=
请选择一个服务集群组
...
...
discovery-console-desktop/src/main/resources/com/nepxion/discovery/console/desktop/locale/Locale_zh_CN.properties
View file @
82c42e9c
...
...
@@ -12,6 +12,7 @@ execute_gray_release=\u6267\u884c\u7070\u5ea6\u53d1\u5e03
execute_gray_router
=
\u6267\u
884c
\u7070\u
5ea6
\u
8def
\u7531
refresh_gray_state
=
\u5237\u
65b0
\u7070\u
5ea6
\u
72b6
\u6001
push_global_config
=
\u5168\u
94fe
\u
8def
\u7070\u
5ea6
\u
53d1
\u
5e03
show_metadata
=
\u
67e5
\u
770b
\u5143\u6570\u
636e
push_control_mode
=
\u
63a8
\u9001\u
6a21
\u
5f0f
\u
8bbe
\u
7f6e
push_async_mode
=
\u
5f02
\u
6b65
\u
63a8
\u9001
push_sync_mode
=
\u
540c
\u
6b65
\u
63a8
\u9001
...
...
@@ -64,6 +65,7 @@ node_not_for_gray_release=\u8be5\u670d\u52a1\u4e0d\u80fd\u6267\u884c\u7070\u5ea6
node_not_for_gray_router
=
\u
8be5
\u
670d
\u
52a1
\u
4e0d
\u
80fd
\u6267\u
884c
\u6267\u
884c
\u7070\u
5ea6
\u
8def
\u7531
group_not_for_refresh_gray_state
=
\u
8be5
\u
670d
\u
52a1
\u
96c6
\u
7fa4
\u
4e0d
\u
80fd
\u5237\u
65b0
\u7070\u
5ea6
\u
72b6
\u6001
node_not_for_refresh_gray_state
=
\u
8be5
\u
670d
\u
52a1
\u
4e0d
\u
80fd
\u5237\u
65b0
\u7070\u
5ea6
\u
72b6
\u6001
node_has_no_metadata
=
\u
8be5
\u
670d
\u
52a1
\u
4e0d
\u5305\u
542b
\u5143\u6570\u
636e
not_for_push_global_config
=
\u5168\u
94fe
\u
8def
\u7070\u
5ea6
\u
53d1
\u
5e03
\u
ff0c
\u
53ea
\u
80fd
\u5728\u
201c
\u
89c4
\u5219\u
63a8
\u9001\u5230\u
8fdc
\u
7a0b
\u
914d
\u
7f6e
\u
4e2d
\u
5fc3
\u
201d
\u
6a21
\u
5f0f
\u
4e0b
\u
8fd0
\u
884c
select_a_global_group
=
\u
8bf7
\u9009\u
62e9
\u
4e00
\u
4e2a
\u
670d
\u
52a1
\u
96c6
\u
7fa4
\u
7ec4
...
...
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