diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java
new file mode 100644
index 000000000..c3c2d716f
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java
@@ -0,0 +1,12 @@
+package com.elink.esua.epdc.commons.tools.constant;
+
+/**
+ * Nacos配置中心相关常量
+ *
+ * @author rongchao
+ * @Date 20-1-15
+ */
+public interface NacosConfigConstant {
+
+ String CONFIG_GROUP = "EPDC_CONFIG_GROUP";
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index 64fbdd9cf..fe46a98b3 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -13,7 +13,7 @@
jar
-
+
@@ -22,35 +22,42 @@
epdc-api-client
1.0.0
+
com.esua.epdc
epdc-commons-tools
1.0.0
+
com.esua.epdc
epdc-commons-mybatis
1.0.0
+
org.springframework.boot
spring-boot-starter-web
+
org.springframework
spring-context-support
+
de.codecentric
spring-boot-admin-starter-client
${spring.boot.admin.version}
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
+
com.esua.epdc
@@ -81,8 +88,8 @@
10.3.0
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
@@ -144,83 +151,15 @@
true
-
- 9040
- 47.104.224.45:8848
- 513d6635-3cfe-401f-b8b6-a04417288f47
- EPDC_CONFIG_GROUP
- true
+ dev
test
-
- 9040
- 47.104.224.45:8848
- 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
- EPDC_CONFIG_GROUP
- true
+ test
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java
index 96d647692..cf7c97661 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java
@@ -1,11 +1,3 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有,侵权必究!
- */
-
package com.elink.esua.epdc;
import org.springframework.boot.SpringApplication;
@@ -16,8 +8,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
/**
* API模块
*
- * @author Mark sunlightcs@gmail.com
- * @since 1.0.0
+ * @author rongchao
+ * @Date 20-1-15
*/
@SpringBootApplication
@EnableDiscoveryClient
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-dev.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml
new file mode 100644
index 000000000..cae812087
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml
@@ -0,0 +1,3 @@
+nacos:
+ config:
+ server-addr: 47.104.224.45:8848
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml
new file mode 100644
index 000000000..8a46445fc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml
@@ -0,0 +1,4 @@
+nacos:
+ config:
+ server-addr: 47.104.224.45:8848
+ namespace: 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
index 1179d7adb..b3cd162ba 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
@@ -1,21 +1,27 @@
server:
- port: @server.port@
+ port: 9700
servlet:
context-path: /api
-nacos:
- config:
- server-addr: @nacos.server-addr@
- type: YAML
- namespace: @nacos.config.namespace@
- group: @nacos.config.group@
- dataId: epdc-api-server
- bootstrap:
- enable: true
- log:
- enable: @nacos.config.bootstrap.log.enable@
-
spring:
application:
name: epdc-api-server
+ profiles:
+ active: @spring.profiles.active@
+ cloud:
+ nacos:
+ config:
+ server-addr: 47.104.224.45:8848
+ namespace: 513d6635-3cfe-401f-b8b6-a04417288f47
+ group: EPDC_CONFIG_GROUP
+ file-exetension: yaml
+ enabled: true
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: *
+logging:
+ config: classpath:logback-spring.xml
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 52e58d1e3..13c3ac257 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -68,8 +68,8 @@
compile
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
index 86250d311..87d11518c 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
@@ -52,8 +52,8 @@
10.3.0
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index b7e9ab4b8..3ecca042c 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -63,8 +63,8 @@
compile
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index f8248b993..f61474f89 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -76,8 +76,8 @@
${swagger.version}
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
index 647a36cca..d10257ab8 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
@@ -51,8 +51,8 @@
${spring.boot.admin.version}
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
index 96053666d..2a74cb805 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -46,8 +46,8 @@
1.0.0
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index e02019248..b553e7a56 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -95,8 +95,8 @@
2.8.5
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index b52b1d0be..86f852d39 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -57,8 +57,8 @@
compile
- com.alibaba.boot
- nacos-config-spring-boot-starter
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml
index a7687eddc..acac2690f 100644
--- a/esua-epdc/pom.xml
+++ b/esua-epdc/pom.xml
@@ -38,7 +38,7 @@
prod
registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/
9508
- 0.2.3
+ 2.1.1.RELEASE
@@ -74,9 +74,9 @@
- com.alibaba.boot
- nacos-config-spring-boot-starter
- ${nacos-config-spring-boot.version}
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+ 2.1.1.RELEASE