Merge pull request #54 from flystar32/1.x

update nacos version to 0.3.0-RC1

spring-cloud-alibaba-dependencies/pom.xml

@@ -18,7 +18,7 @@
     <properties>
         <sentinel.version>0.2.0</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <nacos.version>0.2.1</nacos.version>
+        <nacos.version>0.3.0-RC1</nacos.version>
     </properties>
 
     <dependencyManagement>

spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java

@@ -22,12 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.core.env.Environment;
 
 import java.util.*;
 
-import javax.annotation.PostConstruct;
-
 import com.alibaba.nacos.api.naming.NamingService;
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.api.naming.pojo.ListView;
@@ -44,22 +41,11 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 	@Autowired
 	private NacosDiscoveryProperties discoveryProperties;
 
-	@Autowired
-	private Environment environment;
-
-	private NamingService namingService;
-
 	@Override
 	public String description() {
 		return DESCRIPTION;
 	}
 
-	@PostConstruct
-	public void init() {
-		discoveryProperties.overrideFromEnv(environment);
-		namingService = discoveryProperties.getNamingService();
-	}
-
 	@Override
 	public ServiceInstance getLocalServiceInstance() {
 		String serviceId = discoveryProperties.getService();
@@ -73,7 +59,8 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 	@Override
 	public List<ServiceInstance> getInstances(String serviceId) {
 		try {
-			List<Instance> instances = namingService.getAllInstances(serviceId);
+			List<Instance> instances = discoveryProperties.namingServiceInstance()
+					.getAllInstances(serviceId);
 			return hostToServiceInstanceList(instances, serviceId);
 		}
 		catch (Exception e) {
@@ -113,8 +100,8 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 	public List<String> getServices() {
 
 		try {
-			ListView<String> services = namingService.getServicesOfServer(1,
-					Integer.MAX_VALUE);
+			ListView<String> services = discoveryProperties.namingServiceInstance()
+					.getServicesOfServer(1, Integer.MAX_VALUE);
 			return services.getData();
 		}
 		catch (Exception e) {
@@ -124,6 +111,6 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 	}
 
 	public NamingService getNamingService() {
-		return namingService;
+		return discoveryProperties.namingServiceInstance();
 	}
 }

spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java

@@ -142,6 +142,11 @@ public class NacosDiscoveryProperties {
 	@Autowired
 	private InetUtils inetUtils;
 
+	@Autowired
+	private Environment environment;
+
+	private NamingService namingService;
+
 	@PostConstruct
 	public void init() throws SocketException {
 
@@ -180,6 +185,8 @@ public class NacosDiscoveryProperties {
 
 			}
 		}
+
+		this.overrideFromEnv(environment);
 	}
 
 	public String getEndpoint() {
@@ -350,7 +357,12 @@ public class NacosDiscoveryProperties {
 		}
 	}
 
-	public NamingService getNamingService() {
+	public NamingService namingServiceInstance() {
+
+		if (null != namingService) {
+			return namingService;
+		}
+
 		Properties properties = new Properties();
 		properties.put(SERVER_ADDR, serverAddr);
 		properties.put(NAMESPACE, namespace);
@@ -360,7 +372,8 @@ public class NacosDiscoveryProperties {
 		properties.put(SECRET_KEY, secretKey);
 		properties.put(CLUSTER_NAME, clusterName);
 		try {
-			return NacosFactory.createNamingService(properties);
+			namingService = NacosFactory.createNamingService(properties);
+			return namingService;
 		}
 		catch (Exception e) {
 			LOGGER.error("create naming service error!properties={},e=,", this, e);

spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java

@@ -28,7 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
 
 /**
@@ -43,9 +42,6 @@ public class NacosDiscoveryEndpoint extends AbstractEndpoint<Map<String, Object>
 	@Autowired
 	private NacosDiscoveryProperties nacosDiscoveryProperties;
 
-	@Autowired
-	private NacosDiscoveryClient discoveryClient;
-
 	public NacosDiscoveryEndpoint() {
 		super("nacos_discovery", false);
 	}
@@ -58,7 +54,7 @@ public class NacosDiscoveryEndpoint extends AbstractEndpoint<Map<String, Object>
 		Map<String, Object> result = new HashMap<>();
 		result.put("NacosDiscoveryProperties", nacosDiscoveryProperties);
 
-		NamingService namingService = discoveryClient.getNamingService();
+		NamingService namingService = nacosDiscoveryProperties.namingServiceInstance();
 		List<ServiceInfo> subscribe = Collections.emptyList();
 
 		try {

spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java

@@ -48,15 +48,10 @@ public class NacosRegistration implements Registration, ServiceInstance {
 	@Autowired
 	private ApplicationContext context;
 
-	private NamingService nacosNamingService;
-
 	@PostConstruct
 	public void init() {
 
 		Environment env = context.getEnvironment();
-		nacosDiscoveryProperties.overrideFromEnv(context.getEnvironment());
-		nacosNamingService = nacosDiscoveryProperties.getNamingService();
-
 		Integer managementPort = ManagementServerPortUtils.getPort(context);
 		if (null != managementPort) {
 			Map<String, String> metadata = nacosDiscoveryProperties.getMetadata();
@@ -123,11 +118,7 @@ public class NacosRegistration implements Registration, ServiceInstance {
 	}
 
 	public NamingService getNacosNamingService() {
-		return nacosNamingService;
-	}
-
-	public void setNacosNamingService(NamingService nacosNamingService) {
-		this.nacosNamingService = nacosNamingService;
+		return nacosDiscoveryProperties.namingServiceInstance();
 	}
 
 	public void setNacosDiscoveryProperties(
@@ -138,7 +129,6 @@ public class NacosRegistration implements Registration, ServiceInstance {
 	@Override
 	public String toString() {
 		return "NacosRegistration{" + "nacosDiscoveryProperties="
-				+ nacosDiscoveryProperties + ", nacosNamingService=" + nacosNamingService
-				+ '}';
+				+ nacosDiscoveryProperties + '}';
 	}
 }