From bf9b75cc8fe8af989ca0fde7054601786a7a04bd Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 2 Jan 2020 09:22:56 +0800
Subject: [PATCH] =?UTF-8?q?job=E6=A8=A1=E5=9D=97=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-job/epdc-job-server/pom.xml          | 43 +++++++++++++++----
 .../src/main/resources/registry.conf          |  4 +-
 2 files changed, 36 insertions(+), 11 deletions(-)

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 b710327a6..897818898 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
@@ -109,6 +109,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>
 
     <profiles>
@@ -165,22 +189,23 @@
             <id>prod</id>
             <properties>
                 <spring.profiles.active>prod</spring.profiles.active>
+                <docker.tag>prod</docker.tag>
 
                 <server.port>9061</server.port>
-
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>10.5.34.164</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>Elink@833066</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.5.34.164:3306/esua_epdc_job?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>elink888</spring.datasource.druid.password>
-
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
             </properties>
         </profile>
     </profiles>
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf
index 9cfedf9cc..fb64abd71 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf
@@ -3,7 +3,7 @@ registry {
   type = "nacos"
 
   nacos {
-    serverAddr = "47.104.224.45"
+    serverAddr = "@nacos.server-addr@"
     namespace = "public"
     cluster = "default"
   }
@@ -14,7 +14,7 @@ config {
   type = "nacos"
 
   nacos {
-    serverAddr = "47.104.224.45"
+    serverAddr = "@nacos.server-addr@"
     namespace = "public"
     cluster = "default"
   }