study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

fix service instance select of dubbo spring cloud

Browse Source
This commit is contained in:
fangjian0423 2019-09-05 15:20:48 +08:00
parent 9344473e51
commit 1b8973d874
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
View File

@ -36,7 +36,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -50,7 +49,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
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 org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
@ -167,9 +165,6 @@ public class DubboServiceMetadataRepository
@Autowired @Autowired
private DiscoveryClient discoveryClient; private DiscoveryClient discoveryClient;
@Autowired
private LoadBalancerClient loadBalancerClient;
@Autowired @Autowired
private JSONUtils jsonUtils; private JSONUtils jsonUtils;
@ -623,7 +618,7 @@ public class DubboServiceMetadataRepository
} }
protected void initSubscribedDubboMetadataService(String serviceName) { protected void initSubscribedDubboMetadataService(String serviceName) {
Optional.ofNullable(loadBalancerClient.choose(serviceName)) discoveryClient.getInstances(serviceName).stream().findAny()
.map(this::getDubboMetadataServiceURLs) .map(this::getDubboMetadataServiceURLs)
.ifPresent(dubboMetadataServiceURLs -> { .ifPresent(dubboMetadataServiceURLs -> {
dubboMetadataServiceURLs.forEach(dubboMetadataServiceURL -> { dubboMetadataServiceURLs.forEach(dubboMetadataServiceURL -> {