Update 调整dev，test配置

VB_DSM_V2.1/Scripts/Dockers/.env

@@ -2,4 +2,4 @@ PROJECT_DIR=../../
 # 时区上海
 TZ=Asia/Shanghai
 SERVER_PORT=8080
-MYSQL_ROOT_PASSWORD=123456
+MYSQL_ROOT_PASSWORD=Iwb-2024

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

@@ -6,8 +6,8 @@ services:
     container_name: vbdsm-mysql
     restart: always
     environment:
-      - TZ
-      - MYSQL_ROOT_PASSWORD
+      TZ: Asia/Shanghai
+      MYSQL_ROOT_PASSWORD: Iwb-2024
     ports:
       - "3307:3306"
     volumes:
@@ -28,7 +28,7 @@ services:
     ports:
       - "6380:6379"
     environment:
-      - TZ
+      TZ: Asia/Shanghai
     volumes:
       # 配置文件
       - /www/vbdsm/redis/conf/redis.conf:/redis/redis.conf:rw
@@ -39,22 +39,22 @@ services:
     networks:
       - vbdsm-web-net
 
-  vber-server-web:
-    build: ../../vbdsm-web
-    image: vbdsm-web:latest
-    container_name: vbdsm-web
-    restart: always
-    ports:
-      - "7080:8080"
-    environment:
-      - TZ
-      - SERVER_PORT
-    volumes:
-      # 日志文件
-      - /www/vbdsm/server-logs/web/:/vbdsm/logs/
-    privileged: true
-    networks:
-      - vbdsm-web-net
+#  vber-server-web:
+#    build: ../../vbdsm-web
+#    image: vbdsm-web:latest
+#    container_name: vbdsm-web
+#    restart: always
+#    ports:
+#      - "7080:8080"
+#    environment:
+#      - TZ
+#      - SERVER_PORT
+#    volumes:
+#      # 日志文件
+#      - /www/vbdsm/server-logs/web/:/vbdsm/logs/
+#    privileged: true
+#    networks:
+#      - vbdsm-web-net
 
 
   vber-server-analysis:
@@ -150,7 +150,7 @@ services:
         --vbdsm.socket.server.bindPort=7777
     volumes:
       # 日志文件
-      - /www/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/
+      - /www/vbdsm/server-logs/hj212-server/:/vbdsm/logs/
     privileged: true
     networks:
       - vbdsm-web-net

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-acquis-ws/src/main/resources/local/db.properties

@@ -2,7 +2,7 @@
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
@@ -12,11 +12,11 @@ mysql.jdbc.password=123456
 db2023.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2023.mysql.jdbc.username=root
-db2023.mysql.jdbc.password=123456
+db2023.mysql.jdbc.password=Iwb-2024
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2024.mysql.jdbc.username=root
-db2024.mysql.jdbc.password=123456
+db2024.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-acquis-ws/src/main/resources/local/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-acquis-ws/src/main/resources/test/db.properties

@@ -2,7 +2,7 @@
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
@@ -12,15 +12,15 @@ mysql.jdbc.password=123456
 db2023.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2023.mysql.jdbc.username=root
-db2023.mysql.jdbc.password=123456
+db2023.mysql.jdbc.password=Iwb-2024
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2024.mysql.jdbc.username=root
-db2024.mysql.jdbc.password=123456
+db2024.mysql.jdbc.password=Iwb-2024
 db2025.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2025.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2025.mysql.jdbc.username=root
-db2025.mysql.jdbc.password=123456
+db2025.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-acquis-ws/src/main/resources/test/redis-host.properties

@@ -1,4 +1,4 @@
-redis_ref_hosts=vbdsm-redis:6379
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024
 #redis.host=222.92.214.196
 #redis.port=6379
 #redis.expire=1800

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

@@ -1,9 +1,3 @@
-FROM tomcat:8.5.38
-MAINTAINER Vber
-
-RUN rm -rf webapps
-
-
 FROM iwbjdk:1.0.0
 MAINTAINER Vber
 

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect/src/main/resources/config/application-dev.yml

@@ -34,7 +34,7 @@ sharding:
       vbdsm:
         url: jdbc:mysql://47.112.30.247:13306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1
@@ -48,7 +48,7 @@ sharding:
       vbdsm-2023:
         url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1
@@ -62,7 +62,7 @@ sharding:
       vbdsm-2024:
         url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect/src/main/resources/config/application-test.yml

@@ -5,7 +5,7 @@ server:
 spring:
   redis:
     host: vbdsm-redis
-    password:
+    password: Iwb-2024
     port: 6379
     database: 3
     lettuce:
@@ -34,7 +34,7 @@ sharding:
       vbdsm:
         url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1
@@ -48,7 +48,7 @@ sharding:
       vbdsm-2023:
         url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1
