增加Nacos服务注册发现

discovery-common-apollo/src/main/java/com/nepxion/discovery/common/apollo/configuration/ApolloAutoConfiguration.java

@@ -29,7 +29,7 @@ public class ApolloAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
     public Config apolloConfig() {
-        String namespace = environment.getProperty(ApolloConstant.NAMESPACE);
+        String namespace = environment.getProperty(ApolloConstant.APOLLO_DISCOVERY_NAMESPACE);
         if (StringUtils.isNotEmpty(namespace)) {
             return ConfigService.getConfig(namespace);
         } else {

discovery-common-apollo/src/main/java/com/nepxion/discovery/common/apollo/constant/ApolloConstant.java

@@ -13,5 +13,5 @@ import com.ctrip.framework.apollo.core.ConfigConsts;
 
 public class ApolloConstant implements ConfigConsts {
     public static final String TYPE = "Apollo";
-    public static final String NAMESPACE = "apollo.discovery.namespace";
+    public static final String APOLLO_DISCOVERY_NAMESPACE = "apollo.discovery.namespace";
 }
\ No newline at end of file

discovery-common-nacos/src/main/java/com/nepxion/discovery/common/nacos/configuration/NacosAutoConfiguration.java

@@ -34,14 +34,14 @@ public class NacosAutoConfiguration {
     public ConfigService nacosConfigService() throws NacosException {
         Properties properties = new Properties();
 
-        String url = environment.getProperty(NacosConstant.URL);
-        if (StringUtils.isNotEmpty(url)) {
-            properties.put(NacosConstant.SERVER_ADDR, url);
+        String serverAddr = environment.getProperty(NacosConstant.NACOS_SERVER_ADDR);
+        if (StringUtils.isNotEmpty(serverAddr)) {
+            properties.put(NacosConstant.SERVER_ADDR, serverAddr);
         } else {
-            throw new IllegalArgumentException("Url can't be null or empty");
+            throw new IllegalArgumentException(NacosConstant.NACOS_SERVER_ADDR + " can't be null or empty");
         }
 
-        String namespace = environment.getProperty(NacosConstant.NAMESPACE);
+        String namespace = environment.getProperty(NacosConstant.NACOS_DISCOVERY_NAMESPACE);
         if (StringUtils.isNotEmpty(namespace)) {
             properties.put(NacosConstant.NAMESPACE, namespace);
         }

discovery-common-nacos/src/main/java/com/nepxion/discovery/common/nacos/constant/NacosConstant.java

@@ -13,9 +13,9 @@ import com.alibaba.nacos.api.PropertyKeyConst;
 
 public class NacosConstant extends PropertyKeyConst {
     public static final String TYPE = "Nacos";
-    public static final String URL = "nacos.url";
-    public static final String NAMESPACE = "nacos.discovery.namespace";
-    public static final String TIMEOUT = "nacos.discovery.timout";
+    public static final String NACOS_SERVER_ADDR = "nacos.server-addr";
+    public static final String NACOS_DISCOVERY_NAMESPACE = "nacos.discovery.namespace";
+    public static final String NACOS_DISCOVERY_TIMEOUT = "nacos.discovery.timout";
 
     public static final long DEFAULT_TIMEOUT = 30000;
 }
\ No newline at end of file

discovery-common-nacos/src/main/java/com/nepxion/discovery/common/nacos/operation/NacosOperation.java

@@ -27,7 +27,7 @@ public class NacosOperation {
     private Environment environment;
 
     public String getConfig(String group, String serviceId) throws NacosException {
-        long timeout = environment.getProperty(NacosConstant.TIMEOUT, Long.class, NacosConstant.DEFAULT_TIMEOUT);
+        long timeout = environment.getProperty(NacosConstant.NACOS_DISCOVERY_TIMEOUT, Long.class, NacosConstant.DEFAULT_TIMEOUT);
 
         return nacosConfigService.getConfig(serviceId, group, timeout);
     }

discovery-springcloud-example-console/src/main/resources/bootstrap.properties

@@ -14,12 +14,16 @@ spring.cloud.zookeeper.connectString=localhost:2181
 spring.cloud.zookeeper.discovery.root=/spring-cloud-service
 spring.cloud.zookeeper.discovery.preferIpAddress=true
 
+# Nacos config
+spring.cloud.nacos.discovery.server-addr=localhost:8080
+# spring.cloud.nacos.discovery.namespace=discovery
+
 # Ribbon config
 ribbon.ReadTimeout=60000
 ribbon.ConnectTimeout=60000
 
 # Nacos config
-nacos.url=localhost:8080
+nacos.server-addr=localhost:8080
 # nacos.discovery.namespace=application
 # nacos.discovery.timout=30000
 

discovery-springcloud-example-gateway/src/main/resources/application.properties

@@ -13,6 +13,10 @@ spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.0
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+
 # Admin config
 management.server.port=5500
 

discovery-springcloud-example-gateway/src/main/resources/bootstrap.properties

@@ -14,6 +14,10 @@ spring.cloud.zookeeper.connectString=localhost:2181
 spring.cloud.zookeeper.discovery.root=/spring-cloud-service
 spring.cloud.zookeeper.discovery.preferIpAddress=true
 
+# Nacos config
+spring.cloud.nacos.discovery.server-addr=localhost:8080
+# spring.cloud.nacos.discovery.namespace=discovery
+
 # Ribbon config
 ribbon.ReadTimeout=60000
 ribbon.ConnectTimeout=60000
@@ -24,7 +28,7 @@ apollo.meta=http://localhost:8080
 # apollo.discovery.namespace=application
 
 # Nacos config
-nacos.url=localhost:8080
+nacos.server-addr=localhost:8080
 # nacos.discovery.namespace=application
 # nacos.discovery.timout=30000
 

discovery-springcloud-example-service/src/main/resources/application-a1.properties

@@ -15,5 +15,10 @@ spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.region=dev
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.0
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+spring.cloud.nacos.discovery.metadata.region=dev
+
 # Admin config
 management.server.port=5100
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-a2.properties

@@ -15,5 +15,10 @@ spring.cloud.zookeeper.discovery.metadata.version=1.1
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.region=qa
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.1
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+spring.cloud.nacos.discovery.metadata.region=qa
+
 # Admin config
 management.server.port=5101
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-b1.properties

@@ -15,5 +15,10 @@ spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.region=dev
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.0
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+spring.cloud.nacos.discovery.metadata.region=dev
+
 # Admin config
 management.server.port=5200
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-b2.properties

@@ -15,5 +15,10 @@ spring.cloud.zookeeper.discovery.metadata.version=1.1
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.region=qa
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.1
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+spring.cloud.nacos.discovery.metadata.region=qa
+
 # Admin config
 management.server.port=5201
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-c1.properties

@@ -15,5 +15,10 @@ spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.region=dev
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.0
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+spring.cloud.nacos.discovery.metadata.region=dev
+
 # Admin config
 management.server.port=5300
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-c2.properties

@@ -15,5 +15,10 @@ spring.cloud.zookeeper.discovery.metadata.version=1.1
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.region=qa
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.1
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+spring.cloud.nacos.discovery.metadata.region=qa
+
 # Admin config
 management.server.port=5301
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-c3.properties

@@ -15,5 +15,10 @@ spring.cloud.zookeeper.discovery.metadata.version=1.2
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.region=qa
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.2
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+spring.cloud.nacos.discovery.metadata.region=qa
+
 # Admin config
 management.server.port=5302
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/bootstrap.properties

@@ -15,6 +15,10 @@ spring.cloud.zookeeper.connectString=localhost:2181
 spring.cloud.zookeeper.discovery.root=/spring-cloud-service
 spring.cloud.zookeeper.discovery.preferIpAddress=true
 
+# Nacos config
+spring.cloud.nacos.discovery.server-addr=localhost:8080
+# spring.cloud.nacos.discovery.namespace=discovery
+
 # Ribbon config
 ribbon.ReadTimeout=60000
 ribbon.ConnectTimeout=60000
@@ -25,7 +29,7 @@ apollo.meta=http://localhost:8080
 # apollo.discovery.namespace=application
 
 # Nacos config
-nacos.url=localhost:8080
+nacos.server-addr=localhost:8080
 # nacos.discovery.namespace=application
 # nacos.discovery.timout=30000
 

discovery-springcloud-example-zuul/src/main/resources/application.properties

@@ -13,6 +13,10 @@ spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group
 spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
 
+# Nacos config
+spring.cloud.nacos.discovery.metadata.version=1.0
+spring.cloud.nacos.discovery.metadata.group=example-service-group
+
 # Admin config
 management.server.port=5400
 

discovery-springcloud-example-zuul/src/main/resources/bootstrap.properties

@@ -14,6 +14,10 @@ spring.cloud.zookeeper.connectString=localhost:2181
 spring.cloud.zookeeper.discovery.root=/spring-cloud-service
 spring.cloud.zookeeper.discovery.preferIpAddress=true
 
+# Nacos config
+spring.cloud.nacos.discovery.server-addr=localhost:8080
+# spring.cloud.nacos.discovery.namespace=discovery
+
 # Ribbon config
 ribbon.ReadTimeout=60000
 ribbon.ConnectTimeout=60000
@@ -24,7 +28,7 @@ apollo.meta=http://localhost:8080
 # apollo.discovery.namespace=application
 
 # Nacos config
-nacos.url=localhost:8080
+nacos.server-addr=localhost:8080
 # nacos.discovery.namespace=application
 # nacos.discovery.timout=30000