Nacos配置支持客户自定义

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

@@ -31,7 +31,7 @@ public class NacosAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    public ConfigService configService() throws NacosException {
+    public ConfigService nacosConfigService() throws NacosException {
         Properties properties = new Properties();
 
         String url = environment.getProperty(NacosConstant.URL);

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

@@ -13,8 +13,8 @@ import com.alibaba.nacos.api.PropertyKeyConst;
 
 public class NacosConstant extends PropertyKeyConst {
     public static final String URL = "nacos.url";
-    public static final String TIMEOUT = "nacos.timout";
-    public static final String NAMESPACE = "nacos.namespace";
+    public static final String NAMESPACE = "nacos.discovery.namespace";
+    public static final String 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

@@ -21,7 +21,7 @@ import com.nepxion.discovery.common.nacos.constant.NacosConstant;
 
 public class NacosOperation {
     @Autowired
-    private ConfigService configService;
+    private ConfigService nacosConfigService;
 
     @Autowired
     private Environment environment;
@@ -29,15 +29,15 @@ public class NacosOperation {
     public String getConfig(String group, String serviceId) throws NacosException {
         long timeout = environment.getProperty(NacosConstant.TIMEOUT, Long.class, NacosConstant.DEFAULT_TIMEOUT);
 
-        return configService.getConfig(serviceId, group, timeout);
+        return nacosConfigService.getConfig(serviceId, group, timeout);
     }
 
     public boolean removeConfig(String group, String serviceId) throws NacosException {
-        return configService.removeConfig(serviceId, group);
+        return nacosConfigService.removeConfig(serviceId, group);
     }
 
     public boolean publishConfig(String group, String serviceId, String config) throws NacosException {
-        return configService.publishConfig(serviceId, group, config);
+        return nacosConfigService.publishConfig(serviceId, group, config);
     }
 
     public Listener subscribeConfig(String group, String serviceId, Executor executor, NacosSubscribeCallback subscribeCallback) throws NacosException {
@@ -53,12 +53,12 @@ public class NacosOperation {
             }
         };
 
-        configService.addListener(serviceId, group, configListener);
+        nacosConfigService.addListener(serviceId, group, configListener);
 
         return configListener;
     }
 
     public void unsubscribeConfig(String group, String serviceId, Listener configListener) {
-        configService.removeListener(serviceId, group, configListener);
+        nacosConfigService.removeListener(serviceId, group, configListener);
     }
 }
\ No newline at end of file