Commit ae273af2 by Nepxion

修改接口

parent 923ee81e
...@@ -56,12 +56,7 @@ import com.nepxion.discovery.console.rest.VersionUpdateRestInvoker; ...@@ -56,12 +56,7 @@ import com.nepxion.discovery.console.rest.VersionUpdateRestInvoker;
public class ConsoleEndpoint { public class ConsoleEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(ConsoleEndpoint.class); private static final Logger LOG = LoggerFactory.getLogger(ConsoleEndpoint.class);
private static final String[][] DISCOVERY_DESCRIPTION = { private static final String[] DISCOVERY_TYPES = { "Eureka", "Consul", "Zookeeper", "Nacos" };
{ "Eureka", "Spring Cloud Eureka Discovery Client" },
{ "Consul", "Spring Cloud Consul Discovery Client" },
{ "Zookeeper", "Spring Cloud Zookeeper Discovery Client" },
{ "Nacos", "Spring Cloud Nacos Discovery Client" }
};
@Autowired @Autowired
private DiscoveryClient discoveryClient; private DiscoveryClient discoveryClient;
...@@ -221,21 +216,19 @@ public class ConsoleEndpoint { ...@@ -221,21 +216,19 @@ public class ConsoleEndpoint {
CompositeDiscoveryClient compositeDiscoveryClient = (CompositeDiscoveryClient) discoveryClient; CompositeDiscoveryClient compositeDiscoveryClient = (CompositeDiscoveryClient) discoveryClient;
List<DiscoveryClient> discoveryClients = compositeDiscoveryClient.getDiscoveryClients(); List<DiscoveryClient> discoveryClients = compositeDiscoveryClient.getDiscoveryClients();
for (DiscoveryClient client : discoveryClients) { for (DiscoveryClient client : discoveryClients) {
String description = client.description(); String discoveryDescription = client.description();
for (int i = 0; i < DISCOVERY_DESCRIPTION.length; i++) { for (int i = 0; i < DISCOVERY_TYPES.length; i++) {
String discoveryType = DISCOVERY_DESCRIPTION[i][0]; String discoveryType = DISCOVERY_TYPES[i];
String discoveryDescription = DISCOVERY_DESCRIPTION[i][1]; if (discoveryDescription.toLowerCase().contains(discoveryType.toLowerCase())) {
if (discoveryDescription.contains(description)) {
return ResponseEntity.ok().body(discoveryType); return ResponseEntity.ok().body(discoveryType);
} }
} }
} }
} else { } else {
String description = discoveryClient.description(); String discoveryDescription = discoveryClient.description();
for (int i = 0; i < DISCOVERY_DESCRIPTION.length; i++) { for (int i = 0; i < DISCOVERY_TYPES.length; i++) {
String discoveryType = DISCOVERY_DESCRIPTION[i][0]; String discoveryType = DISCOVERY_TYPES[i];
String discoveryDescription = DISCOVERY_DESCRIPTION[i][1]; if (discoveryDescription.toLowerCase().contains(discoveryType.toLowerCase())) {
if (discoveryDescription.contains(description)) {
return ResponseEntity.ok().body(discoveryType); return ResponseEntity.ok().body(discoveryType);
} }
} }
......
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