Merge branch '2.2.0' of http://shvber.com/Git/VSDSM_SERVER into 2.2.0

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

@@ -0,0 +1,227 @@
+version: '3'
+
+services:
+  mysql:
+    image: mysql:5.7.4
+    container_name: vbdsm-mysql
+    restart: always
+    environment:
+      - TZ
+      - MYSQL_ROOT_PASSWORD
+    ports:
+      - "3306:3306"
+    volumes:
+      # 数据挂载
+      - /home/iwb/vbdsm/mysql/data/:/var/lib/mysql/
+      # 配置挂载
+      - /home/iwb/vbdsm/mysql/conf/my.cnf:/etc/mysql/my.cnf
+
+    privileged: true
+
+    networks:
+      - vbdsm-net
+  nginx-web:
+    image: nginx:1.22.1
+    container_name: vbdsm-nginx-web
+    restart: always
+    environment:
+      - TZ
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      # 证书映射
+      - /home/iwb/vbdsm/nginx/cert:/etc/nginx/cert
+      # 配置文件映射
+      - /home/iwb/vbdsm/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
+      - /home/iwb/vbdsm/nginx/conf/conf.d:/etc/nginx/conf.d
+      # 页面目录
+      - /home/iwb/vbdsm/nginx/html:/usr/share/nginx/html
+      # 日志目录
+      - /home/iwb/vbdsm/nginx/log:/var/log/nginx
+    privileged: true
+    networks:
+      - vbdsm-net
+  redis:
+    image: redis:6.2.7
+    container_name: vbdsm-redis
+    restart: always
+    ports:
+      - "6379:6379"
+    environment:
+      - TZ
+    volumes:
+      # 配置文件
+      - /home/iwb/vbdsm/redis/conf/redis.conf:/redis/redis.conf:rw
+      # 数据文件
+      - /home/iwb/vbdsm/redis/data/:/redis/data/:rw
+    command: redis-server /redis/redis.conf
+    privileged: true
+    networks:
+      - vbdsm-net
+
+  vber-server-web:
+    build: ../../vbdsm-web
+    image: vbdsm-web:2.1.2
+    container_name: vbdsm-web
+    restart: always
+    ports:
+      - "7080:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/web/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+
+  vber-server-analysis:
+    build: ../../vbdsm-statistics/vbdsm-analysis
+    image: vbdsm-analysis:2.1.2
+    container_name: vbdsm-analysis
+    restart: always
+    ports:
+      - "7090:8080"
+    environment:
+      TZ: Asia/Shanghai
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/analysis/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+
+  vber-server-xxl-job:
+    build: ../../vbdsm-job
+    image: vbdsm-job:2.1.2
+    container_name: vbdsm-job
+    restart: always
+    ports:
+      - "7200:7200"
+    environment:
+      # 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/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+
+  vber-server-statistics:
+    build: ../../vbdsm-statistics/vbdsm-statistic
+    image: vbdsm-statistics:2.1.2
+    container_name: vbdsm-statistics
+    restart: always
+    ports:
+      # 内部使用了7211端口
+      - "7210:7210"
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      PARAMS: --server.port=7210 --xxl.job.admin.addresses=http://vbdsm-job:7200
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/statistics/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+  vber-server-acquis-ws1:
+    build: ../../vbdsm-data-upload/vbdsm-acquis-ws
+    image: vbdsm-acquis-ws:13306
+    container_name: vbdsm-acquis-ws-13306
+    restart: always
+    ports:
+      - "7101:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/acquis-ws/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+  vber-server-acquis-ws2:
+    build: ../../vbdsm-data-upload/vbdsm-acquis-ws
+    image: vbdsm-acquis-ws:23306
+    container_name: vbdsm-acquis-ws-23306
+    restart: always
+    ports:
+      - "7102:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/acquis-ws/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+  vber-server-hj212-data-collect:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect
+    image: vbdsm-hj212-data-collect:2.1.2
+    container_name: vbdsm-hj212-data-collect
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "7220:7220"
+    environment:
+      #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/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+  vber-server-hj212-data-upload:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server
+    image: vbdsm-hj212-data-upload:2.1.2
+    container_name: vbdsm-hj212-data-upload
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "7776:8080"
+    environment:
+      TZ: Asia/Shanghai
+      PARAMS: --vbdsm.socket.server.bindPort=7777
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+  vber-server-hj212-modbus-test:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus
+    image: vbdsm-hj212-mockdata-upload:2.1.2
+    container_name: vbdsm-hj212-mockdata-upload
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "18888:7110"
+    environment:
+      TZ: Asia/Shanghai
+      PARAMS: --server.port=7110 --vbdsm.ws.url=http://192.168.0.81:7101/services/UploadData?wsdl --vbdsm.monitor.terminals=3@YC0001,YC0002&7@YD001_01,YD001_02&9@YD002_01,YD002_02&10@YD003_01
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/hj212-upload-mockdata/:/vbdsm/logs/
+      - /home/iwb/vbdsm/hj212-upload-mockdata/mock/:/vbdsm/mock/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+networks:
+  vbdsm-net:
+    external: false

