Merge branch '2.2.0' into 2.2.1

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

@@ -170,8 +170,7 @@ services:
     ports:
       - "7087:8080"
     environment:
-      - TZ
-      - SERVER_PORT
+      TZ: Asia/Shanghai
     volumes:
       # 日志文件
       - /home/yue/vbdsm/server-logs/analysis/:/vbdsm/logs/
@@ -181,15 +180,16 @@ services:
 
 
   vber-server-xxl-job:
-    build: ../../vbdsm-job/xxl-job-admin
+    build: ../../vbdsm-job
     image: vbdsm-job:2.1.0
     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://47.112.30.247:4501/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     volumes:
       # 日志文件
       - /home/yue/vbdsm/server-logs/job/:/vbdsm/logs/
@@ -205,11 +205,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/yue/vbdsm/server-logs/statistics/:/vbdsm/logs/
@@ -241,13 +241,15 @@ 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/yue/vbdsm/server-logs/hj212-datacollect/:/vbdsm/logs/
+
     privileged: true
     networks:
       - vbdsm-net
@@ -259,10 +261,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/yue/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/

VB_DSM_V2.1/vbdsm-common/vbdsm-api/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-common/vbdsm-base/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-acquis-ws/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect/Dockerfile

@@ -15,6 +15,6 @@ ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/vbdsm-hj212-datacollect-*.jar /app.jar
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/Dockerfile

@@ -15,6 +15,6 @@ ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/vbdsm-hj212-server-*.jar /app.jar
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-job/Dockerfile

@@ -11,6 +11,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./xxl-job-admin/target/xxl-job-admin-*.jar /app.jar
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-job/xxl-job-admin/Dockerfile

@@ -1,9 +1,3 @@
-FROM tomcat:8.5.38
-MAINTAINER Vber
-
-RUN rm -rf webapps
-
-
 FROM openjdk:8-jre-slim
 MAINTAINER Vber
 
@@ -15,6 +9,6 @@ ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/xxl-job-admin-*.jar /app.jar
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/Dockerfile

@@ -11,6 +11,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/vbdsm-statistic-*.jar /app.jar
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-ui/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-web/vbdsm-explorer/Dockerfile

@@ -11,7 +11,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/Dockerfile

@@ -9,6 +9,6 @@ ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/vbdsm-gov-new-*.jar /app.jar
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-web/vbdsm-gov/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/Dockerfile

@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
-WORKDIR /vbdsm/logs
+WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080