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

Merge pull request #27 from alibaba/master

Browse Source 
update
This commit is contained in:
余黄彬 2020-08-13 19:31:46 +08:00 committed by GitHub
commit 3c2aaba3de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@ package com.alibaba.cloud.nacos;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -29,9 +28,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.naming.NamingMaintainFactory;
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 com.alibaba.nacos.api.naming.PreservedMetadataKeys; import com.alibaba.nacos.api.naming.PreservedMetadataKeys;
@ -48,6 +46,8 @@ import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import static com.alibaba.nacos.api.NacosFactory.createMaintainService;
import static com.alibaba.nacos.api.NacosFactory.createNamingService;
import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY; import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY;
import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME; import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME;
import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT; import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT;
@ -215,13 +215,12 @@ public class NacosDiscoveryProperties {
@Autowired @Autowired
private Environment environment; private Environment environment;
private static NamingService namingService; private NamingService namingService;
private static NamingMaintainService namingMaintainService; private NamingMaintainService namingMaintainService;
@PostConstruct @PostConstruct
public void init() throws SocketException { public void init() throws Exception {
namingService = null;
metadata.put(PreservedMetadataKeys.REGISTER_SOURCE, "SPRING_CLOUD"); metadata.put(PreservedMetadataKeys.REGISTER_SOURCE, "SPRING_CLOUD");
if (secure) { if (secure) {
@ -268,6 +267,15 @@ public class NacosDiscoveryProperties {
} }
this.overrideFromEnv(environment); this.overrideFromEnv(environment);
Properties properties = getNacosProperties();
this.namingService = createNamingService(properties);
this.namingMaintainService = createMaintainService(properties);
}
@PreDestroy
public void destroy() {
} }
public String getEndpoint() { public String getEndpoint() {
@ -538,36 +546,11 @@ public class NacosDiscoveryProperties {
} }
public NamingService namingServiceInstance() { public NamingService namingServiceInstance() {
if (null != namingService) {
return namingService;
}
try {
namingService = NacosFactory.createNamingService(getNacosProperties());
}
catch (Exception e) {
log.error("create naming service error!properties={},e=,", this, e);
return null;
}
return namingService; return namingService;
} }
@Deprecated @Deprecated
public NamingMaintainService namingMaintainServiceInstance() { public NamingMaintainService namingMaintainServiceInstance() {
if (null != namingMaintainService) {
return namingMaintainService;
}
try {
namingMaintainService = NamingMaintainFactory
.createMaintainService(getNacosProperties());
}
catch (Exception e) {
log.error("create naming service error!properties={},e=,", this, e);
return null;
}
return namingMaintainService; return namingMaintainService;
} }

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryProperties.java
View File

@ -16,8 +16,6 @@
package com.alibaba.cloud.sidecar.nacos; package com.alibaba.cloud.sidecar.nacos;
import java.net.SocketException;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.sidecar.SidecarProperties; import com.alibaba.cloud.sidecar.SidecarProperties;
@ -35,7 +33,7 @@ public class SidecarNacosDiscoveryProperties extends NacosDiscoveryProperties {
} }
@Override @Override
public void init() throws SocketException { public void init() throws Exception {
super.init(); super.init();
String ip = sidecarProperties.getIp(); String ip = sidecarProperties.getIp();