@@ -62,7 +62,7 @@ sharding:
       vbdsm-2024:
         url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1
@@ -76,7 +76,7 @@ sharding:
       vbdsm-2025:
         url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1
@@ -90,7 +90,7 @@ sharding:
       vbdsm-2026:
         url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2026?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
-        password: 123456
+        password: Iwb-2024
         driverClassName: com.mysql.jdbc.Driver
         minIdle: 10
         validationQuery: SELECT 1

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

@@ -1,9 +1,3 @@
-FROM tomcat:8.5.38
-MAINTAINER Vber
-
-RUN rm -rf webapps
-
-
 FROM iwbjdk:1.0.0
 MAINTAINER Vber
 

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/src/main/java/cn/vbdsm/hj212/server/executor/ReaTimeExector.java

@@ -52,13 +52,13 @@ public class ReaTimeExector implements IExecutor {
         }
         //校正时间 5分钟间隔
         time = time - (time - (time / 10000) * 10000) % 500;
-        if(time>20240601123030L){
-            log.info("非法日期");
-            RpcRemoterStruct response = new RpcRemoterStruct(st, msg.getCn(), msg.getDataTime(), "03");
-            request.getCtx().channel().writeAndFlush(response);
-            log.debug(response.toString());
-            return;
-        }
+//        if(time>20240601123030L){
+//            log.info("非法日期");
+//            RpcRemoterStruct response = new RpcRemoterStruct(st, msg.getCn(), msg.getDataTime(), "03");
+//            request.getCtx().channel().writeAndFlush(response);
+//            log.debug(response.toString());
+//            return;
+//        }
 
         DataUploadRequest dataUpload = DataUploadRequest.parse(cp);
         Boolean flag = false;

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@ vbdsm:
 spring:
   redis:
     host: vbdsm-redis
-    password:
+    password: Iwb-2024
     port: 6379
     database: 3
     lettuce:

VB_DSM_V2.1/vbdsm-job/xxl-job-admin/src/main/resources/application-dev.properties

@@ -18,9 +18,9 @@ spring.freemarker.settings.number_format=0.##########
 mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 #mybatis.type-aliases-package=com.xxl.job.admin.core.model
 ### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://47.112.30.247:23306/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.0.81:3307/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Iwb-2024
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 ### datasource-pool
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource

VB_DSM_V2.1/vbdsm-job/xxl-job-admin/src/main/resources/application-test.properties

@@ -20,7 +20,7 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 ### xxl-job, datasource
 spring.datasource.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Iwb-2024
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 ### datasource-pool
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/src/main/resources/local/db.properties

@@ -1,27 +1,27 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #gov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 gov.mysql.jdbc.username=root
-gov.mysql.jdbc.password=123456
+gov.mysql.jdbc.password=Iwb-2024
 #curr database mysql config
 curr.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-curr.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+curr.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 curr.mysql.jdbc.username=root
-curr.mysql.jdbc.password=123456
+curr.mysql.jdbc.password=Iwb-2024
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2023.mysql.jdbc.username=root
-db2023.mysql.jdbc.password=123456
+db2023.mysql.jdbc.password=Iwb-2024
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2024.mysql.jdbc.username=root
-db2024.mysql.jdbc.password=123456
+db2024.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/src/main/resources/local/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/src/main/resources/test/db.properties

@@ -1,44 +1,44 @@
 currW.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 currW.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 currW.mysql.jdbc.username=root
-currW.mysql.jdbc.password=123456
+currW.mysql.jdbc.password=Iwb-2024
 db2023W.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2023W.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2023W.mysql.jdbc.username=root
-db2023W.mysql.jdbc.password=123456
+db2023W.mysql.jdbc.password=Iwb-2024
 govW.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 govW.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 govW.mysql.jdbc.username=root
-govW.mysql.jdbc.password=123456
+govW.mysql.jdbc.password=Iwb-2024
 #curr database mysql config
 curr.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 curr.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 curr.mysql.jdbc.username=root
-curr.mysql.jdbc.password=123456
+curr.mysql.jdbc.password=Iwb-2024
 #gov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 gov.mysql.jdbc.username=root
-gov.mysql.jdbc.password=123456
+gov.mysql.jdbc.password=Iwb-2024
 #db2023 database mysql config
 db2023.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2023.mysql.jdbc.username=root
-db2023.mysql.jdbc.password=123456
+db2023.mysql.jdbc.password=Iwb-2024
 #db2024 database mysql config
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2024.mysql.jdbc.username=root
-db2024.mysql.jdbc.password=123456
+db2024.mysql.jdbc.password=Iwb-2024
 db2025.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2025.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2025.mysql.jdbc.username=root
