From 8a5dc9a111ed376373225c657fa0313597db2bf5 Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Mon, 23 Mar 2020 20:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/node01/2-nginx/docker-compose.yml    |  1 +
 .../test/node01/3-nacos/docker-compose.yml    |  1 +
 .../test/node01/4-redis/docker-compose.yml    |  3 ++
 .../test/node01/5-seata/docker-compose.yml    |  1 +
 .../test/node02/2-nacos/docker-compose.yml    |  4 ++
 .../test/node02/3-seata/docker-compose.yml    |  2 +
 .../test/node02/4-redis/docker-compose.yml    |  6 +++
 esua-epdc/epdc-auth/pom.xml                   | 20 ---------
 esua-epdc/epdc-gateway/pom.xml                | 44 -------------------
 .../epdc-api/epdc-api-server/pom.xml          | 40 -----------------
 .../epdc-group/epdc-group-server/pom.xml      | 26 -----------
 .../epdc-message/epdc-message-server/pom.xml  | 26 -----------
 .../epdc-news/epdc-news-server/pom.xml        | 26 -----------
 .../epdc-oss/epdc-oss-server/pom.xml          | 29 ------------
 .../epdc-points/epdc-points-server/Dockerfile |  2 +-
 .../epdc-services-server/Dockerfile           | 20 ---------
 .../epdc-user/epdc-user-server/pom.xml        | 26 -----------
 esua-epdc/epdc-module/epdc-webservice/pom.xml | 24 ----------
 .../epdc-websocket-server/pom.xml             | 35 ---------------
 19 files changed, 19 insertions(+), 317 deletions(-)
 delete mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile

diff --git a/esua-epdc/docker-compose/test/node01/2-nginx/docker-compose.yml b/esua-epdc/docker-compose/test/node01/2-nginx/docker-compose.yml
index 979d14090..a144a4426 100644
--- a/esua-epdc/docker-compose/test/node01/2-nginx/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/node01/2-nginx/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - 443:443
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/nginx/html:/usr/share/nginx/html
       - /opt/epdc/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro
       - /opt/epdc/nginx/conf.d:/etc/nginx/conf.d:ro
diff --git a/esua-epdc/docker-compose/test/node01/3-nacos/docker-compose.yml b/esua-epdc/docker-compose/test/node01/3-nacos/docker-compose.yml
index 04c6ed59e..d563ae148 100644
--- a/esua-epdc/docker-compose/test/node01/3-nacos/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/node01/3-nacos/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - 9601:9601
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/nacos/logs:/home/nacos/logs
       - /opt/epdc/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties
     environment:
diff --git a/esua-epdc/docker-compose/test/node01/4-redis/docker-compose.yml b/esua-epdc/docker-compose/test/node01/4-redis/docker-compose.yml
index 9775e0e3f..6508263ac 100644
--- a/esua-epdc/docker-compose/test/node01/4-redis/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/node01/4-redis/docker-compose.yml
@@ -9,6 +9,7 @@ services:
     restart: always
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/redis/log:/data/log
       - /opt/epdc/redis/data:/data
       - /opt/epdc/redis/conf/redis-slave01.conf:/usr/local/etc/redis/redis.conf
@@ -22,6 +23,7 @@ services:
     restart: always
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/redis/log:/data/log
       - /opt/epdc/redis/data:/data
       - /opt/epdc/redis/conf/redis-slave02.conf:/usr/local/etc/redis/redis.conf
@@ -35,6 +37,7 @@ services:
     restart: always
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/redis/log:/data/log
       - /opt/epdc/redis/data:/data
       - /opt/epdc/redis/conf/redis-slave03.conf:/usr/local/etc/redis/redis.conf
