mirror of
https://gitee.com/mirrors/Spring-Cloud-Alibaba.git
synced 2021-06-26 13:25:11 +08:00
Let the private to be public
This commit is contained in:
parent
be18803104
commit
a701f8ca74
@ -16,21 +16,20 @@
|
|||||||
|
|
||||||
package com.alibaba.cloud.nacos.discovery;
|
package com.alibaba.cloud.nacos.discovery;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
|
||||||
import java.util.Collections;
|
import com.alibaba.cloud.nacos.NacosServiceInstance;
|
||||||
import java.util.HashMap;
|
import com.alibaba.nacos.api.naming.pojo.Instance;
|
||||||
import java.util.List;
|
import com.alibaba.nacos.api.naming.pojo.ListView;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.cloud.client.ServiceInstance;
|
import org.springframework.cloud.client.ServiceInstance;
|
||||||
import org.springframework.cloud.client.discovery.DiscoveryClient;
|
import org.springframework.cloud.client.discovery.DiscoveryClient;
|
||||||
|
|
||||||
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
|
import java.util.ArrayList;
|
||||||
import com.alibaba.cloud.nacos.NacosServiceInstance;
|
import java.util.Collections;
|
||||||
import com.alibaba.nacos.api.naming.pojo.Instance;
|
import java.util.HashMap;
|
||||||
import com.alibaba.nacos.api.naming.pojo.ListView;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author xiaojing
|
* @author xiaojing
|
||||||
@ -58,14 +57,13 @@ public class NacosDiscoveryClient implements DiscoveryClient {
|
|||||||
List<Instance> instances = discoveryProperties.namingServiceInstance()
|
List<Instance> instances = discoveryProperties.namingServiceInstance()
|
||||||
.selectInstances(serviceId, true);
|
.selectInstances(serviceId, true);
|
||||||
return hostToServiceInstanceList(instances, serviceId);
|
return hostToServiceInstanceList(instances, serviceId);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e) {
|
|
||||||
throw new RuntimeException(
|
throw new RuntimeException(
|
||||||
"Can not get hosts from nacos server. serviceId: " + serviceId, e);
|
"Can not get hosts from nacos server. serviceId: " + serviceId, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ServiceInstance hostToServiceInstance(Instance instance,
|
public static ServiceInstance hostToServiceInstance(Instance instance,
|
||||||
String serviceId) {
|
String serviceId) {
|
||||||
NacosServiceInstance nacosServiceInstance = new NacosServiceInstance();
|
NacosServiceInstance nacosServiceInstance = new NacosServiceInstance();
|
||||||
nacosServiceInstance.setHost(instance.getIp());
|
nacosServiceInstance.setHost(instance.getIp());
|
||||||
@ -87,7 +85,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
|
|||||||
return nacosServiceInstance;
|
return nacosServiceInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<ServiceInstance> hostToServiceInstanceList(
|
public static List<ServiceInstance> hostToServiceInstanceList(
|
||||||
List<Instance> instances, String serviceId) {
|
List<Instance> instances, String serviceId) {
|
||||||
List<ServiceInstance> result = new ArrayList<>(instances.size());
|
List<ServiceInstance> result = new ArrayList<>(instances.size());
|
||||||
for (Instance instance : instances) {
|
for (Instance instance : instances) {
|
||||||
@ -103,8 +101,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
|
|||||||
ListView<String> services = discoveryProperties.namingServiceInstance()
|
ListView<String> services = discoveryProperties.namingServiceInstance()
|
||||||
.getServicesOfServer(1, Integer.MAX_VALUE);
|
.getServicesOfServer(1, Integer.MAX_VALUE);
|
||||||
return services.getData();
|
return services.getData();
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e) {
|
|
||||||
log.error("get service name from nacos server fail,", e);
|
log.error("get service name from nacos server fail,", e);
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user