VB_DSM_V2.1/vbdsm-web/Dockerfile

@@ -0,0 +1,26 @@
+FROM iwbtomcat:1.0.0
+MAINTAINER Vber
+
+RUN rm -rf /usr/local/tomcat/webapps/
+
+RUN mkdir -p /vbdsm/logs
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+COPY ./vbdsm-charts/target/ROOT.war /usr/local/tomcat/webapps/charts.war
+COPY ./vbdsm-gov/target/ROOT.war /usr/local/tomcat/webapps/gov.war
+COPY ./vbdsm-explorer/target/ROOT.war /usr/local/tomcat/webapps/explorer.war
+COPY ./vbdsm-manage/target/ROOT.war /usr/local/tomcat/webapps/manage.war
+COPY ./vbdsm-passport/target/ROOT.war /usr/local/tomcat/webapps/passport.war
+COPY ./vbdsm-powerservice/target/ROOT.war /usr/local/tomcat/webapps/ps.war
+COPY ./vbdsm-gov-new/target/vbdsm-gov-new-2.1.0.war /usr/local/tomcat/webapps/govnew.war
+
+
+WORKDIR /vbdsm
+
+#端口
+EXPOSE 8080
+
+#设置启动命令
+ENTRYPOINT ["/usr/local/tomcat/bin/catalina.sh","run"]

VB_DSM_V2.1/vbdsm-web/vbdsm-charts/src/main/resources/test/log4j-cfg.xml

@@ -10,7 +10,7 @@
     </appender>
 
     <appender name="file" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm-charts/logs/webapp.log"/>
+        <param name="file" value="/vbdsm/logs/charts/webapp.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="warn" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/opt/NXDSM_2.0/nxdsm-charts/logs/warn.log"/>
+        <param name="file" value="/vbdsm/logs/charts/warn.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -36,7 +36,7 @@
     </appender>
 
     <appender name="error" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/opt/NXDSM_2.0/nxdsm-charts/logs/error.log"/>
+        <param name="file" value="/vbdsm/logs/charts/error.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">

VB_DSM_V2.1/vbdsm-web/vbdsm-explorer/src/main/resources/test/log4j-cfg.xml

@@ -10,7 +10,7 @@
     </appender>
 
     <appender name="file" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/webapp.log"/>
+        <param name="file" value="/vbdsm/logs/explorer/webapp.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="warn" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/warn.log"/>
+        <param name="file" value="/vbdsm/logs/explorer/warn.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -36,7 +36,7 @@
     </appender>
 
     <appender name="error" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/error.log"/>
+        <param name="file" value="/vbdsm/logs/explorer/error.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/pom.xml

@@ -6,9 +6,10 @@
     <groupId>cn.vbdsm</groupId>
     <artifactId>vbdsm-gov-new</artifactId>
     <version>2.1.0</version>
