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

refactor(nacos): Roll back to the original solution to solve the problem of compatibility

Browse Source
This commit is contained in:
chuntaojun
2019-11-06 21:12:26 +08:00
parent 16e9494487
commit 492b8d3b20
27 changed files with 66 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java
View File

@@ -33,7 +33,6 @@ import com.alibaba.cloud.dubbo.registry.AbstractSpringCloudRegistry;
import com.alibaba.cloud.dubbo.registry.event.ServiceInstancesChangedEvent;
import com.alibaba.cloud.dubbo.registry.event.SubscribedServicesChangedEvent;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.cloud.nacos.discovery.NacosWatch;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
@@ -511,8 +510,8 @@ public class DubboServiceDiscoveryAutoConfiguration {
*/
private final Set<String> listeningServices;
NacosConfiguration(NacosNamingManager nacosNamingManager) {
this.namingService = nacosNamingManager.getNamingService();
NacosConfiguration(NacosDiscoveryProperties nacosDiscoveryProperties) {
this.namingService = nacosDiscoveryProperties.namingServiceInstance();
this.listeningServices = new ConcurrentSkipListSet<>();
}