From 50b5e8f85401bf6c736856ef6248079a9cf91657 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 9 Aug 2019 16:29:43 +0800 Subject: [PATCH] =?UTF-8?q?admin=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF/=E7=A6=BB=E7=BA=BF=E7=AD=9B=E9=80=89(?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E9=9D=A0=E5=89=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitee/sop/registryapi/bean/ServiceInfo.java | 14 +++----------- .../service/impl/RegistryServiceNacos.java | 7 ++++++- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/ServiceInfo.java b/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/ServiceInfo.java index 2d19dd58..45417810 100644 --- a/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/ServiceInfo.java +++ b/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/ServiceInfo.java @@ -1,24 +1,16 @@ package com.gitee.sop.registryapi.bean; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; -import java.util.Collections; import java.util.List; /** * @author tanghc */ -@Getter -@Setter +@Data public class ServiceInfo { /** 服务名称 */ private String serviceId; /** 实例列表 */ - private List instances = Collections.emptyList(); - - @Override - public String toString() { - return "服务名称: " + serviceId + ", 实例数:" + instances.size(); - } + private List instances; } diff --git a/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/service/impl/RegistryServiceNacos.java b/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/service/impl/RegistryServiceNacos.java index 6f7746d2..00b31d85 100644 --- a/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/service/impl/RegistryServiceNacos.java +++ b/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/service/impl/RegistryServiceNacos.java @@ -18,6 +18,8 @@ import org.springframework.util.CollectionUtils; import javax.annotation.PostConstruct; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,7 +53,9 @@ public class RegistryServiceNacos implements RegistryService { ServiceInfo serviceInfo = new ServiceInfo(); serviceInfo.setServiceId(serviceName); List instanceList = namingService.getAllInstances(serviceName); - if (!CollectionUtils.isEmpty(instanceList)) { + if (CollectionUtils.isEmpty(instanceList)) { + serviceInfo.setInstances(Collections.emptyList()); + } else { serviceInfo.setInstances(new ArrayList<>(instanceList.size())); for (Instance instance : instanceList) { ServiceInstance serviceInstance = new ServiceInstance(); @@ -68,6 +72,7 @@ public class RegistryServiceNacos implements RegistryService { } serviceInfoList.add(serviceInfo); } + serviceInfoList.sort(Comparator.comparingInt(o -> o.getInstances().size())); return serviceInfoList; }