-    <packaging>jar</packaging>
+<!--    <packaging>jar</packaging>-->
+    <packaging>war</packaging>
 
-    <name>${project.artifactId}</name>
+<!--    <name>${project.artifactId}</name>-->
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -78,6 +79,13 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <!-- 移除嵌入式tomcat插件 -->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/java/cn/vbdsm/VbdsmGovNewApplication.java

@@ -3,13 +3,28 @@ package cn.vbdsm;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+//@EnableScheduling
+//@MapperScan("cn.vbdsm.service.dao")
+//@SpringBootApplication
+//public class VbdsmGovNewApplication {
+//
+//    public static void main(String[] args) {
+//        SpringApplication.run(VbdsmGovNewApplication.class, args);
+//    }
+//
+//}
 @EnableScheduling
 @MapperScan("cn.vbdsm.service.dao")
 @SpringBootApplication
-public class VbdsmGovNewApplication {
-
+public class VbdsmGovNewApplication extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(VbdsmGovNewApplication.class);
+    }
     public static void main(String[] args) {
         SpringApplication.run(VbdsmGovNewApplication.class, args);
     }

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/resources/logback.xml

@@ -12,7 +12,7 @@
 
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>D:/logs/vbdsm/${appName}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>/vbdsm/logs/${appName}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>
@@ -31,7 +31,7 @@
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--            <FileNamePattern>${catalina.home:-.}/logs/${appName}.%d{yyyy-MM-dd}.%i.error.log</FileNamePattern>-->
-            <FileNamePattern>D:/logs/vbdsm/${appName}/%d{yyyy-MM-dd}.%i.error.log</FileNamePattern>
+            <FileNamePattern>/vbdsm/logs/${appName}/%d{yyyy-MM-dd}.%i.error.log</FileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>

VB_DSM_V2.1/vbdsm-web/vbdsm-gov/src/main/resources/test/log4j-cfg.xml

@@ -10,7 +10,7 @@
     </appender>
 
     <appender name="file" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/webapp.log"/>
+        <param name="file" value="/vbdsm/logs/gov/webapp.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="warn" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/warn.log"/>
+        <param name="file" value="/vbdsm/logs/gov/warn.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -36,7 +36,7 @@
     </appender>
 
     <appender name="error" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/error.log"/>
+        <param name="file" value="/vbdsm/logs/gov/error.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/src/main/resources/test/log4j-cfg.xml

@@ -10,7 +10,7 @@
     </appender>
 
     <appender name="file" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/webapp.log"/>
+        <param name="file" value="/vbdsm/logs/manage/webapp.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="warn" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/warn.log"/>
+        <param name="file" value="/vbdsm/logs/manage/warn.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -36,7 +36,7 @@
     </appender>
 
     <appender name="error" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/error.log"/>
+        <param name="file" value="/vbdsm/logs/manage/error.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/src/main/resources/test/log4j-cfg.xml

@@ -10,7 +10,7 @@
     </appender>
 
     <appender name="file" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/webapp.log"/>
+        <param name="file" value="/vbdsm/logs/passport/webapp.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="warn" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/warn.log"/>
+        <param name="file" value="/vbdsm/logs/passport/warn.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -36,7 +36,7 @@
     </appender>
 
     <appender name="error" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/error.log"/>
+        <param name="file" value="/vbdsm/logs/passport/error.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/resources/test/log4j-cfg.xml

@@ -10,7 +10,7 @@
     </appender>
 
     <appender name="file" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/webapp.log"/>
+        <param name="file" value="/vbdsm/logs/powerservice/webapp.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="warn" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/warn.log"/>
+        <param name="file" value="/vbdsm/logs/powerservice/warn.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -36,7 +36,7 @@
     </appender>
 
     <appender name="error" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="/vbdsm/logs/error.log"/>
+        <param name="file" value="/vbdsm/logs/powerservice/error.log"/>
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">