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
c0aa58bd
Commit
c0aa58bd
authored
Jul 23, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加读取远程配置功能
parent
337a8089
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/controller/ServiceController.java
+8
-0
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
+8
-4
No files found.
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/controller/ServiceController.java
View file @
c0aa58bd
...
@@ -198,6 +198,14 @@ public class ServiceController {
...
@@ -198,6 +198,14 @@ public class ServiceController {
return
result
;
return
result
;
}
}
public
static
String
remoteConfigView
(
String
group
,
String
serviceId
)
{
String
url
=
getUrl
()
+
"/console/remote-config/view/"
+
group
+
"/"
+
serviceId
;
String
result
=
restTemplate
.
getForEntity
(
url
,
String
.
class
).
getBody
();
return
result
;
}
private
static
String
getUrl
()
{
private
static
String
getUrl
()
{
String
url
=
PropertiesContext
.
getProperties
().
getString
(
"url"
);
String
url
=
PropertiesContext
.
getProperties
().
getString
(
"url"
);
if
(!
url
.
endsWith
(
"/"
))
{
if
(!
url
.
endsWith
(
"/"
))
{
...
...
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
View file @
c0aa58bd
...
@@ -853,6 +853,10 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -853,6 +853,10 @@ public class ServiceTopology extends AbstractTopology {
String
ruleInfo
=
null
;
String
ruleInfo
=
null
;
if
(
ruleToConfigCenterRadioButtonMenuItem
.
isSelected
())
{
if
(
ruleToConfigCenterRadioButtonMenuItem
.
isSelected
())
{
String
filter
=
getFilter
(
group
);
String
serviceId
=
group
.
getUserObject
().
toString
();
String
config
=
ServiceController
.
remoteConfigView
(
filter
,
serviceId
);
dynamicRuleTextArea
.
setText
(
config
);
ruleInfo
=
ConsoleLocale
.
getString
(
"description_gray_rule_to_config_center"
);
ruleInfo
=
ConsoleLocale
.
getString
(
"description_gray_rule_to_config_center"
);
}
else
{
}
else
{
ruleInfo
=
ConsoleLocale
.
getString
(
"description_gray_rule_to_service"
);
ruleInfo
=
ConsoleLocale
.
getString
(
"description_gray_rule_to_service"
);
...
@@ -913,7 +917,7 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -913,7 +917,7 @@ public class ServiceTopology extends AbstractTopology {
}
}
if
(
group
!=
null
)
{
if
(
group
!=
null
)
{
String
serviceId
=
(
String
)
group
.
getUserObject
();
String
serviceId
=
group
.
getUserObject
().
toString
();
List
<
ResultEntity
>
results
=
null
;
List
<
ResultEntity
>
results
=
null
;
try
{
try
{
results
=
ServiceController
.
versionUpdate
(
serviceId
,
dynamicVersion
);
results
=
ServiceController
.
versionUpdate
(
serviceId
,
dynamicVersion
);
...
@@ -958,7 +962,7 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -958,7 +962,7 @@ public class ServiceTopology extends AbstractTopology {
public
void
execute
(
ActionEvent
e
)
{
public
void
execute
(
ActionEvent
e
)
{
if
(
group
!=
null
)
{
if
(
group
!=
null
)
{
String
serviceId
=
(
String
)
group
.
getUserObject
();
String
serviceId
=
group
.
getUserObject
().
toString
();
List
<
ResultEntity
>
results
=
null
;
List
<
ResultEntity
>
results
=
null
;
try
{
try
{
results
=
ServiceController
.
versionClear
(
serviceId
);
results
=
ServiceController
.
versionClear
(
serviceId
);
...
@@ -1010,7 +1014,7 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -1010,7 +1014,7 @@ public class ServiceTopology extends AbstractTopology {
}
}
if
(
group
!=
null
)
{
if
(
group
!=
null
)
{
String
serviceId
=
(
String
)
group
.
getUserObject
();
String
serviceId
=
group
.
getUserObject
().
toString
();
if
(
ruleToConfigCenterRadioButtonMenuItem
.
isSelected
())
{
if
(
ruleToConfigCenterRadioButtonMenuItem
.
isSelected
())
{
String
filter
=
getFilter
(
group
);
String
filter
=
getFilter
(
group
);
...
@@ -1072,7 +1076,7 @@ public class ServiceTopology extends AbstractTopology {
...
@@ -1072,7 +1076,7 @@ public class ServiceTopology extends AbstractTopology {
public
void
execute
(
ActionEvent
e
)
{
public
void
execute
(
ActionEvent
e
)
{
if
(
group
!=
null
)
{
if
(
group
!=
null
)
{
String
serviceId
=
(
String
)
group
.
getUserObject
();
String
serviceId
=
group
.
getUserObject
().
toString
();
if
(
ruleToConfigCenterRadioButtonMenuItem
.
isSelected
())
{
if
(
ruleToConfigCenterRadioButtonMenuItem
.
isSelected
())
{
String
filter
=
getFilter
(
group
);
String
filter
=
getFilter
(
group
);
String
result
=
null
;
String
result
=
null
;
...
...
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