Update Db,Redis配置

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   mysql:
-    image: mysql:8.1.0
+    image: mysql:5.7.4
     container_name: vbdsm-mysql
     restart: always
     environment:
@@ -14,14 +14,8 @@ services:
       # 数据挂载
       - /home/iwb/vbdsm/mysql/data/:/var/lib/mysql/
       # 配置挂载
-      - /home/iwb/vbdsm/mysql/conf/:/etc/mysql/conf.d/
-    command:
-      # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
-      --default-authentication-plugin=mysql_native_password
-      --character-set-server=utf8mb4
-      --collation-server=utf8mb4_general_ci
-      --explicit_defaults_for_timestamp=true
-      --lower_case_table_names=0
+      - /home/iwb/vbdsm/mysql/conf/my.cnf:/etc/mysql/my.cnf
+
     privileged: true
 
     networks:

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   mysql:
-    image: mysql:8.1.0
+    image: mysql:5.7.4
     container_name: vbdsm-mysql
     restart: always
     environment:
@@ -14,14 +14,7 @@ services:
       # 数据挂载
       - /home/yue/vbdsm/mysql/data/:/var/lib/mysql/
       # 配置挂载
-      - /home/yue/vbdsm/mysql/conf/:/etc/mysql/conf.d/
-    command:
-      # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
-      --default-authentication-plugin=mysql_native_password
-      --character-set-server=utf8mb4
-      --collation-server=utf8mb4_general_ci
-      --explicit_defaults_for_timestamp=true
-      --lower_case_table_names=0
+      - /home/yue/vbdsm/mysql/conf/my.cnf:/etc/mysql/my.cnf
     privileged: true
 
     networks:
@@ -240,7 +233,7 @@ services:
     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.0

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

@@ -1,20 +1,20 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,6 +1 @@
-redis_ref_hosts=47.112.30.247:6399:Iwb-2017
-#redis.host=127.0.0.1
-#redis.port=6379
-#redis.expire=1800
-#redis.timeout=10000
-#redis.password=123456
+redis_ref_hosts=47.112.30.247:16379

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

@@ -1,20 +1,20 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,20 +1,20 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -5,8 +5,8 @@ server:
 spring:
   redis:
     host: 47.112.30.247
-    password: Iwb-2017
-    port: 6399
+    #password: Iwb-2017
+    port: 16379
     database: 5
     lettuce:
       pool:
@@ -32,7 +32,7 @@ sharding:
     datasource:
       names: vbdsm,vbdsm-2023,vbdsm-2024
       vbdsm:
-        url: jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+        url: jdbc:mysql://47.112.30.247:23306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
         username: root
         password: 123456
         driverClassName: com.mysql.cj.jdbc.Driver
@@ -46,7 +46,7 @@ sharding:
         testWhileIdle: true
         maxActive: 30
       vbdsm-2023:
-        url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+        url: jdbc:mysql://47.112.30.247:23306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
         username: root
         password: 123456
         driverClassName: com.mysql.cj.jdbc.Driver
@@ -60,7 +60,7 @@ sharding:
         testWhileIdle: true
         maxActive: 30
       vbdsm-2024:
-        url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+        url: jdbc:mysql://47.112.30.247:23306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
         username: root
         password: 123456
         driverClassName: com.mysql.cj.jdbc.Driver

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

@@ -10,8 +10,8 @@ vbdsm:
 spring:
   redis:
     host: 47.112.30.247
-    password: Iwb-2017
-    port: 6399
+    #password: Iwb-2017
+    port: 16379
     database: 5
     lettuce:
       pool:

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-socket/src/main/java/cn/vbdsm/hj212/socket/transport/EppSocketServer.java

@@ -4,10 +4,7 @@ import cn.vbdsm.hj212.socket.config.ServerProperties;
 import cn.vbdsm.hj212.socket.driver.MessageDriverLoop;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