diff --git a/esua-epdc/docker-compose/test/node01/5-seata/docker-compose.yml b/esua-epdc/docker-compose/test/node01/5-seata/docker-compose.yml
index 0543e5f02..0629cda2d 100644
--- a/esua-epdc/docker-compose/test/node01/5-seata/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/node01/5-seata/docker-compose.yml
@@ -34,4 +34,5 @@ services:
       SEATA_CONFIG_NAME: file:/root/seata-config/registry
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/seata/seata-config:/root/seata-config
diff --git a/esua-epdc/docker-compose/test/node02/2-nacos/docker-compose.yml b/esua-epdc/docker-compose/test/node02/2-nacos/docker-compose.yml
index 2320d188a..1dfc6ed2c 100644
--- a/esua-epdc/docker-compose/test/node02/2-nacos/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/node02/2-nacos/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     ports:
       - 9601:9601
     volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/nacos/logs/nacos1:/home/nacos/logs
       - /opt/epdc/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties
     environment:
@@ -28,6 +30,8 @@ services:
     ports:
       - 9602:9602
     volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/nacos/logs/nacos2:/home/nacos/logs
       - /opt/epdc/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties
     environment:
diff --git a/esua-epdc/docker-compose/test/node02/3-seata/docker-compose.yml b/esua-epdc/docker-compose/test/node02/3-seata/docker-compose.yml
index b42bdba2f..dbe74a026 100644
--- a/esua-epdc/docker-compose/test/node02/3-seata/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/node02/3-seata/docker-compose.yml
@@ -33,5 +33,7 @@ services:
       SERVER_NODE: 1
       SEATA_CONFIG_NAME: file:/root/seata-config/registry
     volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/seata/seata-config:/root/seata-config
       - /opt/epdc/seata/logs:/root/logs/seata
diff --git a/esua-epdc/docker-compose/test/node02/4-redis/docker-compose.yml b/esua-epdc/docker-compose/test/node02/4-redis/docker-compose.yml
index 7588207e7..0422bca0f 100644
--- a/esua-epdc/docker-compose/test/node02/4-redis/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/node02/4-redis/docker-compose.yml
@@ -8,6 +8,8 @@ services:
     command: redis-server /usr/local/etc/redis/redis.conf
     restart: always
     volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/redis/log:/data/log
       - /opt/epdc/redis/data:/data
       - /opt/epdc/redis/conf/redis-master01.conf:/usr/local/etc/redis/redis.conf
@@ -20,6 +22,8 @@ services:
     command: redis-server /usr/local/etc/redis/redis.conf
     restart: always
     volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/redis/log:/data/log
       - /opt/epdc/redis/data:/data
       - /opt/epdc/redis/conf/redis-master02.conf:/usr/local/etc/redis/redis.conf
@@ -32,6 +36,8 @@ services:
     command: redis-server /usr/local/etc/redis/redis.conf
     restart: always
     volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - /opt/epdc/redis/log:/data/log
       - /opt/epdc/redis/data:/data
       - /opt/epdc/redis/conf/redis-master03.conf:/usr/local/etc/redis/redis.conf
diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml
index 4ba86186d..abf19149b 100644
--- a/esua-epdc/epdc-auth/pom.xml
+++ b/esua-epdc/epdc-auth/pom.xml
@@ -164,26 +164,6 @@
                 <nacos.ip></nacos.ip>
                 <nacos.namespace></nacos.namespace>
 
-                <spring.zipkin.base-url>http://172.31.171.61:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <server.port>9110</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
                 <spring.zipkin.base-url>http://172.31.171.61:9411</spring.zipkin.base-url>
             </properties>
         </profile>
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 1fb1b111e..03d51266a 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -245,50 +245,6 @@
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <server.port>9104</server.port>
-                <docker.tag>prod</docker.tag>
-
-                <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
-                </gateway.routes.epdc-services-server.uri>
-                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
-                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
-                </gateway.routes.epdc-websocket-server.uri>
-                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
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 195d48ca8..7c5a37413 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
@@ -288,46 +288,6 @@
                 <analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <server.port>9040</server.port>
