Commit 1cac5096 by Nepxion

path中send改成update,可容易理解一些

parent fc0312eb
...@@ -84,28 +84,28 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -84,28 +84,28 @@ public class ConsoleEndpoint implements MvcEndpoint {
return getInstanceMap(); return getInstanceMap();
} }
@RequestMapping(path = "/console/config/send-async/{serviceId}", method = RequestMethod.POST) @RequestMapping(path = "/console/config/update-async/{serviceId}", method = RequestMethod.POST)
@ApiOperation(value = "批量异步推送规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST") @ApiOperation(value = "批量异步推送更新规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@ResponseBody @ResponseBody
@ManagedOperation @ManagedOperation
public ResponseEntity<?> configSendAsync(@PathVariable(value = "serviceId") @ApiParam(value = "服务名", required = true) String serviceId, @RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) { public ResponseEntity<?> configUpdateAsync(@PathVariable(value = "serviceId") @ApiParam(value = "服务名", required = true) String serviceId, @RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) {
return executeConfigSend(serviceId, config, true); return executeConfigUpdate(serviceId, config, true);
} }
@RequestMapping(path = "/console/config/send-sync/{serviceId}", method = RequestMethod.POST) @RequestMapping(path = "/console/config/update-sync/{serviceId}", method = RequestMethod.POST)
@ApiOperation(value = "批量同步推送规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST") @ApiOperation(value = "批量同步推送更新规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@ResponseBody @ResponseBody
@ManagedOperation @ManagedOperation
public ResponseEntity<?> configSendSync(@PathVariable(value = "serviceId") @ApiParam(value = "服务名", required = true) String serviceId, @RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) { public ResponseEntity<?> configUpdateSync(@PathVariable(value = "serviceId") @ApiParam(value = "服务名", required = true) String serviceId, @RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) {
return executeConfigSend(serviceId, config, false); return executeConfigUpdate(serviceId, config, false);
} }
@RequestMapping(path = "/version/send/{serviceId}", method = RequestMethod.POST) @RequestMapping(path = "/version/update/{serviceId}", method = RequestMethod.POST)
@ApiOperation(value = "批量设置服务的动态版本", notes = "", response = ResponseEntity.class, httpMethod = "POST") @ApiOperation(value = "批量更新服务的动态版本", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@ResponseBody @ResponseBody
@ManagedOperation @ManagedOperation
public ResponseEntity<?> versionSend(@PathVariable(value = "serviceId") @ApiParam(value = "服务名", required = true) String serviceId, @RequestBody @ApiParam(value = "版本号", required = true) String version) { public ResponseEntity<?> versionUpdate(@PathVariable(value = "serviceId") @ApiParam(value = "服务名", required = true) String serviceId, @RequestBody @ApiParam(value = "版本号", required = true) String version) {
return executeVersionSend(serviceId, version); return executeVersionUpdate(serviceId, version);
} }
@RequestMapping(path = "/version/clear/{serviceId}", method = RequestMethod.GET) @RequestMapping(path = "/version/clear/{serviceId}", method = RequestMethod.GET)
...@@ -156,7 +156,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -156,7 +156,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
return serviceMap; return serviceMap;
} }
private ResponseEntity<?> executeConfigSend(String serviceId, String config, boolean async) { private ResponseEntity<?> executeConfigUpdate(String serviceId, String config, boolean async) {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
List<ServiceInstance> serviceInstances = getInstances(serviceId); List<ServiceInstance> serviceInstances = getInstances(serviceId);
...@@ -164,7 +164,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -164,7 +164,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
String host = serviceInstance.getHost(); String host = serviceInstance.getHost();
int port = serviceInstance.getPort(); int port = serviceInstance.getPort();
String url = "http://" + host + ":" + port + "/config/send-" + (async ? "async" : "sync"); String url = "http://" + host + ":" + port + "/config/update-" + (async ? "async" : "sync");
String result = consoleRestTemplate.postForEntity(url, config, String.class).getBody(); String result = consoleRestTemplate.postForEntity(url, config, String.class).getBody();
if (!StringUtils.equals(result, "OK")) { if (!StringUtils.equals(result, "OK")) {
...@@ -182,7 +182,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -182,7 +182,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
return ResponseEntity.ok().body(result); return ResponseEntity.ok().body(result);
} }
private ResponseEntity<?> executeVersionSend(String serviceId, String version) { private ResponseEntity<?> executeVersionUpdate(String serviceId, String version) {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
List<ServiceInstance> serviceInstances = getInstances(serviceId); List<ServiceInstance> serviceInstances = getInstances(serviceId);
...@@ -190,7 +190,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -190,7 +190,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
String host = serviceInstance.getHost(); String host = serviceInstance.getHost();
int port = serviceInstance.getPort(); int port = serviceInstance.getPort();
String url = "http://" + host + ":" + port + "/version/send"; String url = "http://" + host + ":" + port + "/version/update";
String result = consoleRestTemplate.postForEntity(url, version, String.class).getBody(); String result = consoleRestTemplate.postForEntity(url, version, String.class).getBody();
if (!StringUtils.equals(result, "OK")) { if (!StringUtils.equals(result, "OK")) {
......
...@@ -52,20 +52,20 @@ public class ConfigEndpoint implements MvcEndpoint { ...@@ -52,20 +52,20 @@ public class ConfigEndpoint implements MvcEndpoint {
@Autowired @Autowired
private RuleCache ruleCache; private RuleCache ruleCache;
@RequestMapping(path = "/config/send-async", method = RequestMethod.POST) @RequestMapping(path = "/config/update-async", method = RequestMethod.POST)
@ApiOperation(value = "异步推送规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST") @ApiOperation(value = "异步推送更新规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@ResponseBody @ResponseBody
@ManagedOperation @ManagedOperation
public ResponseEntity<?> sendAsync(@RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) { public ResponseEntity<?> updateAsync(@RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) {
return send(config, true); return update(config, true);
} }
@RequestMapping(path = "/config/send-sync", method = RequestMethod.POST) @RequestMapping(path = "/config/update-sync", method = RequestMethod.POST)
@ApiOperation(value = "同步推送规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST") @ApiOperation(value = "同步推送更新规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@ResponseBody @ResponseBody
@ManagedOperation @ManagedOperation
public ResponseEntity<?> sendSync(@RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) { public ResponseEntity<?> updateSync(@RequestBody @ApiParam(value = "规则配置内容,XML格式", required = true) String config) {
return send(config, false); return update(config, false);
} }
@RequestMapping(path = "/config/view", method = RequestMethod.GET) @RequestMapping(path = "/config/view", method = RequestMethod.GET)
...@@ -83,7 +83,7 @@ public class ConfigEndpoint implements MvcEndpoint { ...@@ -83,7 +83,7 @@ public class ConfigEndpoint implements MvcEndpoint {
return ResponseEntity.ok().body(content); return ResponseEntity.ok().body(content);
} }
private ResponseEntity<?> send(String config, boolean async) { private ResponseEntity<?> update(String config, boolean async) {
Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled(); Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled();
if (!discoveryControlEnabled) { if (!discoveryControlEnabled) {
// return new ResponseEntity<>(Collections.singletonMap("Message", "Discovery control is disabled"), HttpStatus.NOT_FOUND); // return new ResponseEntity<>(Collections.singletonMap("Message", "Discovery control is disabled"), HttpStatus.NOT_FOUND);
......
...@@ -49,11 +49,11 @@ public class VersionEndpoint implements MvcEndpoint { ...@@ -49,11 +49,11 @@ public class VersionEndpoint implements MvcEndpoint {
@Autowired @Autowired
private PluginEventWapper pluginEventWapper; private PluginEventWapper pluginEventWapper;
@RequestMapping(path = "/version/send", method = RequestMethod.POST) @RequestMapping(path = "/version/update", method = RequestMethod.POST)
@ApiOperation(value = "设置服务的动态版本", notes = "", response = ResponseEntity.class, httpMethod = "POST") @ApiOperation(value = "更新服务的动态版本", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@ResponseBody @ResponseBody
@ManagedOperation @ManagedOperation
public ResponseEntity<?> send(@RequestBody @ApiParam(value = "版本号", required = true) String version) { public ResponseEntity<?> update(@RequestBody @ApiParam(value = "版本号", required = true) String version) {
Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled(); Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled();
if (!discoveryControlEnabled) { if (!discoveryControlEnabled) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Discovery control is disabled"); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Discovery control is disabled");
......
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