natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wrong parent module version

This commit is contained in:
ken.lj 2020-08-17 14:50:42 +08:00
parent 8bdecea7ef
commit 58e29bc77d
7 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dubbo-configcenter/dubbo-configcenter-apollo/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter</artifactId>
<version>2.7.7-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>dubbo-configcenter-apollo</artifactId>

2
dubbo-configcenter/dubbo-configcenter-nacos/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter</artifactId>
<version>2.7.7-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
dubbo-filter/dubbo-filter-cache/pom.xml
View File

@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.7.7-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>dubbo-filter-cache</artifactId>
<packaging>jar</packaging>

2
dubbo-filter/dubbo-filter-validation/pom.xml
View File

@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.7.7-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>dubbo-filter-validation</artifactId>
<packaging>jar</packaging>

2
dubbo-metadata/dubbo-metadata-report-redis/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata</artifactId>
<version>2.7.7-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
dubbo-registry/dubbo-registry-nacos/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.7.7-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

24
dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
View File

@ -25,6 +25,7 @@ import org.apache.dubbo.registry.client.ServiceInstance;
import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
import org.apache.dubbo.registry.nacos.util.NacosNamingServiceUtils;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.listener.NamingEvent;
import com.alibaba.nacos.api.naming.pojo.Instance;
@ -56,6 +57,8 @@ public class NacosServiceDiscovery implements ServiceDiscovery {
private URL registryURL;
private ServiceInstance instance;
@Override
public void initialize(URL registryURL) throws Exception {
this.namingService = createNamingService(registryURL);
@ -70,6 +73,7 @@ public class NacosServiceDiscovery implements ServiceDiscovery {
@Override
public void register(ServiceInstance serviceInstance) throws RuntimeException {
this.instance = serviceInstance;
execute(namingService, service -> {
Instance instance = toInstance(serviceInstance);
service.registerInstance(instance.getServiceName(), group, instance);
@ -78,6 +82,7 @@ public class NacosServiceDiscovery implements ServiceDiscovery {
@Override
public void update(ServiceInstance serviceInstance) throws RuntimeException {
this.instance = serviceInstance;
// TODO: Nacos should support
unregister(serviceInstance);
register(serviceInstance);
@ -112,10 +117,16 @@ public class NacosServiceDiscovery implements ServiceDiscovery {
public void addServiceInstancesChangedListener(ServiceInstancesChangedListener listener)
throws NullPointerException, IllegalArgumentException {
execute(namingService, service -> {
service.subscribe(listener.getServiceNames(), e -> { // Register Nacos EventListener
if (e instanceof NamingEvent) {
NamingEvent event = (NamingEvent) e;
handleEvent(event, listener);
listener.getServiceNames().forEach(serviceName -> {
try {
service.subscribe(serviceName, e -> { // Register Nacos EventListener
if (e instanceof NamingEvent) {
NamingEvent event = (NamingEvent) e;
handleEvent(event, listener);
}
});
} catch (NacosException e) {
e.printStackTrace();
}
});
});
@ -126,6 +137,11 @@ public class NacosServiceDiscovery implements ServiceDiscovery {
return registryURL;
}
@Override
public ServiceInstance getLocalInstance() {
return instance;
}
private void handleEvent(NamingEvent event, ServiceInstancesChangedListener listener) {
String serviceName = event.getServiceName();
List<ServiceInstance> serviceInstances = event.getInstances()