UpdateDocker配置更新

VB_DSM_V2.1/Scripts/Dockers/docker-compose-iwb.yml

@@ -171,12 +171,10 @@ services:
     ports:
       - "7087:8080"
     environment:
-      - TZ
-      - SERVER_PORT
+      TZ: Asia/Shanghai
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/charts/:/vbdsm/logs/
-      - /home/iwb/vbdsm/chart/Server.xml:/usr/local/tomcat/conf/server.xml
     privileged: true
     networks:
       - vbdsm-net
@@ -189,8 +187,7 @@ services:
     ports:
       - "7090:8080"
     environment:
-      - TZ
-      - SERVER_PORT
+      TZ: Asia/Shanghai
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/analysis/:/vbdsm/logs/
@@ -198,16 +195,18 @@ services:
     networks:
       - vbdsm-net
 
+
   vber-server-xxl-job:
     build: ../../vbdsm-job
     image: vbdsm-job:2.1.2
     container_name: vbdsm-job
     restart: always
     ports:
-      - "7200:8080"
+      - "7200:7200"
     environment:
-      - TZ
-      - SERVER_PORT
+      # SERVER_PORT: 7200
+      TZ: Asia/Shanghai
+      PARAMS: --server.port=7200 --spring.datasource.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_xxl_job?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/job/:/vbdsm/logs/
@@ -223,11 +222,11 @@ services:
     restart: always
     ports:
       # 内部使用了7211端口
-      - "7210:8080"
+      - "7210:7210"
     environment:
       # 时区上海
-      - TZ
-      - SERVER_PORT
+      TZ: Asia/Shanghai
+      PARAMS: --server.port=7210 --xxl.job.admin.addresses=http://vbdsm-job:7200
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/statistics/:/vbdsm/logs/
@@ -275,10 +274,11 @@ services:
     restart: always
     ports:
       # 内部使用了7221端口
-      - "7220:8080"
+      - "7220:7220"
     environment:
-      - TZ
-      - SERVER_PORT
+      #SERVER_PORT: 7220
+      TZ: Asia/Shanghai
+      PARAMS: --server.port=7220 --xxl.job.admin.addresses=http://vbdsm-job:7200
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/hj212-datacollect/:/vbdsm/logs/
@@ -293,10 +293,10 @@ services:
     restart: always
     ports:
       # 内部使用了7221端口
-      - "7777:8080"
+      - "7776:8080"
     environment:
-      - TZ
-      - SERVER_PORT
+      TZ: Asia/Shanghai
+      PARAMS: --vbdsm.socket.server.bindPort=7777
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/