Commit a5a7c4fb by Nepxion

增加获取注册发现中心的接口

parent c56e11f1
......@@ -25,7 +25,7 @@ public class ConsoleFrame extends JBasicFrame {
private static final long serialVersionUID = 1L;
public ConsoleFrame() {
super(ConsoleLocale.getString("title") + " [" + ServiceController.getConfigType() + " " + ConsoleLocale.getString("config_center") + "]", ConsoleIconFactory.getSwingIcon("ribbon/navigator_nepxion.png"), new Dimension(1280, 900));
super(ConsoleLocale.getString("title") + " [" + ServiceController.getDiscoveryType() + " " + ConsoleLocale.getString("discovery_center") + "] [" + ServiceController.getConfigType() + " " + ConsoleLocale.getString("config_center") + "]", ConsoleIconFactory.getSwingIcon("ribbon/navigator_nepxion.png"), new Dimension(1280, 900));
}
public void launch() {
......
......@@ -37,6 +37,14 @@ public class ServiceController {
restTemplate.setErrorHandler(new RestErrorHandler());
}
public static String getDiscoveryType() {
String url = getUrl() + "console/discovery-type";
String result = restTemplate.getForEntity(url, String.class).getBody();
return result;
}
public static String getConfigType() {
String url = getUrl() + "console/config-type";
......
......@@ -13,6 +13,7 @@ push_global_config=全链路灰度发布
push_control_mode=推送模式设置
push_async_mode=异步推送
push_sync_mode=同步推送
discovery_center=注册发现中心
config_center=远程配置中心
rule_to_config_center=规则推送到远程配置中心
rule_to_service=规则推送到服务或者服务集群
......
......@@ -13,6 +13,7 @@ push_global_config=\u5168\u94fe\u8def\u7070\u5ea6\u53d1\u5e03
push_control_mode=\u63a8\u9001\u6a21\u5f0f\u8bbe\u7f6e
push_async_mode=\u5f02\u6b65\u63a8\u9001
push_sync_mode=\u540c\u6b65\u63a8\u9001
discovery_center=\u6ce8\u518c\u53d1\u73b0\u4e2d\u5fc3
config_center=\u8fdc\u7a0b\u914d\u7f6e\u4e2d\u5fc3
rule_to_config_center=\u89c4\u5219\u63a8\u9001\u5230\u8fdc\u7a0b\u914d\u7f6e\u4e2d\u5fc3
rule_to_service=\u89c4\u5219\u63a8\u9001\u5230\u670d\u52a1\u6216\u8005\u670d\u52a1\u96c6\u7fa4
......
......@@ -55,6 +55,13 @@ import com.nepxion.discovery.console.rest.VersionUpdateRestInvoker;
public class ConsoleEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(ConsoleEndpoint.class);
private static final String[][] DISCOVERY_DESCRIPTION = {
{ "Eureka", "Spring Cloud Eureka Discovery Client,Spring Cloud No-op DiscoveryClient,Composite Discovery Client,Simple Discovery Client" },
{ "Consul", "Spring Cloud Consul Discovery Client" },
{ "Zookeeper", "Spring Cloud Zookeeper Discovery Client" },
{ "Nacos", "Spring Cloud Nacos Discovery Client" }
};
@Autowired
private DiscoveryClient discoveryClient;
......@@ -64,6 +71,14 @@ public class ConsoleEndpoint {
@Autowired
private RestTemplate consoleRestTemplate;
@RequestMapping(path = "/discovery-type", method = RequestMethod.GET)
@ApiOperation(value = "获取注册发现中心类型", notes = "", response = String.class, httpMethod = "GET")
@ResponseBody
@ManagedOperation
public ResponseEntity<?> discoveryType() {
return getDiscoveryType();
}
@RequestMapping(path = "/config-type", method = RequestMethod.GET)
@ApiOperation(value = "获取配置中心类型", notes = "", response = String.class, httpMethod = "GET")
@ResponseBody
......@@ -200,18 +215,30 @@ public class ConsoleEndpoint {
return executeVersionClear(serviceId, version, false);
}
private ResponseEntity<?> getConfigType() {
String configType = null;
private ResponseEntity<?> getDiscoveryType() {
String description = discoveryClient.description();
if (configAdapter != null) {
configType = configAdapter.getConfigType();
} else {
configType = DiscoveryConstant.UNKNOWN;
for (int i = 0; i < DISCOVERY_DESCRIPTION.length; i++) {
String discoveryType = DISCOVERY_DESCRIPTION[i][0];
String discoveryDescription = DISCOVERY_DESCRIPTION[i][1];
if (discoveryDescription.contains(description)) {
return ResponseEntity.ok().body(discoveryType);
}
}
return ResponseEntity.ok().body(DiscoveryConstant.UNKNOWN);
}
private ResponseEntity<?> getConfigType() {
if (configAdapter != null) {
String configType = configAdapter.getConfigType();
return ResponseEntity.ok().body(configType);
}
return ResponseEntity.ok().body(DiscoveryConstant.UNKNOWN);
}
public List<String> getGroups() {
List<String> groups = new ArrayList<String>();
......
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