+import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
@@ -61,6 +58,7 @@ public class EppSocketServer {
                 .childOption(ChannelOption.SO_REUSEADDR, Boolean.TRUE)
                 .childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
                 .childOption(ChannelOption.SO_KEEPALIVE, Boolean.TRUE)
+                .childOption(ChannelOption.RCVBUF_ALLOCATOR, new FixedRecvByteBufAllocator(65535))
                 .childHandler(new ChannelInitializer<NioSocketChannel>() {
 
                     @Override

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

@@ -18,7 +18,7 @@ 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:13306/vbdsm_xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://47.112.30.247:23306/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

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

@@ -1,25 +1,25 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #gov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 #curr database mysql config
 curr.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-curr.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+curr.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 curr.mysql.jdbc.username=root
 curr.mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/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=47.112.30.247:6399:Iwb-2017
-#redis.host=127.0.0.1
-#redis.port=6379
-#redis.expire=1800
-#redis.timeout=10000
-#redis.password=123456
+redis_ref_hosts=47.112.30.247:16379

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

@@ -1,30 +1,30 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #gov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 #curr database mysql config
 curr.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-curr.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+curr.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 curr.mysql.jdbc.username=root
 curr.mysql.jdbc.password=123456
 #error database mysql config
 error.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-error.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+error.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 error.mysql.jdbc.username=root
 error.mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,38 +1,38 @@
 currW.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-currW.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+currW.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 currW.mysql.jdbc.username=root
 currW.mysql.jdbc.password=123456
 db2023W.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023W.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023W.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023W.mysql.jdbc.username=root
 db2023W.mysql.jdbc.password=123456
 govW.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-govW.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+govW.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 govW.mysql.jdbc.username=root
 govW.mysql.jdbc.password=123456
 #curr database mysql config
 curr.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-curr.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+curr.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 curr.mysql.jdbc.username=root
 curr.mysql.jdbc.password=123456
 #gov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 #db2023 database mysql config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 #db2024 database mysql config
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -7,8 +7,8 @@ tg:
 spring:
   redis:
     host: 47.112.30.247
-    password: Iwb-2017
-    port: 6399
+    #password: Iwb-2017
+    port: 16379
     database: 0
     pool:
       maxActive: 8

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

@@ -1,7 +1,7 @@
 dataSources:
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -14,7 +14,7 @@ dataSources:
     poolPreparedStatements: true
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -28,7 +28,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -42,7 +42,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -56,7 +56,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat

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

@@ -1,7 +1,7 @@
 dataSources:
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -14,7 +14,7 @@ dataSources:
     poolPreparedStatements: true
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -28,7 +28,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -43,7 +43,7 @@ dataSources:
 
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -57,7 +57,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat

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

@@ -1,7 +1,7 @@
 dataSources:
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -14,7 +14,7 @@ dataSources:
     poolPreparedStatements: true
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -28,7 +28,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -42,7 +42,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -56,7 +56,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat

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

@@ -1,10 +1,10 @@
 #sysbase database mysql config
 netdisk.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-netdisk.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_netdisk?serverTimezone=UTC&useSSL=false
+netdisk.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_netdisk?serverTimezone=UTC&useSSL=false
 netdisk.mysql.jdbc.username=root
 netdisk.mysql.jdbc.password=123456
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1 +1 @@
-redis_ref_hosts=47.112.30.247:6399:Iwb-2017
+redis_ref_hosts=47.112.30.247:16379

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

@@ -7,8 +7,8 @@ tg:
 spring:
   redis:
     host: 47.112.30.247
-    password: Iwb-2017
-    port: 6399
+    #password: Iwb-2017
+    port: 16379
     database: 0
     pool:
       maxActive: 8

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

@@ -1,7 +1,7 @@
 dataSources:
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -15,7 +15,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -29,7 +29,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -43,7 +43,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -57,7 +57,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:23306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat

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

@@ -1,7 +1,7 @@
 dataSources:
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -15,7 +15,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -29,7 +29,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -43,7 +43,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -57,7 +57,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat

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

@@ -1,7 +1,7 @@
 dataSources:
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -15,7 +15,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -29,7 +29,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -43,7 +43,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat
@@ -57,7 +57,7 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+    url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
     username: root
     password: 123456
     filters: stat

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

@@ -1,14 +1,14 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?useSSL=false&serverTimezone=UTC
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?useSSL=false&serverTimezone=UTC
+gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?useSSL=false&serverTimezone=UTC
+mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #alibaba druid config

VB_DSM_V2.1/vbdsm-web/vbdsm-gov/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=47.112.30.247:6399:Iwb-2017
+redis_ref_hosts=47.112.30.247:16379
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

VB_DSM_V2.1/vbdsm-web/vbdsm-gov/src/main/resources/product/db.properties

@@ -1,14 +1,14 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,14 +1,14 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,6 +1,6 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1 +1 @@
-redis_ref_hosts=47.112.30.247:6399:Iwb-2017
+redis_ref_hosts=47.112.30.247:16379

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

@@ -1,6 +1,6 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,6 +1,6 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/src/main/java/cn/vbdsm/passport/service/impl/AuthService.java

@@ -88,20 +88,27 @@ public class AuthService implements IAuthService {
             return new ResultMsg<JSONObject>(SystemConstant.RESULT_STATUS_ERROR, "该用户未分配机构,不允许登录,请联系管理员");
         }
         Site site;
-        if (domain.equals("vbdsm.com")) {
-            site = new Site();
-            site.setConfig("{\"platform\":{\"01200008\":\"passport\",\"01200007\":\"ps\",\"01200002\":\"gov\",\"01200009\":\"manage\",\"01200012\":\"m\",\"01200013\":\"msg\",\"01200014\":\"govnew\"}}");
-            site.setDomain(domain);
-            site.setId(24L);
-            site.setName("VBER需求侧管理平台");
-        } else {
-            //检查机构对应的站点访问权限
-            site = langService.getSiteByCidAndDomain(user.getCompanyId(), domain).getData();
-            if (site == null) {
-                langService.removeSitesCacheByCompanyId(user.getCompanyId());
-                log.error("用户" + user.getLoginName() + "，不能在" + domain + "站点下登录");
-                return new ResultMsg<JSONObject>(SystemConstant.RESULT_STATUS_ERROR, "用户不存在");
-            }
+        //if (domain.equals("vbdsm.com")) {
+        //    site = new Site();
+        //    site.setConfig("{\"platform\":{\"01200008\":\"passport\",\"01200007\":\"ps\",\"01200002\":\"gov\",\"01200009\":\"manage\",\"01200012\":\"m\",\"01200013\":\"msg\",\"01200014\":\"govnew\"}}");
+        //    site.setDomain(domain);
+        //    //site.setId(24L);
+        //    site.setId(1L);
+        //    site.setName("VBER需求侧管理平台");
+        //} else {
+        //    //检查机构对应的站点访问权限
+        //    site = langService.getSiteByCidAndDomain(user.getCompanyId(), domain).getData();
+        //    if (site == null) {
+        //        langService.removeSitesCacheByCompanyId(user.getCompanyId());
+        //        log.error("用户" + user.getLoginName() + "，不能在" + domain + "站点下登录");
+        //        return new ResultMsg<JSONObject>(SystemConstant.RESULT_STATUS_ERROR, "用户不存在");
+        //    }
+        //}
+        site = langService.getSiteByCidAndDomain(user.getCompanyId(), domain).getData();
+        if (site == null) {
+            langService.removeSitesCacheByCompanyId(user.getCompanyId());
+            log.error("用户" + user.getLoginName() + "，不能在" + domain + "站点下登录");
+            return new ResultMsg<JSONObject>(SystemConstant.RESULT_STATUS_ERROR, "用户不存在");
         }
 
 

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

@@ -1,6 +1,6 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/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=47.112.30.247:6399:Iwb-2017
+redis_ref_hosts=47.112.30.247:16379
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

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

@@ -1,6 +1,6 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -5,7 +5,7 @@
 #sysbase.oracle.jdbc.password=123456
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,25 +1,25 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #powergov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:23306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

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=47.112.30.247:6399:Iwb-2017
+redis_ref_hosts=47.112.30.247:16379
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

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

@@ -1,25 +1,25 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #powergov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -1,25 +1,25 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 sysbase.mysql.jdbc.username=root
 sysbase.mysql.jdbc.password=123456
 #powergov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?serverTimezone=UTC&useSSL=false&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_powergov?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 gov.mysql.jdbc.username=root
 gov.mysql.jdbc.password=123456
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?serverTimezone=UTC&useSSL=false&useSSL=false
+mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 mysql.jdbc.username=root
 mysql.jdbc.password=123456
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?serverTimezone=UTC&useSSL=false&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?serverTimezone=UTC&useSSL=false&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&useSSL=false
 db2024.mysql.jdbc.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config