From 7eb908ecaf88be2a7d7415e1e26b14b5a1da06e1 Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Sat, 1 Feb 2020 14:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9nacos=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/constant/NacosConfigConstant.java   | 12 +++
 .../epdc-api/epdc-api-server/pom.xml          | 85 +++----------------
 .../com/elink/esua/epdc/ApiApplication.java   | 12 +--
 .../src/main/resources/application-dev.yml    |  0
 .../src/main/resources/application-prod.yml   |  3 +
 .../src/main/resources/application-test.yml   |  4 +
 .../src/main/resources/application.yml        | 32 ++++---
 .../epdc-events/epdc-events-server/pom.xml    |  4 +-
 .../epdc-group/epdc-group-server/pom.xml      |  4 +-
 .../epdc-heart/epdc-heart-server/pom.xml      |  4 +-
 .../epdc-job/epdc-job-server/pom.xml          |  4 +-
 .../epdc-kpi/epdc-kpi-server/pom.xml          |  4 +-
 .../epdc-news/epdc-news-server/pom.xml        |  4 +-
 .../epdc-oss/epdc-oss-server/pom.xml          |  4 +-
 .../epdc-user/epdc-user-server/pom.xml        |  4 +-
 esua-epdc/pom.xml                             |  8 +-
 16 files changed, 72 insertions(+), 116 deletions(-)
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-dev.yml
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml

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 @@
     <packaging>jar</packaging>
 
     <properties>
-<!--        <weixin-java-mp.version>3.5.0</weixin-java-mp.version>-->
+        <!--        <weixin-java-mp.version>3.5.0</weixin-java-mp.version>-->
     </properties>
 
     <dependencies>
@@ -22,35 +22,42 @@
             <artifactId>epdc-api-client</artifactId>
             <version>1.0.0</version>
         </dependency>
+
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-tools</artifactId>
             <version>1.0.0</version>
         </dependency>
+
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-mybatis</artifactId>
             <version>1.0.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
         </dependency>
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring.boot.admin.version}</version>
         </dependency>
+
         <!-- nacos start -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <!-- nacos end -->
+
         <!--版本控制-->
         <dependency>
             <groupId>com.esua.epdc</groupId>
@@ -81,8 +88,8 @@
             <version>10.3.0</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
 
@@ -144,83 +151,15 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <!--<properties>
-                <spring.profiles.active>dev</spring.profiles.active>
-
-                <server.port>9040</server.port>
-
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
-
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                &lt;!&ndash;公众号配置&ndash;&gt;
-                <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
-                <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
-                <wx.mp.configs.token>111</wx.mp.configs.token>
-                <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
-                &lt;!&ndash;小程序配置&ndash;&gt;
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
-                &lt;!&ndash;工作端小程序&ndash;&gt;
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
-            </properties>-->
             <properties>
-                <server.port>9040</server.port>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
-                <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
+                <spring.profiles.active>dev</spring.profiles.active>
             </properties>
         </profile>
 
         <profile>
             <id>test</id>
-            <!--<properties>
-                <spring.profiles.active>test</spring.profiles.active>
-
-                <server.port>9040</server.port>
-
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
-
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                &lt;!&ndash;公众号配置&ndash;&gt;
-                <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
-                <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
-                <wx.mp.configs.token>111</wx.mp.configs.token>
-                <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
-                &lt;!&ndash;小程序配置&ndash;&gt;
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
-                &lt;!&ndash;工作端小程序&ndash;&gt;
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
-            </properties>-->
             <properties>
-                <server.port>9040</server.port>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
-                <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
+                <spring.profiles.active>test</spring.profiles.active>
             </properties>
         </profile>
 
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.
- * <p>
- * https://www.renren.io
- * <p>
- * 版权所有，侵权必究！
- */
-
 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 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
         <!--版本控制-->
         <dependency>
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 @@
             <version>10.3.0</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
 
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 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
 
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 @@
             <version>${swagger.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
         <!-- 替换Feign原生httpclient -->
         <dependency>
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 @@
             <version>${spring.boot.admin.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
 
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 @@
             <version>1.0.0</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
 
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 @@
             <version>2.8.5</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
 
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 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
 
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 @@
         <docker.tag>prod</docker.tag>
         <docker.repository.prefix>registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/</docker.repository.prefix>
         <server.port>9508</server.port>
-        <nacos-config-spring-boot.version>0.2.3</nacos-config-spring-boot.version>
+        <spring-cloud-starter-alibaba-nacos-config.version>2.1.1.RELEASE</spring-cloud-starter-alibaba-nacos-config.version>
     </properties>
 
     <dependencies>
@@ -74,9 +74,9 @@
             </dependency>
 
             <dependency>
-                <groupId>com.alibaba.boot</groupId>
-                <artifactId>nacos-config-spring-boot-starter</artifactId>
-                <version>${nacos-config-spring-boot.version}</version>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+                <version>2.1.1.RELEASE</version>
             </dependency>
         </dependencies>
     </dependencyManagement>