-
-                <!--公众号配置-->
-                <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>
-
-                <!--居民端小程序配置-->
-                <wx.ma.appId>wx6dcf544cdae7d4ec</wx.ma.appId>
-                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
-
-                <!--工作端小程序-->
-                <work.wx.ma.appId>wxddb240334d09049f</work.wx.ma.appId>
-                <work.wx.ma.secret>071b8c70da0d0482aaf79052e64f83bc</work.wx.ma.secret>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/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>Elink@833066</spring.datasource.druid.password>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
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 3014eeef4..6a357ee71 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
@@ -230,32 +230,6 @@
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <server.port>9063</server.port>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/esua_epdc_group?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>Elink@833066</spring.datasource.druid.password>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 0abc898c9..367eede94 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -216,32 +216,6 @@
                 <nacos.namespace></nacos.namespace>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <server.port>9062</server.port>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/esua_epdc_admin?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>Elink@833066</spring.datasource.druid.password>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
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 bd5ed6e64..437904b68 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
@@ -215,32 +215,6 @@
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <server.port>9064</server.port>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/esua_epdc_news?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>Elink@833066</spring.datasource.druid.password>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
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 bbd0f7a62..fa019ed85 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
@@ -254,34 +254,5 @@
                 <fastdfs.server-addr>172.16.0.51:22122</fastdfs.server-addr>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <server.port>9065</server.port>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/esua_epdc_admin?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>Elink@833066</spring.datasource.druid.password>
-
-                <!-- fastDFS 文件服务器 -->
-                <fastdfs.server-addr>172.16.1.239:22122</fastdfs.server-addr>
-            </properties>
-        </profile>
     </profiles>
 </project>
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile b/esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile
index d9a1f64c6..9e1c30f4f 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM adoptopenjdk/openjdk11
+FROM openjdk:8u242-jdk-buster
 # 作者
 MAINTAINER rongchao@elink-cn.com
 # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile b/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile
deleted file mode 100644
index 712051027..000000000
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# 基础镜像
-FROM openjdk:8u242-jre-buster
-# 作者
-MAINTAINER rongchao@elink-cn.com
-# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值
-ARG JAR_FILE
-# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值
-ARG JAR_NAME
-# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值
-ARG SERVER_PORT
-# 复制打包完成后的jar文件到/opt目录下
-ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar
-ADD ${JAR_FILE} $JAR_PATH
-# /data设为环境变量
-ENV DATAPATH /data
-# 挂载/data目录到主机
-VOLUME $DATAPATH
-# 启动容器时执行
-ENTRYPOINT java -jar -Xmx1024m $JAR_PATH
-EXPOSE ${SERVER_PORT}
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 69e74a302..7dae91996 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
@@ -235,32 +235,6 @@
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <server.port>9068</server.port>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/esua_epdc_user?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>Elink@833066</spring.datasource.druid.password>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml
index 16aa407d2..a3eb757a6 100644
--- a/esua-epdc/epdc-module/epdc-webservice/pom.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml
@@ -193,29 +193,5 @@
                 <nacos.namespace></nacos.namespace>
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <server.port>9075</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/esua_epdc_admin?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>Elink@833066</spring.datasource.druid.password>
-            </properties>
-        </profile>
     </profiles>
 </project>
diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
index 1888fa00e..78ed92a3f 100644
--- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
@@ -243,41 +243,6 @@
                 <!--                <wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>-->
             </properties>
         </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-                <docker.tag>prod</docker.tag>
-
-                <server.port>9988</server.port>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.19.0.2:3306/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>Elink@833066</spring.datasource.druid.password>
-
-                <!--公众号配置-->
-                <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>
-                <!--居民端小程序配置-->
-                <wx.ma.appId>wx6dcf544cdae7d4ec</wx.ma.appId>
-                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
-            </properties>
-        </profile>
     </profiles>
 
 </project>