From 6d2e4af43f36c641e7f1a1075ad23b65af17742f Mon Sep 17 00:00:00 2001 From: lbw Date: Sun, 29 Jan 2023 14:44:03 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20monitor=20druid=20=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/service/impl/MonitorStatService.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java index 6b975ef9c..fbcba00b2 100755 --- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java +++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java @@ -71,12 +71,8 @@ public class MonitorStatService implements DruidStatServiceMBean { List instances = discoveryClient.getInstances(service); for (ServiceInstance instance : instances) { String host = instance.getHost(); - String instanceId = instance.getInstanceId(); - if (instanceId == null) { - instanceId = instance.getMetadata().get("nacos.instanceId").replaceAll("#", "-").replaceAll("@@", - "-"); - } int port = instance.getPort(); + String instanceId = String.format("%s_%s", host, port); String serviceId = instance.getServiceId(); // 根据前端参数采集指定的服务 if (monitorProperties.getApplications().contains(serviceId)) { @@ -109,13 +105,9 @@ public class MonitorStatService implements DruidStatServiceMBean { List instances = discoveryClient.getInstances(service); for (ServiceInstance instance : instances) { String host = instance.getHost(); - String instanceId = instance.getInstanceId(); - if (instanceId == null) { - instanceId = instance.getMetadata().get("nacos.instanceId").replaceAll("#", "-").replaceAll("@@", - "-"); - } int port = instance.getPort(); String serviceId = instance.getServiceId(); + String instanceId = String.format("%s_%s", host, port); // 根据前端参数采集指定的服务 if (serviceId.equals(requestServiceName)) { ServiceNode serviceNode = new ServiceNode(); @@ -492,4 +484,4 @@ public class MonitorStatService implements DruidStatServiceMBean { return array.subList(fromIndex, toIndex); } -} \ No newline at end of file +}