-db2025.mysql.jdbc.password=123456
+db2025.mysql.jdbc.password=Iwb-2024
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/src/main/resources/test/redis-host.properties

@@ -1,10 +1 @@
-#redis_ref_hosts=61.155.169.161:6379
-#222.92.214.198:6379
-#192.168.81.17:6379
-#static.chnmooc.com:6379
-redis_ref_hosts=vbdsm-redis:6379
-#redis.host=222.92.214.196
-#redis.port=6379
-#redis.expire=1800
-#redis.timeout=10000
-#redis.password=123456
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024

VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/src/main/resources/config/application-test.yml

@@ -7,7 +7,7 @@ tg:
 spring:
   redis:
     host: vbdsm-redis
-    #    password: Abcd1234!.com
+    password: Iwb-2024
     port: 6379
     database: 0
     pool:

VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/src/main/resources/config/sharding-dev.yml

@@ -1,9 +1,9 @@
 dataSources:
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -14,9 +14,9 @@ dataSources:
     poolPreparedStatements: true
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -28,9 +28,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -42,9 +42,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2025: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -56,9 +56,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -70,9 +70,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5

VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/src/main/resources/config/sharding-test.yml

@@ -3,7 +3,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -16,7 +16,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -30,7 +30,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -44,7 +44,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -58,7 +58,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -72,7 +72,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5

VB_DSM_V2.1/vbdsm-web/vbdsm-charts/src/main/resources/local/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-charts/src/main/resources/test/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=vbdsm-redis:6379
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-explorer/src/main/resources/local/db.properties

@@ -1,12 +1,12 @@
 #sysbase database mysql config
 netdisk.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-netdisk.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_netdisk?serverTimezone=UTC&useSSL=false
+netdisk.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_netdisk?serverTimezone=UTC&useSSL=false
 netdisk.mysql.jdbc.username=root
-netdisk.mysql.jdbc.password=123456
+netdisk.mysql.jdbc.password=Iwb-2024
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_sysbase?serverTimezone=UTC&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-explorer/src/main/resources/local/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-explorer/src/main/resources/product/explorer-config.properties

@@ -1,6 +1,6 @@
-explorer.filesDepotDir=D:/VBDSM/DEPOT_HOME/files/
-explorer.rootDir=D:/VBDSM/FTP_HOME/
-explorer.usersRootDir=D:/VBDSM/FTP_HOME/users/
-explorer.tempRootDir=D:/VBDSM/FTP_HOME/temp/
-explorer.publicRootDir=D:/VBDSM/FTP_HOME/public/
+explorer.filesDepotDir=./VBDSM/DEPOT_HOME/files/
+explorer.rootDir=./VBDSM/FTP_HOME/
+explorer.usersRootDir=./VBDSM/FTP_HOME/users/
+explorer.tempRootDir=./VBDSM/FTP_HOME/temp/
+explorer.publicRootDir=./VBDSM/FTP_HOME/public/
 explorer.port=21

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

@@ -10,7 +10,7 @@
     </appender>
 
     <appender name="file" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="D:/01WORK/2023/logs/vbdsm/explorer/webapp.log"/>
+        <param name="file" value="./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="D:/01WORK/2023/logs/vbdsm/explorer/warn.log"/>
+        <param name="file" value="./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="D:/01WORK/2023/logs/vbdsm/explorer/error.log"/>
+        <param name="file" value="./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-explorer/src/main/resources/test/db.properties

@@ -2,11 +2,11 @@
 netdisk.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 netdisk.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_netdisk?serverTimezone=UTC&useSSL=false
 netdisk.mysql.jdbc.username=root
-netdisk.mysql.jdbc.password=123456
+netdisk.mysql.jdbc.password=Iwb-2024
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-explorer/src/main/resources/test/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=vbdsm-redis:6379
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/resources/config/sharding-dev.yml

@@ -1,9 +1,9 @@
 dataSources:
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -15,9 +15,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -29,9 +29,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2025: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -43,9 +43,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -57,9 +57,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -71,9 +71,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:23306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://192.168.0.81:3307/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/resources/config/sharding-test.yml

@@ -3,7 +3,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -17,7 +17,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -31,7 +31,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -45,7 +45,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -59,7 +59,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -73,7 +73,7 @@ dataSources:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb-2024
     filters: stat
     maxActive: 30
     initialSize: 5

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>/vbdsm/logs/${appName}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>./logs/gov-new/%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>/vbdsm/logs/${appName}/%d{yyyy-MM-dd}.%i.error.log</FileNamePattern>
+            <FileNamePattern>./logs/gov-new/%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/local/redis-host.properties

