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

Browse Source
This commit is contained in:
yuhuangbin 2020-09-13 19:24:25 +08:00
parent 702831cb8f
commit e9a6eaa025
7 changed files with 45 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
View File

@ -29,7 +29,8 @@ import java.util.regex.Pattern;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import com.alibaba.cloud.nacos.event.NacosDiscoveryInfoInitializedEvent; import com.alibaba.cloud.nacos.event.NacosDiscoveryInfoChangedEvent;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.PreservedMetadataKeys; import com.alibaba.nacos.api.naming.PreservedMetadataKeys;
import com.alibaba.nacos.client.naming.utils.UtilAndComs; import com.alibaba.nacos.client.naming.utils.UtilAndComs;
import com.alibaba.spring.util.PropertySourcesUtils; import com.alibaba.spring.util.PropertySourcesUtils;
@ -212,6 +213,9 @@ public class NacosDiscoveryProperties {
@Autowired @Autowired
private Environment environment; private Environment environment;
@Autowired
private NacosServiceManager nacosServiceManager;
@Autowired @Autowired
private ApplicationEventPublisher applicationEventPublisher; private ApplicationEventPublisher applicationEventPublisher;
@ -263,9 +267,19 @@ public class NacosDiscoveryProperties {
} }
this.overrideFromEnv(environment); this.overrideFromEnv(environment);
if (nacosServiceManager.isNacosDiscoveryInfoChanged(this)) {
applicationEventPublisher
.publishEvent(new NacosDiscoveryInfoChangedEvent(this));
}
}
applicationEventPublisher /**
.publishEvent(new NacosDiscoveryInfoInitializedEvent(this)); * recommend to use {@link NacosServiceManager#getNamingService(Properties)}.
* @return NamingService
*/
@Deprecated
public NamingService namingServiceInstance() {
return nacosServiceManager.getNamingService(this.getNacosProperties());
} }
public String getEndpoint() { public String getEndpoint() {

33
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceManager.java
View File

@ -17,17 +17,15 @@
package com.alibaba.cloud.nacos; package com.alibaba.cloud.nacos;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.Properties; import java.util.Properties;
import com.alibaba.cloud.nacos.event.NacosDiscoveryInfoInitializedEvent;
import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
import com.alibaba.cloud.nacos.registry.NacosRegistration; import com.alibaba.cloud.nacos.registry.NacosRegistration;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingMaintainService; import com.alibaba.nacos.api.naming.NamingMaintainService;
import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.NamingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.discovery.event.InstancePreRegisteredEvent; import org.springframework.cloud.client.discovery.event.InstancePreRegisteredEvent;
import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
@ -41,15 +39,14 @@ import static org.springframework.beans.BeanUtils.copyProperties;
*/ */
public class NacosServiceManager { public class NacosServiceManager {
private static final Logger log = LoggerFactory.getLogger(NacosServiceManager.class);
private NacosDiscoveryProperties nacosDiscoveryPropertiesCache; private NacosDiscoveryProperties nacosDiscoveryPropertiesCache;
private NamingService namingService; private NamingService namingService;
private NamingMaintainService namingMaintainService; private NamingMaintainService namingMaintainService;
@Autowired
private Optional<NacosAutoServiceRegistration> nacosAutoServiceRegistrationOptional;
public NamingService getNamingService(Properties properties) { public NamingService getNamingService(Properties properties) {
if (Objects.isNull(this.namingService)) { if (Objects.isNull(this.namingService)) {
buildNamingService(properties); buildNamingService(properties);
@ -114,13 +111,10 @@ public class NacosServiceManager {
} }
} }
private void reBuildNacosService(Properties nacosProperties) {
namingService = createNewNamingService(nacosProperties);
namingMaintainService = createNamingMaintainService(nacosProperties);
}
public void nacosServiceShutDown() throws NacosException { public void nacosServiceShutDown() throws NacosException {
this.namingService.shutDown(); this.namingService.shutDown();
namingService = null;
namingMaintainService = null;
} }
@EventListener @EventListener
@ -137,19 +131,4 @@ public class NacosServiceManager {
} }
} }
@EventListener
public void onNacosDiscoveryInfoInitializedEvent(
NacosDiscoveryInfoInitializedEvent nacosDiscoveryInfoInitializedEvent) {
NacosDiscoveryProperties nacosDiscoveryProperties = nacosDiscoveryInfoInitializedEvent
.getSource();
if (isNacosDiscoveryInfoChanged(nacosDiscoveryProperties)
&& nacosAutoServiceRegistrationOptional.isPresent()) {
NacosAutoServiceRegistration nacosAutoServiceRegistration = nacosAutoServiceRegistrationOptional
.get();
nacosAutoServiceRegistration.stop();
reBuildNacosService(nacosDiscoveryProperties.getNacosProperties());
nacosAutoServiceRegistration.start();
}
}
} }

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/event/NacosDiscoveryInfoInitializedEvent.java → spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/event/NacosDiscoveryInfoChangedEvent.java
View File

