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
1f6a0fa9
Commit
1f6a0fa9
authored
Jul 10, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加批量设置版本和清除版本
parent
3fea6475
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
71 additions
and
4 deletions
+71
-4
discovery-console/src/main/java/com/nepxion/discovery/console/endpoint/ConsoleEndpoint.java
+71
-4
No files found.
discovery-console/src/main/java/com/nepxion/discovery/console/endpoint/ConsoleEndpoint.java
View file @
1f6a0fa9
...
...
@@ -89,7 +89,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
@ResponseBody
@ManagedOperation
public
ResponseEntity
<?>
configSendAsync
(
@PathVariable
(
value
=
"serviceId"
)
@ApiParam
(
value
=
"服务名"
,
required
=
true
)
String
serviceId
,
@RequestBody
@ApiParam
(
value
=
"规则配置内容,XML格式"
,
required
=
true
)
String
config
)
{
return
s
end
(
serviceId
,
config
,
true
);
return
executeConfigS
end
(
serviceId
,
config
,
true
);
}
@RequestMapping
(
path
=
"/console/config/send-sync/{serviceId}"
,
method
=
RequestMethod
.
POST
)
...
...
@@ -97,7 +97,23 @@ public class ConsoleEndpoint implements MvcEndpoint {
@ResponseBody
@ManagedOperation
public
ResponseEntity
<?>
configSendSync
(
@PathVariable
(
value
=
"serviceId"
)
@ApiParam
(
value
=
"服务名"
,
required
=
true
)
String
serviceId
,
@RequestBody
@ApiParam
(
value
=
"规则配置内容,XML格式"
,
required
=
true
)
String
config
)
{
return
send
(
serviceId
,
config
,
false
);
return
executeConfigSend
(
serviceId
,
config
,
false
);
}
@RequestMapping
(
path
=
"/version/send/{serviceId}"
,
method
=
RequestMethod
.
POST
)
@ApiOperation
(
value
=
"批量设置服务的动态版本"
,
notes
=
""
,
response
=
ResponseEntity
.
class
,
httpMethod
=
"POST"
)
@ResponseBody
@ManagedOperation
public
ResponseEntity
<?>
versionSend
(
@PathVariable
(
value
=
"serviceId"
)
@ApiParam
(
value
=
"服务名"
,
required
=
true
)
String
serviceId
,
@RequestBody
@ApiParam
(
value
=
"版本号"
,
required
=
true
)
String
version
)
{
return
executeVersionSend
(
serviceId
,
version
);
}
@RequestMapping
(
path
=
"/version/clear/{serviceId}"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
value
=
"批量清除服务的动态版本"
,
notes
=
""
,
response
=
ResponseEntity
.
class
,
httpMethod
=
"GET"
)
@ResponseBody
@ManagedOperation
public
ResponseEntity
<?>
versionClear
(
@PathVariable
(
value
=
"serviceId"
)
@ApiParam
(
value
=
"服务名"
,
required
=
true
)
String
serviceId
)
{
return
executeVersionClear
(
serviceId
);
}
public
List
<
String
>
getServices
()
{
...
...
@@ -140,7 +156,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
return
serviceMap
;
}
private
ResponseEntity
<?>
s
end
(
String
serviceId
,
String
config
,
boolean
async
)
{
private
ResponseEntity
<?>
executeConfigS
end
(
String
serviceId
,
String
config
,
boolean
async
)
{
StringBuilder
stringBuilder
=
new
StringBuilder
();
List
<
ServiceInstance
>
serviceInstances
=
getInstances
(
serviceId
);
...
...
@@ -151,7 +167,6 @@ public class ConsoleEndpoint implements MvcEndpoint {
String
url
=
"http://"
+
host
+
":"
+
port
+
"/config/send-"
+
(
async
?
"async"
:
"sync"
);
String
result
=
consoleRestTemplate
.
postForEntity
(
url
,
config
,
String
.
class
).
getBody
();
// 这里最好考虑分布式事务
if
(!
StringUtils
.
equals
(
result
,
"OK"
))
{
ConsoleErrorHandler
errorHandler
=
(
ConsoleErrorHandler
)
consoleRestTemplate
.
getErrorHandler
();
result
=
errorHandler
.
getCause
();
...
...
@@ -167,6 +182,58 @@ public class ConsoleEndpoint implements MvcEndpoint {
return
ResponseEntity
.
ok
().
body
(
result
);
}
private
ResponseEntity
<?>
executeVersionSend
(
String
serviceId
,
String
version
)
{
StringBuilder
stringBuilder
=
new
StringBuilder
();
List
<
ServiceInstance
>
serviceInstances
=
getInstances
(
serviceId
);
for
(
ServiceInstance
serviceInstance
:
serviceInstances
)
{
String
host
=
serviceInstance
.
getHost
();
int
port
=
serviceInstance
.
getPort
();
String
url
=
"http://"
+
host
+
":"
+
port
+
"/version/send"
;
String
result
=
consoleRestTemplate
.
postForEntity
(
url
,
version
,
String
.
class
).
getBody
();
if
(!
StringUtils
.
equals
(
result
,
"OK"
))
{
ConsoleErrorHandler
errorHandler
=
(
ConsoleErrorHandler
)
consoleRestTemplate
.
getErrorHandler
();
result
=
errorHandler
.
getCause
();
}
stringBuilder
.
append
(
"Version sent, serviceId="
).
append
(
serviceId
).
append
(
", url="
).
append
(
url
).
append
(
", result="
).
append
(
result
).
append
(
"\n"
);
}
String
result
=
stringBuilder
.
toString
();
result
=
result
.
substring
(
0
,
result
.
lastIndexOf
(
"\n"
));
LOG
.
info
(
"\n{}"
,
result
);
return
ResponseEntity
.
ok
().
body
(
result
);
}
private
ResponseEntity
<?>
executeVersionClear
(
String
serviceId
)
{
StringBuilder
stringBuilder
=
new
StringBuilder
();
List
<
ServiceInstance
>
serviceInstances
=
getInstances
(
serviceId
);
for
(
ServiceInstance
serviceInstance
:
serviceInstances
)
{
String
host
=
serviceInstance
.
getHost
();
int
port
=
serviceInstance
.
getPort
();
String
url
=
"http://"
+
host
+
":"
+
port
+
"/version/clear"
;
String
result
=
consoleRestTemplate
.
getForEntity
(
url
,
String
.
class
).
getBody
();
if
(!
StringUtils
.
equals
(
result
,
"OK"
))
{
ConsoleErrorHandler
errorHandler
=
(
ConsoleErrorHandler
)
consoleRestTemplate
.
getErrorHandler
();
result
=
errorHandler
.
getCause
();
}
stringBuilder
.
append
(
"Version sent, serviceId="
).
append
(
serviceId
).
append
(
", url="
).
append
(
url
).
append
(
", result="
).
append
(
result
).
append
(
"\n"
);
}
String
result
=
stringBuilder
.
toString
();
result
=
result
.
substring
(
0
,
result
.
lastIndexOf
(
"\n"
));
LOG
.
info
(
"\n{}"
,
result
);
return
ResponseEntity
.
ok
().
body
(
result
);
}
@Override
public
String
getPath
()
{
return
"/"
;
...
...
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