@@ -1,10 +1 @@
-#redis_ref_hosts=222.92.214.198:6379
-#222.92.214.198:6379
-#192.168.81.17:6379
-#static.chnmooc.com:6379
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
-#redis.host=127.0.0.1
-#redis.port=6379
-#redis.expire=1800
-#redis.timeout=10000
-#redis.password=123456
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-gov/src/main/resources/product/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="./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="./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="./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-gov/src/main/resources/test/db.properties

@@ -2,15 +2,15 @@
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 gov.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 gov.mysql.jdbc.username=root
-gov.mysql.jdbc.password=123456
+gov.mysql.jdbc.password=Iwb-2024
 mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 mysql.jdbc.username=root
-mysql.jdbc.password=123456
+mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-gov/src/main/resources/test/redis-host.properties

@@ -1,5 +1 @@
-redis_ref_hosts=vbdsm-redis:6379
-#redis.port=6379
-#redis.expire=1800
-#redis.timeout=10000
-#redis.password=123456
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/src/main/resources/local/db.properties

@@ -1,8 +1,8 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/src/main/resources/local/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/src/main/resources/product/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="./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="./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="./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-manage/src/main/resources/test/db.properties

@@ -2,7 +2,7 @@
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/src/main/resources/test/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=vbdsm-redis:6379
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/src/main/resources/local/db.properties

@@ -1,8 +1,8 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/src/main/resources/local/redis-host.properties

@@ -1 +1 @@
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/src/main/resources/product/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="./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="./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="./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-passport/src/main/resources/test/db.properties

@@ -7,7 +7,7 @@
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/src/main/resources/test/redis-host.properties

@@ -1,4 +1,4 @@
-redis_ref_hosts=vbdsm-redis:6379
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/resources/jjrh/redis-host.properties

@@ -1,10 +1 @@
-#redis_ref_hosts=222.92.214.198:6379
-#222.92.214.198:6379
-#192.168.81.17:6379
-#static.chnmooc.com:6379
 redis_ref_hosts=47.112.30.247:6399:Iwb-2017
-#redis.host=222.92.214.196
-#redis.port=6379
-#redis.expire=1800
-#redis.timeout=10000
-#redis.password=123456

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/resources/local/db.properties

@@ -1,31 +1,31 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #powergov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 gov.mysql.jdbc.username=root
-gov.mysql.jdbc.password=123456
+gov.mysql.jdbc.password=Iwb-2024
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 mysql.jdbc.username=root
-mysql.jdbc.password=123456
+mysql.jdbc.password=Iwb-2024
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2023.mysql.jdbc.username=root
-db2023.mysql.jdbc.password=123456
+db2023.mysql.jdbc.password=Iwb-2024
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2024.mysql.jdbc.username=root
-db2024.mysql.jdbc.password=123456
+db2024.mysql.jdbc.password=Iwb-2024
 db2025.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2025.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2025.mysql.jdbc.url=jdbc:mysql://192.168.0.81:3307/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2025.mysql.jdbc.username=root
-db2025.mysql.jdbc.password=123456
+db2025.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/resources/local/redis-host.properties

@@ -2,7 +2,7 @@
 #222.92.214.198:6379
 #192.168.81.17:6379
 #static.chnmooc.com:6379
-redis_ref_hosts=192.168.0.104:6379:Iwb-2017
+redis_ref_hosts=192.168.0.81:6380:Iwb-2024
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/resources/product/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="./logs/ps/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="./logs/ps/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="./logs/ps/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/db.properties

@@ -2,30 +2,30 @@
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb-2024
 #powergov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 gov.mysql.jdbc.username=root
-gov.mysql.jdbc.password=123456
+gov.mysql.jdbc.password=Iwb-2024
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 mysql.jdbc.username=root
-mysql.jdbc.password=123456
+mysql.jdbc.password=Iwb-2024
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2023.mysql.jdbc.username=root
-db2023.mysql.jdbc.password=123456
+db2023.mysql.jdbc.password=Iwb-2024
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2024.mysql.jdbc.username=root
-db2024.mysql.jdbc.password=123456
+db2024.mysql.jdbc.password=Iwb-2024
 db2025.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
 db2025.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 db2025.mysql.jdbc.username=root
-db2025.mysql.jdbc.password=123456
+db2025.mysql.jdbc.password=Iwb-2024
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/resources/test/redis-host.properties

@@ -1,11 +1 @@
-redis_ref_hosts=vbdsm-redis:6379
-#redis_ref_hosts=61.155.169.161:6379
-#222.92.214.198:6379
-#192.168.81.17:6379
-#static.chnmooc.com:6379
-#redis_ref_hosts=47.112.30.247:6399:Iwb-2017
-#redis.host=222.92.214.196
-#redis.port=6379
-#redis.expire=1800
-#redis.timeout=10000
-#redis.password=123456
+redis_ref_hosts=vbdsm-redis:6379:Iwb-2024