@ -23,9 +23,9 @@ import org.springframework.context.ApplicationEvent;
/** /**
* @author yuhuangbin * @author yuhuangbin
*/ */
public class NacosDiscoveryInfoInitializedEvent extends ApplicationEvent { public class NacosDiscoveryInfoChangedEvent extends ApplicationEvent {
public NacosDiscoveryInfoInitializedEvent( public NacosDiscoveryInfoChangedEvent(
NacosDiscoveryProperties nacosDiscoveryProperties) { NacosDiscoveryProperties nacosDiscoveryProperties) {
super(nacosDiscoveryProperties); super(nacosDiscoveryProperties);
} }

12
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java
View File

@ -16,6 +16,7 @@
package com.alibaba.cloud.nacos.registry; package com.alibaba.cloud.nacos.registry;
import com.alibaba.cloud.nacos.event.NacosDiscoveryInfoChangedEvent;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -23,6 +24,7 @@ import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegis
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
import org.springframework.context.event.EventListener;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -102,4 +104,14 @@ public class NacosAutoServiceRegistration
return StringUtils.isEmpty(appName) ? super.getAppName() : appName; return StringUtils.isEmpty(appName) ? super.getAppName() : appName;
} }
@EventListener
public void onNacosDiscoveryInfoChangedEvent(NacosDiscoveryInfoChangedEvent event) {
restart();
}
private void restart() {
this.stop();
this.start();
}
} }

7
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java
View File

@ -17,7 +17,6 @@
package com.alibaba.cloud.nacos.ribbon; package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceManager;
import com.netflix.client.config.IClientConfig; import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList; import com.netflix.loadbalancer.ServerList;
@ -43,15 +42,13 @@ public class NacosRibbonClientConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public ServerList<?> ribbonServerList(IClientConfig config, public ServerList<?> ribbonServerList(IClientConfig config,
NacosDiscoveryProperties nacosDiscoveryProperties, NacosDiscoveryProperties nacosDiscoveryProperties) {
NacosServiceManager nacosServiceManager) {
if (this.propertiesFactory.isSet(ServerList.class, config.getClientName())) { if (this.propertiesFactory.isSet(ServerList.class, config.getClientName())) {
ServerList serverList = this.propertiesFactory.get(ServerList.class, config, ServerList serverList = this.propertiesFactory.get(ServerList.class, config,
config.getClientName()); config.getClientName());
return serverList; return serverList;
} }
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosServiceManager);
serverList.initWithNiwsConfig(config); serverList.initWithNiwsConfig(config);
return serverList; return serverList;
} }

10
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java
View File

@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceManager;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.netflix.client.config.IClientConfig; import com.netflix.client.config.IClientConfig;
@ -34,14 +33,10 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
private NacosDiscoveryProperties discoveryProperties; private NacosDiscoveryProperties discoveryProperties;
private NacosServiceManager nacosServiceManager;
private String serviceId; private String serviceId;
public NacosServerList(NacosDiscoveryProperties discoveryProperties, public NacosServerList(NacosDiscoveryProperties discoveryProperties) {
NacosServiceManager nacosServiceManager) {
this.discoveryProperties = discoveryProperties; this.discoveryProperties = discoveryProperties;
this.nacosServiceManager = nacosServiceManager;
} }
@Override @Override
@ -57,8 +52,7 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
private List<NacosServer> getServers() { private List<NacosServer> getServers() {
try { try {
String group = discoveryProperties.getGroup(); String group = discoveryProperties.getGroup();
List<Instance> instances = nacosServiceManager List<Instance> instances = discoveryProperties.namingServiceInstance()
.getNamingService(discoveryProperties.getNacosProperties())
.selectInstances(serviceId, group, true); .selectInstances(serviceId, group, true);
return instancesToServerList(instances); return instancesToServerList(instances);
} }

12
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java
View File

@ -57,8 +57,7 @@ public class NacosServerListTests {
when(namingService.selectInstances(anyString(), eq("DEFAULT"), eq(true))) when(namingService.selectInstances(anyString(), eq("DEFAULT"), eq(true)))
.thenReturn(null); .thenReturn(null);
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosServiceManager);
List<NacosServer> servers = serverList.getInitialListOfServers(); List<NacosServer> servers = serverList.getInitialListOfServers();
assertThat(servers).isEmpty(); assertThat(servers).isEmpty();
} }
@ -87,8 +86,7 @@ public class NacosServerListTests {
IClientConfig clientConfig = mock(IClientConfig.class); IClientConfig clientConfig = mock(IClientConfig.class);
when(clientConfig.getClientName()).thenReturn("test-service"); when(clientConfig.getClientName()).thenReturn("test-service");
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosServiceManager);
serverList.initWithNiwsConfig(clientConfig); serverList.initWithNiwsConfig(clientConfig);
List<NacosServer> servers = serverList.getInitialListOfServers(); List<NacosServer> servers = serverList.getInitialListOfServers();
assertThat(servers).hasSize(1); assertThat(servers).hasSize(1);
@ -125,8 +123,7 @@ public class NacosServerListTests {
IClientConfig clientConfig = mock(IClientConfig.class); IClientConfig clientConfig = mock(IClientConfig.class);
when(clientConfig.getClientName()).thenReturn("test-service"); when(clientConfig.getClientName()).thenReturn("test-service");
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosServiceManager);
serverList.initWithNiwsConfig(clientConfig); serverList.initWithNiwsConfig(clientConfig);
List<NacosServer> servers = serverList.getInitialListOfServers(); List<NacosServer> servers = serverList.getInitialListOfServers();
assertThat(servers).hasSize(1); assertThat(servers).hasSize(1);
@ -167,8 +164,7 @@ public class NacosServerListTests {
IClientConfig clientConfig = mock(IClientConfig.class); IClientConfig clientConfig = mock(IClientConfig.class);
when(clientConfig.getClientName()).thenReturn("test-service"); when(clientConfig.getClientName()).thenReturn("test-service");
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosServiceManager);
serverList.initWithNiwsConfig(clientConfig); serverList.initWithNiwsConfig(clientConfig);
List<NacosServer> servers = serverList.getUpdatedListOfServers(); List<NacosServer> servers = serverList.getUpdatedListOfServers();