From 91fa4857e1eaaa2c38ace9e16cda0a9cdef1fe79 Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Wed, 18 Dec 2019 14:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3heart=E6=A8=A1=E5=9D=97seata?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-heart/epdc-heart-server/pom.xml      | 26 ++++++++++++++++++-
 .../src/main/resources/application.yml        |  3 ++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml
index ebf9e2d72..998da918a 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml
@@ -33,7 +33,7 @@ spring:
         tx-service-group: epdc-group-server-fescar-service-group
   datasource:
     druid:
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
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 4e07823e5..27a1a164d 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
@@ -78,6 +78,30 @@
                 <artifactId>dockerfile-maven-plugin</artifactId>
             </plugin>
         </plugins>
+
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>**/application*.yml</include>
+                    <include>**/*.properties</include>
+                    <include>logback-spring.xml</include>
+                    <include>registry.conf</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <excludes>
+                    <exclude>**/application*.yml</exclude>
+                    <exclude>**/*.properties</exclude>
+                    <exclude>logback-spring.xml</exclude>
+                    <exclude>registry.conf</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
 
 
@@ -103,7 +127,7 @@
                 <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>shibei@888</spring.datasource.druid.password>
 
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
index b9b4844a1..56d9c74f8 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
@@ -26,12 +26,13 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        namespace: public
     alibaba:
       seata:
         tx-service-group: epdc-heart-server-fescar-service-group
   datasource:
     druid:
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@