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 @@
- http://172.31.171.61:9411
-
-
-
- prod_jinshui
-
- 9110
- prod
- prod
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
http://172.31.171.61:9411
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 @@
http://localhost:9411
-
-
- prod_jinshui
-
- 9104
- prod
-
-
- lb://epdc-auth-server
- lb://epdc-admin-server
- lb://epdc-activiti-server
-
- lb://epdc-api-server
- lb://epdc-app-server
- lb://epdc-heart-server
- lb://epdc-job-server
- lb://epdc-message-server
-
- lb://epdc-news-server
- lb://epdc-oss-server
- lb://epdc-events-server
- lb://epdc-services-server
-
- lb://epdc-user-server
- lb://epdc-demo-server
- lb://epdc-group-server
- lb://epdc-websocket-server
-
- lb://epdc-kpi-server
- lb://epdc-custom-server
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
- http://localhost:9411
-
-
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 @@
7db9f049c78c9a6cafa673deebe8330d
-
-
- prod_jinshui
-
- prod
- prod
-
- 9040
-
-
- wx3ef8f2cd12a19fcb
- 948aa2f21dbaa3943288ea5b119ac6f2
- 111
- 111
-
-
- wx6dcf544cdae7d4ec
- 9e0882274ad3821400370312a56a8470
-
-
- wxddb240334d09049f
- 071b8c70da0d0482aaf79052e64f83bc
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
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 @@
organizationGroup
-
-
- prod_jinshui
-
- prod
- prod
-
- 9063
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
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 @@
-
-
- prod_jinshui
-
- prod
- prod
-
- 9062
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
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 @@
organizationGroup
-
-
- prod_jinshui
-
- prod
- prod
-
- 9064
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
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 @@
172.16.0.51:22122
-
-
- prod_jinshui
-
- prod
- prod
-
- 9065
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
- 172.16.1.239:22122
-
-
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 @@
organizationGroup
-
-
- prod_jinshui
-
- prod
- prod
-
- 9068
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
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 @@
-
-
- prod_jinshui
-
- 9075
- prod
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
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 @@
-
-
- prod_jinshui
-
- prod
- prod
-
- 9988
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
-
-
-
-
- epdc
- Elink@833066
-
-
- wx3ef8f2cd12a19fcb
- 948aa2f21dbaa3943288ea5b119ac6f2
- 111
- 111
-
- wx6dcf544cdae7d4ec
- 9e0882274ad3821400370312a56a8470
-
-