修改production环境的配置文件

VB_DSM_V2.1/Scripts/Cmds/7090_analysis.run.xml

@@ -5,7 +5,6 @@
       <option name="myRunnerSettings" />
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
-          <option name="cmdOptions" />
           <option name="profiles">
             <set />
           </option>
@@ -17,12 +16,9 @@
           <option name="pomFileName" />
           <option name="profilesMap">
             <map>
-              <entry key="local" value="true" />
+              <entry key="local" value="false" />
             </map>
           </option>
-          <option name="projectsCmdOptionValues">
-            <list />
-          </option>
           <option name="resolveToWorkspace" value="false" />
           <option name="workingDirPath" value="$PROJECT_DIR$/vbdsm-statistics/vbdsm-analysis" />
         </MavenRunnerParameters>

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

@@ -14,7 +14,7 @@ db2023.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2023?useUnicode=tru
 db2023.mysql.jdbc.username=root
 db2023.mysql.jdbc.password=123456
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+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.username=root
 db2024.mysql.jdbc.password=123456
 #alibaba druid config

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

@@ -47,7 +47,12 @@
         <property name="username" value="${db2024.mysql.jdbc.username}"/>
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
-
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
 
     <bean id="sysbaseDataSource" parent="datasourcePool">
         <property name="driverClassName" value="${sysbase.mysql.jdbc.driverClassName}"/>
@@ -64,6 +69,7 @@
                 <entry key="curr" value-ref="currDataSource"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="currDataSource"/>

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

@@ -1,22 +1,26 @@
 #sysbase database mysql config
 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.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 #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
+mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 mysql.jdbc.username=root
-mysql.jdbc.password=123456
+mysql.jdbc.password=Iwb2023
 #business database config
 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.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://47.112.30.247:13306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
+db2025.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
+db2025.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2025.mysql.jdbc.username=root
+db2025.mysql.jdbc.password=Iwb2023
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -47,7 +47,12 @@
         <property name="username" value="${db2024.mysql.jdbc.username}"/>
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
-
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
     <bean id="sysbaseDataSource" parent="datasourcePool">
         <property name="driverClassName" value="${sysbase.mysql.jdbc.driverClassName}"/>
         <property name="url" value="${sysbase.mysql.jdbc.url}"/>
@@ -63,6 +68,7 @@
                 <entry key="curr" value-ref="currDataSource"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="currDataSource"/>

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

@@ -17,6 +17,10 @@ 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
+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
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect/pom.xml

@@ -63,4 +63,34 @@
             <artifactId>lombok</artifactId>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>local</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>test</profiles.active>
+            </properties>
+
+        </profile>
+        <profile>
+            <id>product</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>prod</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
 </project>

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect/src/main/java/cn/vbdsm/hj212/datacollect/biz/impl/MonitorBizImpl.java

@@ -42,7 +42,9 @@ public class MonitorBizImpl implements IMonitorBiz {
                 map.clear();
             }
             String companyId = String.valueOf(entity.getCompanyId());
-            map.put(KeyUtils.mergeRedisKey(Constants.REDIS_TERMIANL_BASE_KEY_PRIFIX, companyId, entity.getTerminalId()), entity);
+            //map.put(KeyUtils.mergeRedisKey(Constants.REDIS_TERMIANL_BASE_KEY_PRIFIX, companyId, entity.getTerminalId()), entity);
+            //由之前通过企业Id+终端Id作为key去存储，现在通过终端Id作为key去存储
+            map.put(KeyUtils.mergeRedisKey(Constants.REDIS_TERMIANL_TID_KEY_PRIFIX, entity.getTerminalId()), entity);
         }
         if (!map.isEmpty()) {
             redisTemplate.opsForValue().multiSet(map);

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

@@ -0,0 +1,203 @@
+server:
+  mysql:
+    batchSize: 100
+  port: 7220
+spring:
+  redis:
+    host: 192.168.0.104
+    password: Iwb-2017
+    port: 6379
+    database: 3
+    lettuce:
+      pool:
+        maxActive: 10
+        maxWait: -1
+        maxIdle: 9
+        minIdle: 0
+    timeout: 5000
+xxl:
+  job:
+    admin:
+      addresses: http://127.0.0.1:7200/
+    executor:
+      appname: vbdsm-datacollect
+      ip:
+      port: 7221
+      logpath: logs
+      logretentiondays: -1
+    accessToken: vbdsm-job-2023
+
+sharding:
+  jdbc:
+    datasource:
+      names: vbdsm,vbdsm-2023,vbdsm-2024
+      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
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      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
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      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
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+    config:
+      sharding:
+        tables:
+          t_online_data_energy:
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_energy_0${1..9},vbdsm-${2023..2024}.t_online_data_energy_${10..12}
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_power:
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_power_0${1..9},vbdsm-${2023..2024}.t_online_data_power_${10..12}
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_qty:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_qty_0${1..9},vbdsm-${2023..2024}.t_online_data_qty_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_harmonic_i:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_i_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_i_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_harmonic_u:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_u_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_u_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_monitor:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_monitor
+            databaseStrategy:
+              none:
+                any:
+          t_anal_data24h_energy:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_anal_data24h_energy
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_energy_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_energy
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_harmonic_i_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_harmonic_i
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_harmonic_u_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_harmonic_u
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_power_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_power
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_qty_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_qty
+            databaseStrategy:
+              none:
+                any:
+      defaultDatabaseStrategy:
+        standard:
+          shardingColumn: getTime
+          preciseAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.PreciseDatabaseShardingAlgorithm
+          rangeAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.RangeDatabaseShardingAlgorithm
+      defaultTableStrategy:
+        none:
+      props:
+        sql.show: true

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

@@ -0,0 +1,217 @@
+server:
+  mysql:
+    batchSize: 100
+  port: 17220
+spring:
+  redis:
+    host: 116.63.177.9
+    password: Iwb2023
+    port: 12079
+    database: 3
+    lettuce:
+      pool:
+        maxActive: 10
+        maxWait: -1
+        maxIdle: 9
+        minIdle: 0
+    timeout: 5000
+xxl:
+  job:
+    admin:
+      addresses: http://127.0.0.1:17200/
+    executor:
+      appname: vbdsm-datacollect
+      ip:
+      port: 17221
+      logpath: logs
+      logretentiondays: -1
+    accessToken: vbdsm-job-2023
+
+sharding:
+  jdbc:
+    datasource:
+      names: vbdsm,vbdsm-2023,vbdsm-2024,vbdsm-2025
+      vbdsm:
+        url: jdbc:mysql://116.63.177.9:12006/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: root
+        password: Iwb2023
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      vbdsm-2023:
+        url: jdbc:mysql://116.63.177.9:12006/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: root
+        password: Iwb2023
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      vbdsm-2024:
+        url: jdbc:mysql://116.63.177.9:12006/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: root
+        password: Iwb2023
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      vbdsm-2025:
+        url: jdbc:mysql://116.63.177.9:12006/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: root
+        password: Iwb2023
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+    config:
+      sharding:
+        tables:
+          t_online_data_energy:
+            actualDataNodes: vbdsm-${2023..2025}.t_online_data_energy_0${1..9},vbdsm-${2023..2025}.t_online_data_energy_${10..12}
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_power:
+            actualDataNodes: vbdsm-${2023..2025}.t_online_data_power_0${1..9},vbdsm-${2023..2025}.t_online_data_power_${10..12}
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_qty:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2025}.t_online_data_qty_0${1..9},vbdsm-${2023..2025}.t_online_data_qty_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_harmonic_i:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2025}.t_online_data_harmonic_i_0${1..9},vbdsm-${2023..2025}.t_online_data_harmonic_i_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_harmonic_u:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2025}.t_online_data_harmonic_u_0${1..9},vbdsm-${2023..2025}.t_online_data_harmonic_u_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_monitor:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_monitor
+            databaseStrategy:
+              none:
+                any:
+          t_anal_data24h_energy:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_anal_data24h_energy
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_energy_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_energy
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_harmonic_i_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_harmonic_i
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_harmonic_u_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_harmonic_u
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_power_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_power
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_qty_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_qty
+            databaseStrategy:
+              none:
+                any:
+      defaultDatabaseStrategy:
+        standard:
+          shardingColumn: getTime
+          preciseAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.PreciseDatabaseShardingAlgorithm
+          rangeAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.RangeDatabaseShardingAlgorithm
+      defaultTableStrategy:
+        none:
+      props:
+        sql.show: true

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

@@ -0,0 +1,203 @@
+server:
+  mysql:
+    batchSize: 100
+  port: 7220
+spring:
+  redis:
+    host: 192.168.0.104
+    password: Iwb-2017
+    port: 6379
+    database: 3
+    lettuce:
+      pool:
+        maxActive: 10
+        maxWait: -1
+        maxIdle: 9
+        minIdle: 0
+    timeout: 5000
+xxl:
+  job:
+    admin:
+      addresses: http://127.0.0.1:7200/
+    executor:
+      appname: vbdsm-datacollect
+      ip:
+      port: 7221
+      logpath: logs
+      logretentiondays: -1
+    accessToken: vbdsm-job-2023
+
+sharding:
+  jdbc:
+    datasource:
+      names: vbdsm,vbdsm-2023,vbdsm-2024
+      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
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      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
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      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
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+    config:
+      sharding:
+        tables:
+          t_online_data_energy:
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_energy_0${1..9},vbdsm-${2023..2024}.t_online_data_energy_${10..12}
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_power:
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_power_0${1..9},vbdsm-${2023..2024}.t_online_data_power_${10..12}
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_qty:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_qty_0${1..9},vbdsm-${2023..2024}.t_online_data_qty_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_harmonic_i:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_i_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_i_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_online_data_harmonic_u:
+            tableStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
+            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_u_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_u_${10..12}
+            databaseStrategy:
+              standard:
+                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
+                shardingColumn: getTime
+                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
+          t_monitor:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_monitor
+            databaseStrategy:
+              none:
+                any:
+          t_anal_data24h_energy:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_anal_data24h_energy
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_energy_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_energy
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_harmonic_i_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_harmonic_i
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_harmonic_u_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_harmonic_u
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_power_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_power
+            databaseStrategy:
+              none:
+                any:
+          t_online_data_qty_temp:
+            tableStrategy:
+              none:
+                any:
+            actualDataNodes: vbdsm.t_online_data_qty
+            databaseStrategy:
+              none:
+                any:
+      defaultDatabaseStrategy:
+        standard:
+          shardingColumn: getTime
+          preciseAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.PreciseDatabaseShardingAlgorithm
+          rangeAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.RangeDatabaseShardingAlgorithm
+      defaultTableStrategy:
+        none:
+      props:
+        sql.show: true

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

@@ -1,203 +1,3 @@
-server:
-  mysql:
-    batchSize: 100
-  port: 7220
 spring:
-  redis:
-    host: 192.168.0.104
-    password: Iwb-2017
-    port: 6379
-    database: 3
-    lettuce:
-      pool:
-        maxActive: 10
-        maxWait: -1
-        maxIdle: 9
-        minIdle: 0
-    timeout: 5000
-xxl:
-  job:
-    admin:
-      addresses: http://127.0.0.1:7200/
-    executor:
-      appname: vbdsm-datacollect
-      ip:
-      port: 7221
-      logpath: logs
-      logretentiondays: -1
-    accessToken: vbdsm-job-2023
-
-sharding:
-  jdbc:
-    datasource:
-      names: vbdsm,vbdsm-2023,vbdsm-2024
-      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
-        driverClassName: com.mysql.jdbc.Driver
-        minIdle: 10
-        validationQuery: SELECT 1
-        initialSize: 5
-        maxWait: 60000
-        filters: stat
-        poolPreparedStatements: true
-        type: com.alibaba.druid.pool.DruidDataSource
-        testWhileIdle: true
-        maxActive: 30
-      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
-        driverClassName: com.mysql.jdbc.Driver
-        minIdle: 10
-        validationQuery: SELECT 1
-        initialSize: 5
-        maxWait: 60000
-        filters: stat
-        poolPreparedStatements: true
-        type: com.alibaba.druid.pool.DruidDataSource
-        testWhileIdle: true
-        maxActive: 30
-      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
-        driverClassName: com.mysql.jdbc.Driver
-        minIdle: 10
-        validationQuery: SELECT 1
-        initialSize: 5
-        maxWait: 60000
-        filters: stat
-        poolPreparedStatements: true
-        type: com.alibaba.druid.pool.DruidDataSource
-        testWhileIdle: true
-        maxActive: 30
-    config:
-      sharding:
-        tables:
-          t_online_data_energy:
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_energy_0${1..9},vbdsm-${2023..2024}.t_online_data_energy_${10..12}
-            tableStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            databaseStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
-          t_online_data_power:
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_power_0${1..9},vbdsm-${2023..2024}.t_online_data_power_${10..12}
-            tableStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            databaseStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
-          t_online_data_qty:
-            tableStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_qty_0${1..9},vbdsm-${2023..2024}.t_online_data_qty_${10..12}
-            databaseStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
-          t_online_data_harmonic_i:
-            tableStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_i_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_i_${10..12}
-            databaseStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
-          t_online_data_harmonic_u:
-            tableStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_u_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_u_${10..12}
-            databaseStrategy:
-              standard:
-                rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
-                shardingColumn: getTime
-                preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
-          t_monitor:
-            tableStrategy:
-              none:
-                any:
-            actualDataNodes: vbdsm.t_monitor
-            databaseStrategy:
-              none:
-                any:
-          t_anal_data24h_energy:
-            tableStrategy:
-              none:
-                any:
-            actualDataNodes: vbdsm.t_anal_data24h_energy
-            databaseStrategy:
-              none:
-                any:
-          t_online_data_energy_temp:
-            tableStrategy:
-              none:
-                any:
-            actualDataNodes: vbdsm.t_online_data_energy
-            databaseStrategy:
-              none:
-                any:
-          t_online_data_harmonic_i_temp:
-            tableStrategy:
-              none:
-                any:
-            actualDataNodes: vbdsm.t_online_data_harmonic_i
-            databaseStrategy:
-              none:
-                any:
-          t_online_data_harmonic_u_temp:
-            tableStrategy:
-              none:
-                any:
-            actualDataNodes: vbdsm.t_online_data_harmonic_u
-            databaseStrategy:
-              none:
-                any:
-          t_online_data_power_temp:
-            tableStrategy:
-              none:
-                any:
-            actualDataNodes: vbdsm.t_online_data_power
-            databaseStrategy:
-              none:
-                any:
-          t_online_data_qty_temp:
-            tableStrategy:
-              none:
-                any:
-            actualDataNodes: vbdsm.t_online_data_qty
-            databaseStrategy:
-              none:
-                any:
-      defaultDatabaseStrategy:
-        standard:
-          shardingColumn: getTime
-          preciseAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.PreciseDatabaseShardingAlgorithm
-          rangeAlgorithmClassName: sharding.cn.vbdsm.hj212.datacollect.RangeDatabaseShardingAlgorithm
-      defaultTableStrategy:
-        none:
-      props:
-        sql.show: true
+  profiles:
+    active: @profiles.active@

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

@@ -9,15 +9,15 @@ vbdsm:
             bossThreadNum: 1 #netty boss线程数 默认为1
             workThreadNum: 4 #netty work线程数，默认为4
         client:
-            port: 7777
-            bindIp: 192.168.0.104
+            port: 17777
+            bindIp: 127.0.0.1
     ws:
         #url: http://192.168.0.104:7100/services/UploadData?wsdl;http://192.168.0.104:7100/services/UploadData?wsdl
         url: http://192.168.0.81:7101/services/UploadData?wsdl
         method: UploadAllData
         key: WOSHI123456MIYAO
     monitor:
-        terminals: 3@YC0001,YC0002&7@YD001_01,YD001_02&9@YD002_01,YD002_02&10@YD003_01
+        terminals: 3@YC0001,YC0002&4@Y0201,Y0202
 spring:
     datasource:
         driver-class-name: org.sqlite.JDBC

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modle/src/main/java/cn/vbdsm/hj212/utils/Constants.java

@@ -6,6 +6,7 @@ public class Constants {
     public static final String PARAM_KEY_SPLITCHAR = "tid";
     public static final String PARAM_INNER_SPLITCHAR = ",";
     public static final String PARAM_KEY_DATETIME = "dataTime";
+    public static final String REDIS_TERMIANL_TID_KEY_PRIFIX = "vbdsm:online:terminal:tid";
     public static final String REDIS_TERMIANL_BASE_KEY_PRIFIX = "vbdsm:online:terminal:base";
     public static final String REDIS_TERMIANL_ONLINE_KEY_PRIFIX = "vbdsm:online:terminal:online";
     public static final String REDIS_TERMIANL_SYNC2DB_KEY_PRIFIX = "vbdsm:online:terminal:sync2db";

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/pom.xml

@@ -28,5 +28,34 @@
             <artifactId>commons-pool2</artifactId>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>local</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>test</profiles.active>
+            </properties>
 
+        </profile>
+        <profile>
+            <id>product</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>prod</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
 </project>

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/src/main/java/cn/vbdsm/hj212/server/biz/IOnlineDataBiz.java

@@ -6,6 +6,7 @@ import cn.vbdsm.hj212.modle.OnlineTerminal;
 public interface IOnlineDataBiz {
 
     MonitorCache getMonitorByPk(String companyId, String tid);
+    MonitorCache getMonitorByPk(String tid);
 
     void insertOnlineData(OnlineTerminal onlineTerminal);
 }

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/src/main/java/cn/vbdsm/hj212/server/biz/impl/OnlineDataBizImpl.java

@@ -20,6 +20,11 @@ public class OnlineDataBizImpl implements IOnlineDataBiz {
         MonitorCache monitorCache = (MonitorCache) redisTemplate.opsForValue().get(KeyUtils.mergeRedisKey(Constants.REDIS_TERMIANL_BASE_KEY_PRIFIX, companyId, tid));
         return monitorCache;
     }
+    @Override
+    public MonitorCache getMonitorByPk(String tid) {
+        MonitorCache monitorCache = (MonitorCache) redisTemplate.opsForValue().get(KeyUtils.mergeRedisKey(Constants.REDIS_TERMIANL_TID_KEY_PRIFIX,  tid));
+        return monitorCache;
+    }
 
     @Override
     public void insertOnlineData(OnlineTerminal onlineTerminal) {

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

@@ -61,7 +61,9 @@ public class ReaTimeExector implements IExecutor {
             String tid = entry.getKey();
             OnlineTerminal onlineTerminal = new OnlineTerminal();
             onlineTerminal.setTerminalId(tid);
-            MonitorCache entity = dataBiz.getMonitorByPk(cn, tid);
+            //MonitorCache entity = dataBiz.getMonitorByPk(cn, tid);
+            //只通过terminalId查到设备和企业信息
+            MonitorCache entity = dataBiz.getMonitorByPk(tid);
             if (entity != null) {
                 log.info("[" + time + "]:" + cp + "$" + tid);
                 VbDsmBody body = dataUpload.getBody(tid);

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

@@ -0,0 +1,21 @@
+vbdsm:
+  socket:
+    server:
+      enable: true
+      bindPort: 7777 #服务器端口，默认是19999
+      bindIp: 0.0.0.0 #服务器ip 默认0.0.0.0
+      bossThreadNum: 1 #netty boss线程数 默认为1
+      workThreadNum: 4 #netty work线程数，默认为4
+
+spring:
+  redis:
+    host: 192.168.0.104
+    password: Iwb-2017
+    port: 6379
+    database: 3
+    lettuce:
+      pool:
+        maxActive: 8
+        maxWait: -1
+        maxIdle: 8
+        minIdle: 0

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

@@ -0,0 +1,21 @@
+vbdsm:
+  socket:
+    server:
+      enable: true
+      bindPort: 17777 #服务器端口，默认是19999
+      bindIp: 0.0.0.0 #服务器ip 默认0.0.0.0
+      bossThreadNum: 1 #netty boss线程数 默认为1
+      workThreadNum: 4 #netty work线程数，默认为4
+
+spring:
+  redis:
+    host: 116.63.177.9
+    password: Iwb2023
+    port: 12079
+    database: 3
+    lettuce:
+      pool:
+        maxActive: 8
+        maxWait: -1
+        maxIdle: 8
+        minIdle: 0

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

@@ -0,0 +1,21 @@
+vbdsm:
+  socket:
+    server:
+      enable: true
+      bindPort: 7777 #服务器端口，默认是19999
+      bindIp: 0.0.0.0 #服务器ip 默认0.0.0.0
+      bossThreadNum: 1 #netty boss线程数 默认为1
+      workThreadNum: 4 #netty work线程数，默认为4
+
+spring:
+  redis:
+    host: 192.168.0.104
+    password: Iwb-2017
+    port: 6379
+    database: 3
+    lettuce:
+      pool:
+        maxActive: 8
+        maxWait: -1
+        maxIdle: 8
+        minIdle: 0

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

@@ -1,21 +1,3 @@
-vbdsm:
-  socket:
-    server:
-      enable: true
-      bindPort: 7777 #服务器端口，默认是19999
-      bindIp: 0.0.0.0 #服务器ip 默认0.0.0.0
-      bossThreadNum: 1 #netty boss线程数 默认为1
-      workThreadNum: 4 #netty work线程数，默认为4
-
 spring:
-  redis:
-    host: 192.168.0.104
-    password: Iwb-2017
-    port: 6379
-    database: 3
-    lettuce:
-      pool:
-        maxActive: 8
-        maxWait: -1
-        maxIdle: 8
-        minIdle: 0
+  profiles:
+    active: @profiles.active@

VB_DSM_V2.1/vbdsm-job/xxl-job-admin/pom.xml

@@ -74,7 +74,6 @@
         </dependency>
 
     </dependencies>
-
     <build>
         <plugins>
             <plugin>

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

@@ -0,0 +1,54 @@
+### web
+server.port=7200
+server.servlet.context-path=/
+### actuator
+management.server.servlet.context-path=/actuator
+management.health.mail.enabled=false
+### resources
+spring.mvc.servlet.load-on-startup=0
+spring.mvc.static-path-pattern=/static/**
+spring.resources.static-locations=classpath:/static/
+### freemarker
+spring.freemarker.templateLoaderPath=classpath:/templates/
+spring.freemarker.suffix=.ftl
+spring.freemarker.charset=UTF-8
+spring.freemarker.request-context-attribute=request
+spring.freemarker.settings.number_format=0.##########
+### mybatis
+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.username=root
+spring.datasource.password=123456
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+### datasource-pool
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=30
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=HikariCP
+spring.datasource.hikari.max-lifetime=900000
+spring.datasource.hikari.connection-timeout=10000
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.validation-timeout=1000
+### xxl-job, email
+spring.mail.host=smtp.qq.com
+spring.mail.port=25
+spring.mail.username=xxx@qq.com
+spring.mail.from=xxx@qq.com
+spring.mail.password=xxx
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+### xxl-job, access token
+xxl.job.accessToken=vbdsm-job-2023
+### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")
+xxl.job.i18n=zh_CN
+## xxl-job, triggerpool max size
+xxl.job.triggerpool.fast.max=200
+xxl.job.triggerpool.slow.max=100
+### xxl-job, log retention days
+xxl.job.logretentiondays=30

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

@@ -0,0 +1,54 @@
+### web
+server.port=17200
+server.servlet.context-path=/
+### actuator
+management.server.servlet.context-path=/actuator
+management.health.mail.enabled=false
+### resources
+spring.mvc.servlet.load-on-startup=0
+spring.mvc.static-path-pattern=/static/**
+spring.resources.static-locations=classpath:/static/
+### freemarker
+spring.freemarker.templateLoaderPath=classpath:/templates/
+spring.freemarker.suffix=.ftl
+spring.freemarker.charset=UTF-8
+spring.freemarker.request-context-attribute=request
+spring.freemarker.settings.number_format=0.##########
+### mybatis
+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://116.63.177.9:12006/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=Iwb2023
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+### datasource-pool
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=30
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=HikariCP
+spring.datasource.hikari.max-lifetime=900000
+spring.datasource.hikari.connection-timeout=10000
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.validation-timeout=1000
+### xxl-job, email
+spring.mail.host=smtp.qq.com
+spring.mail.port=25
+spring.mail.username=xxx@qq.com
+spring.mail.from=xxx@qq.com
+spring.mail.password=xxx
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+### xxl-job, access token
+xxl.job.accessToken=vbdsm-job-2023
+### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")
+xxl.job.i18n=zh_CN
+## xxl-job, triggerpool max size
+xxl.job.triggerpool.fast.max=200
+xxl.job.triggerpool.slow.max=100
+### xxl-job, log retention days
+xxl.job.logretentiondays=30

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

@@ -0,0 +1,54 @@
+### web
+server.port=7200
+server.servlet.context-path=/
+### actuator
+management.server.servlet.context-path=/actuator
+management.health.mail.enabled=false
+### resources
+spring.mvc.servlet.load-on-startup=0
+spring.mvc.static-path-pattern=/static/**
+spring.resources.static-locations=classpath:/static/
+### freemarker
+spring.freemarker.templateLoaderPath=classpath:/templates/
+spring.freemarker.suffix=.ftl
+spring.freemarker.charset=UTF-8
+spring.freemarker.request-context-attribute=request
+spring.freemarker.settings.number_format=0.##########
+### mybatis
+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.username=root
+spring.datasource.password=123456
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+### datasource-pool
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=30
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=HikariCP
+spring.datasource.hikari.max-lifetime=900000
+spring.datasource.hikari.connection-timeout=10000
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.validation-timeout=1000
+### xxl-job, email
+spring.mail.host=smtp.qq.com
+spring.mail.port=25
+spring.mail.username=xxx@qq.com
+spring.mail.from=xxx@qq.com
+spring.mail.password=xxx
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+### xxl-job, access token
+xxl.job.accessToken=vbdsm-job-2023
+### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")
+xxl.job.i18n=zh_CN
+## xxl-job, triggerpool max size
+xxl.job.triggerpool.fast.max=200
+xxl.job.triggerpool.slow.max=100
+### xxl-job, log retention days
+xxl.job.logretentiondays=30

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

@@ -1,54 +1 @@
-### web
-server.port=7200
-server.servlet.context-path=/
-### actuator
-management.server.servlet.context-path=/actuator
-management.health.mail.enabled=false
-### resources
-spring.mvc.servlet.load-on-startup=0
-spring.mvc.static-path-pattern=/static/**
-spring.resources.static-locations=classpath:/static/
-### freemarker
-spring.freemarker.templateLoaderPath=classpath:/templates/
-spring.freemarker.suffix=.ftl
-spring.freemarker.charset=UTF-8
-spring.freemarker.request-context-attribute=request
-spring.freemarker.settings.number_format=0.##########
-### mybatis
-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.username=root
-spring.datasource.password=123456
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-### datasource-pool
-spring.datasource.type=com.zaxxer.hikari.HikariDataSource
-spring.datasource.hikari.minimum-idle=10
-spring.datasource.hikari.maximum-pool-size=30
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=30000
-spring.datasource.hikari.pool-name=HikariCP
-spring.datasource.hikari.max-lifetime=900000
-spring.datasource.hikari.connection-timeout=10000
-spring.datasource.hikari.connection-test-query=SELECT 1
-spring.datasource.hikari.validation-timeout=1000
-### xxl-job, email
-spring.mail.host=smtp.qq.com
-spring.mail.port=25
-spring.mail.username=xxx@qq.com
-spring.mail.from=xxx@qq.com
-spring.mail.password=xxx
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
-spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-### xxl-job, access token
-xxl.job.accessToken=vbdsm-job-2023
-### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")
-xxl.job.i18n=zh_CN
-## xxl-job, triggerpool max size
-xxl.job.triggerpool.fast.max=200
-xxl.job.triggerpool.slow.max=100
-### xxl-job, log retention days
-xxl.job.logretentiondays=30
+spring.profiles.active=prod

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/pom.xml

@@ -43,7 +43,36 @@
         </dependency>
 
     </dependencies>
+    <profiles>
+        <profile>
+            <id>local</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>test</profiles.active>
+            </properties>
 
+        </profile>
+        <profile>
+            <id>product</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>prod</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
     <build>
         <finalName>ROOT</finalName>
         <resources>

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

@@ -41,12 +41,6 @@
         <property name="password" value="${curr.mysql.jdbc.password}"/>
     </bean>
 
-    <bean id="dataSource_error" parent="datasourcePool">
-        <property name="driverClassName" value="${error.mysql.jdbc.driverClassName}"/>
-        <property name="url" value="${error.mysql.jdbc.url}"/>
-        <property name="username" value="${error.mysql.jdbc.username}"/>
-        <property name="password" value="${error.mysql.jdbc.password}"/>
-    </bean>
 
     <bean id="dataSource_gov" parent="datasourcePool">
         <property name="driverClassName" value="${gov.mysql.jdbc.driverClassName}"/>
@@ -70,17 +64,23 @@
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
 
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
 
     <bean id="dynamicDataSource" class="cn.vbdsm.core.dao.datasource.DynamicDataSource">
         <property name="dataSourceEntry" ref="dynamicDataSourceEntry"></property>
         <property name="targetDataSources">
             <map>
                 <entry key="curr" value-ref="dataSource_curr"></entry>
-                <entry key="error" value-ref="dataSource_error"></entry>
                 <entry key="gov" value-ref="dataSource_gov"></entry>
                 <entry key="sysbase" value-ref="dataSource_sysbase"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="dataSource_curr"/>

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

@@ -1,27 +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://116.63.177.9:12006/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=Iwb2023
 #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://116.63.177.9:12006/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=Iwb2023
 #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://116.63.177.9:12006/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=Iwb2023
 #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://116.63.177.9:12006/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=Iwb2023
 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://116.63.177.9:12006/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=Iwb2023
+db2025.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
+db2025.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2025.mysql.jdbc.username=root
+db2025.mysql.jdbc.password=Iwb2023
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -64,7 +64,12 @@
         <property name="username" value="${db2024.mysql.jdbc.username}"/>
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
-
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
     <bean id="dynamicDataSource" class="cn.vbdsm.core.dao.datasource.DynamicDataSource">
         <property name="dataSourceEntry" ref="dynamicDataSourceEntry"></property>
         <property name="targetDataSources">
@@ -74,6 +79,7 @@
                 <entry key="sysbase" value-ref="dataSource_sysbase"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="dataSource_curr"/>

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

@@ -30,6 +30,10 @@ 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
+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
 #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

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

@@ -1,14 +1,14 @@
 server:
-  port: 7210
+  port: 17210
 tg:
   db:
     sharding:
       path: config/sharding-prod.yml
 spring:
   redis:
-    host: vbdsm-redis 2
-    #    password: Abcd1234!.com
-    port: 6379
+    host: 116.63.177.9
+    password: Iwb2023
+    port: 12079
     database: 3
     pool:
       maxActive: 8
@@ -18,11 +18,11 @@ spring:
 xxl:
   job:
     admin:
-      addresses: http://127.0.0.1:7200/
+      addresses: http://127.0.0.1:17200/
     executor:
       appname: vbdsm-statistic
       ip:
-      port: 7211
+      port: 17211
       logpath: logs
       logretentiondays: -1
     accessToken: vbdsm-job-2023

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

@@ -40,6 +40,20 @@ dataSources:
     testWhileIdle: true
     poolPreparedStatements: true
     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
+    username: root
+    password: 123456
+    filters: stat
+    maxActive: 30
+    initialSize: 5
+    minIdle: 10
+    maxWait: 60000
+    validationQuery: SELECT 1
+    testWhileIdle: true
+    poolPreparedStatements: true
+    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

VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/src/main/resources/config/sharding-prod.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://116.63.177.9:12006/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     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://116.63.177.9:12006/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -28,9 +28,23 @@ 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://116.63.177.9:12006/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
+    filters: stat
+    maxActive: 30
+    initialSize: 5
+    minIdle: 10
+    maxWait: 60000
+    validationQuery: SELECT 1
+    testWhileIdle: true
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 100
+  vbdsm_2025: !!com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://116.63.177.9:12006/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    username: root
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -42,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://116.63.177.9:12006/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -56,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://116.63.177.9:12006/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -71,7 +85,7 @@ dataSources:
 shardingRule:
   tables:
     online_data_water:
-      actualDataNodes: vbdsm_${2023..2024}.online_data_water_0${1..9},vbdsm_${2023..2024}.online_data_water_${10..12}
+      actualDataNodes: vbdsm_${2023..2025}.online_data_water_0${1..9},vbdsm_${2023..2025}.online_data_water_${10..12}
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -83,7 +97,7 @@ shardingRule:
           preciseAlgorithmClassName: cn.vbdsm.statistic.db.sharding.PreciseTableShardingAlgorithm
           rangeAlgorithmClassName: cn.vbdsm.statistic.db.sharding.RangeTableShardingAlgorithm
     t_online_warn:
-      actualDataNodes: vbdsm_${2023..2024}.t_online_warn
+      actualDataNodes: vbdsm_${2023..2025}.t_online_warn
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -92,7 +106,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_output_date:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_output_date
+      actualDataNodes: vbdsm_${2023..2025}.analysis_output_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -101,7 +115,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_output_month:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_output_month
+      actualDataNodes: vbdsm_${2023..2025}.analysis_output_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -110,7 +124,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_yield_date:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_yield_date
+      actualDataNodes: vbdsm_${2023..2025}.analysis_yield_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -119,7 +133,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_yield_month:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_yield_month
+      actualDataNodes: vbdsm_${2023..2025}.analysis_yield_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -128,7 +142,7 @@ shardingRule:
       tableStrategy:
         none:
     company_output_date:
-      actualDataNodes: vbdsm_${2023..2024}.company_output_date
+      actualDataNodes: vbdsm_${2023..2025}.company_output_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -137,7 +151,7 @@ shardingRule:
       tableStrategy:
         none:
     company_output_month:
-      actualDataNodes: vbdsm_${2023..2024}.company_output_month
+      actualDataNodes: vbdsm_${2023..2025}.company_output_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -146,7 +160,7 @@ shardingRule:
       tableStrategy:
         none:
     company_yield_date:
-      actualDataNodes: vbdsm_${2023..2024}.company_yield_date
+      actualDataNodes: vbdsm_${2023..2025}.company_yield_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -155,7 +169,7 @@ shardingRule:
       tableStrategy:
         none:
     company_yield_month:
-      actualDataNodes: vbdsm_${2023..2024}.company_yield_month
+      actualDataNodes: vbdsm_${2023..2025}.company_yield_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -164,7 +178,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_output_date:
-      actualDataNodes: vbdsm_${2023..2024}.parks_output_date
+      actualDataNodes: vbdsm_${2023..2025}.parks_output_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -173,7 +187,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_output_month:
-      actualDataNodes: vbdsm_${2023..2024}.parks_output_month
+      actualDataNodes: vbdsm_${2023..2025}.parks_output_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -182,7 +196,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_yield_date:
-      actualDataNodes: vbdsm_${2023..2024}.parks_yield_date
+      actualDataNodes: vbdsm_${2023..2025}.parks_yield_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -191,7 +205,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_yield_month:
-      actualDataNodes: vbdsm_${2023..2024}.parks_yield_month
+      actualDataNodes: vbdsm_${2023..2025}.parks_yield_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -272,7 +286,7 @@ shardingRule:
       tableStrategy:
         none:
     t_anal_date_avg:
-      actualDataNodes: vbdsm_${2023..2024}.t_anal_date_avg
+      actualDataNodes: vbdsm_${2023..2025}.t_anal_date_avg
       databaseStrategy:
         standard:
           shardingColumn: getDate
@@ -281,7 +295,7 @@ shardingRule:
       tableStrategy:
         none:
     t_online_data_power:
-      actualDataNodes: vbdsm_${2023..2024}.t_online_data_power_0${1..9},vbdsm_${2023..2024}.t_online_data_power_${10..12}
+      actualDataNodes: vbdsm_${2023..2025}.t_online_data_power_0${1..9},vbdsm_${2023..2025}.t_online_data_power_${10..12}
       databaseStrategy:
         standard:
           shardingColumn: getTime

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

@@ -40,6 +40,20 @@ dataSources:
     testWhileIdle: true
     poolPreparedStatements: true
     maxOpenPreparedStatements: 100
+  vbdsm_2025: !!com.alibaba.druid.pool.DruidDataSource
+    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
+    filters: stat
+    maxActive: 30
+    initialSize: 5
+    minIdle: 10
+    maxWait: 60000
+    validationQuery: SELECT 1
+    testWhileIdle: true
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false

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

@@ -1 +1 @@
-redis_ref_hosts=127.0.0.1:6379:Iwb-2017
+redis_ref_hosts=116.63.177.9:12079:Iwb2023

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

@@ -1,12 +1,12 @@
 #sysbase database mysql config
 netdisk.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-netdisk.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_netdisk?serverTimezone=UTC&useSSL=false
+netdisk.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm_netdisk?serverTimezone=UTC&useSSL=false
 netdisk.mysql.jdbc.username=root
-netdisk.mysql.jdbc.password=123456
+netdisk.mysql.jdbc.password=Iwb2023
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_sysbase?serverTimezone=UTC&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm_sysbase?serverTimezone=UTC&useSSL=false
 sysbase.mysql.jdbc.username=root
-sysbase.mysql.jdbc.password=123456
+sysbase.mysql.jdbc.password=Iwb2023
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -1 +1 @@
-redis_ref_hosts=127.0.0.1:6379:Iwb-2017
+redis_ref_hosts=116.63.177.9:12079:Iwb2023

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

@@ -7,7 +7,7 @@
     <artifactId>vbdsm-gov-new</artifactId>
     <version>2.1.0</version>
 <!--    <packaging>jar</packaging>-->
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
 <!--    <name>${project.artifactId}</name>-->
 

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

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

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

@@ -1,5 +1,5 @@
 server:
-  port: 7085
+  port: 17085
 tg:
   db:
     sharding:
@@ -8,9 +8,9 @@ logging:
   level: cn.vbdsm=DEBUG
 spring:
   redis:
-    host: 127.0.0.1
-    password: Iwb-2017
-    port: 6379
+    host: 116.63.177.9
+    password: Iwb2023
+    port: 12079
     database: 0
     pool:
       maxActive: 8

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

@@ -27,6 +27,20 @@ dataSources:
     testWhileIdle: true
     poolPreparedStatements: true
     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
+    username: root
+    password: 123456
+    filters: stat
+    maxActive: 30
+    initialSize: 5
+    minIdle: 10
+    maxWait: 60000
+    validationQuery: SELECT 1
+    testWhileIdle: true
+    poolPreparedStatements: true
+    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

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

@@ -1,9 +1,9 @@
 dataSources:
   vbdsm_2023: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://116.63.177.9:12006/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -15,9 +15,23 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_2024: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://116.63.177.9:12006/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
+    filters: stat
+    maxActive: 30
+    initialSize: 5
+    minIdle: 10
+    maxWait: 60000
+    validationQuery: SELECT 1
+    testWhileIdle: true
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 100
+  vbdsm_2025: !!com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://116.63.177.9:12006/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    username: root
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -29,9 +43,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://116.63.177.9:12006/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -43,9 +57,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm_powergov: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://116.63.177.9:12006/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -57,9 +71,9 @@ dataSources:
     maxOpenPreparedStatements: 100
   vbdsm: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://116.63.177.9:12006/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123456
+    password: Iwb2023
     filters: stat
     maxActive: 30
     initialSize: 5
@@ -71,7 +85,7 @@ dataSources:
 shardingRule:
   tables:
     t_online_warn:
-      actualDataNodes: vbdsm_${2023..2024}.t_online_warn
+      actualDataNodes: vbdsm_${2023..2025}.t_online_warn
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -154,7 +168,7 @@ shardingRule:
       tableStrategy:
         none:
     t_online_data_power:
-      actualDataNodes: vbdsm_${2023..2024}.t_online_data_power_0${1..9},vbdsm_${2023..2024}.t_online_data_power_${10..12}
+      actualDataNodes: vbdsm_${2023..2025}.t_online_data_power_0${1..9},vbdsm_${2023..2025}.t_online_data_power_${10..12}
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -166,7 +180,7 @@ shardingRule:
           preciseAlgorithmClassName: cn.vbdsm.db.sharding.PreciseTableShardingAlgorithm
           rangeAlgorithmClassName: cn.vbdsm.db.sharding.RangeTableShardingAlgorithm
     online_data_water:
-      actualDataNodes: vbdsm_${2023..2024}.online_data_water_0${1..9},vbdsm_${2023..2024}.online_data_water_${10..12}
+      actualDataNodes: vbdsm_${2023..2025}.online_data_water_0${1..9},vbdsm_${2023..2025}.online_data_water_${10..12}
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -202,7 +216,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_output_date:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_output_date
+      actualDataNodes: vbdsm_${2023..2025}.analysis_output_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -211,7 +225,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_output_month:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_output_month
+      actualDataNodes: vbdsm_${2023..2025}.analysis_output_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -220,7 +234,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_yield_date:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_yield_date
+      actualDataNodes: vbdsm_${2023..2025}.analysis_yield_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -229,7 +243,7 @@ shardingRule:
       tableStrategy:
         none:
     analysis_yield_month:
-      actualDataNodes: vbdsm_${2023..2024}.analysis_yield_month
+      actualDataNodes: vbdsm_${2023..2025}.analysis_yield_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -238,7 +252,7 @@ shardingRule:
       tableStrategy:
         none:
     company_output_date:
-      actualDataNodes: vbdsm_${2023..2024}.company_output_date
+      actualDataNodes: vbdsm_${2023..2025}.company_output_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -247,7 +261,7 @@ shardingRule:
       tableStrategy:
         none:
     company_output_month:
-      actualDataNodes: vbdsm_${2023..2024}.company_output_month
+      actualDataNodes: vbdsm_${2023..2025}.company_output_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -256,7 +270,7 @@ shardingRule:
       tableStrategy:
         none:
     company_yield_date:
-      actualDataNodes: vbdsm_${2023..2024}.company_yield_date
+      actualDataNodes: vbdsm_${2023..2025}.company_yield_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -265,7 +279,7 @@ shardingRule:
       tableStrategy:
         none:
     company_yield_month:
-      actualDataNodes: vbdsm_${2023..2024}.company_yield_month
+      actualDataNodes: vbdsm_${2023..2025}.company_yield_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -274,7 +288,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_output_date:
-      actualDataNodes: vbdsm_${2023..2024}.parks_output_date
+      actualDataNodes: vbdsm_${2023..2025}.parks_output_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -283,7 +297,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_output_month:
-      actualDataNodes: vbdsm_${2023..2024}.parks_output_month
+      actualDataNodes: vbdsm_${2023..2025}.parks_output_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -292,7 +306,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_yield_date:
-      actualDataNodes: vbdsm_${2023..2024}.parks_yield_date
+      actualDataNodes: vbdsm_${2023..2025}.parks_yield_date
       databaseStrategy:
         standard:
           shardingColumn: upload_date
@@ -301,7 +315,7 @@ shardingRule:
       tableStrategy:
         none:
     parks_yield_month:
-      actualDataNodes: vbdsm_${2023..2024}.parks_yield_month
+      actualDataNodes: vbdsm_${2023..2025}.parks_yield_month
       databaseStrategy:
         standard:
           shardingColumn: upload_date

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

@@ -27,6 +27,20 @@ dataSources:
     testWhileIdle: true
     poolPreparedStatements: true
     maxOpenPreparedStatements: 100
+  vbdsm_2025: !!com.alibaba.druid.pool.DruidDataSource
+    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
+    filters: stat
+    maxActive: 30
+    initialSize: 5
+    minIdle: 10
+    maxWait: 60000
+    validationQuery: SELECT 1
+    testWhileIdle: true
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 100
   vbdsm_sysbase: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false

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

@@ -1,16 +1,16 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 gov.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 mysql.jdbc.username=root
-mysql.jdbc.password=123456
+mysql.jdbc.password=Iwb2023
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -2,7 +2,7 @@
 #222.92.214.198:6379
 #192.168.81.17:6379
 #static.chnmooc.com:6379
-redis_ref_hosts=127.0.0.1:6379:Iwb-2017
+redis_ref_hosts=116.63.177.9:12079:Iwb2023
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

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

@@ -1,8 +1,8 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -1 +1 @@
-redis_ref_hosts=127.0.0.1:6379:Iwb-2017
+redis_ref_hosts=116.63.177.9:12079:Iwb2023

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

@@ -1,8 +1,8 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -2,7 +2,7 @@
 #222.92.214.198:6379
 #192.168.81.17:6379
 #static.chnmooc.com:6379
-redis_ref_hosts=127.0.0.1:6379:Iwb-2017
+redis_ref_hosts=116.63.177.9:12079:Iwb2023
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/resources/jjrh/application-db.xml

@@ -48,7 +48,12 @@
         <property name="username" value="${db2024.mysql.jdbc.username}"/>
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
-
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
     <bean id="dataSource_2023" parent="datasourcePool">
         <property name="driverClassName" value="${db2023.mysql.jdbc.driverClassName}"/>
         <property name="url" value="${db2023.mysql.jdbc.url}"/>
@@ -72,6 +77,7 @@
                 <entry key="gov" value-ref="govDataSource"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="currDataSource"/>

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

@@ -48,7 +48,12 @@
         <property name="username" value="${db2024.mysql.jdbc.username}"/>
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
-
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
     <bean id="sysbaseDataSource" parent="datasourcePool">
         <property name="driverClassName" value="${sysbase.mysql.jdbc.driverClassName}"/>
         <property name="url" value="${sysbase.mysql.jdbc.url}"/>
@@ -72,6 +77,7 @@
                 <entry key="gov" value-ref="govDataSource"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="currDataSource"/>

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

@@ -22,6 +22,10 @@ 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.username=root
 db2024.mysql.jdbc.password=123456
+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.username=root
+db2025.mysql.jdbc.password=123456
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -48,7 +48,12 @@
         <property name="username" value="${db2024.mysql.jdbc.username}"/>
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
-
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
 
     <bean id="sysbaseDataSource" parent="datasourcePool">
         <property name="driverClassName" value="${sysbase.mysql.jdbc.driverClassName}"/>
@@ -73,6 +78,7 @@
                 <entry key="gov" value-ref="govDataSource"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="currDataSource"/>

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

@@ -1,27 +1,31 @@
 #sysbase database mysql config
 sysbase.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-sysbase.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_sysbase?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+sysbase.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 #powergov database mysql config
 gov.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-gov.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_powergov?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+gov.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 #curr database mysql config
 mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 mysql.jdbc.username=root
-mysql.jdbc.password=123456
+mysql.jdbc.password=Iwb2023
 #business database config
 db2023.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2023.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2023.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
 db2024.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
-db2024.mysql.jdbc.url=jdbc:mysql://127.0.0.1:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2024.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/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=Iwb2023
+db2025.mysql.jdbc.driverClassName=com.mysql.jdbc.Driver
+db2025.mysql.jdbc.url=jdbc:mysql://116.63.177.9:12006/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+db2025.mysql.jdbc.username=root
+db2025.mysql.jdbc.password=Iwb2023
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1

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

@@ -2,7 +2,7 @@
 #222.92.214.198:6379
 #192.168.81.17:6379
 #static.chnmooc.com:6379
-redis_ref_hosts=127.0.0.1:6379:Iwb-2017
+redis_ref_hosts=116.63.177.9:12079:Iwb2023
 #redis.host=127.0.0.1
 #redis.port=6379
 #redis.expire=1800

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

@@ -47,7 +47,12 @@
         <property name="username" value="${db2024.mysql.jdbc.username}"/>
         <property name="password" value="${db2024.mysql.jdbc.password}"/>
     </bean>
-
+    <bean id="dataSource_2025" parent="datasourcePool">
+        <property name="driverClassName" value="${db2025.mysql.jdbc.driverClassName}"/>
+        <property name="url" value="${db2025.mysql.jdbc.url}"/>
+        <property name="username" value="${db2025.mysql.jdbc.username}"/>
+        <property name="password" value="${db2025.mysql.jdbc.password}"/>
+    </bean>
     <bean id="sysbaseDataSource" parent="datasourcePool">
         <property name="driverClassName" value="${sysbase.mysql.jdbc.driverClassName}"/>
         <property name="url" value="${sysbase.mysql.jdbc.url}"/>
@@ -71,6 +76,7 @@
                 <entry key="gov" value-ref="govDataSource"></entry>
                 <entry key="DB_2023" value-ref="dataSource_2023"></entry>
                 <entry key="DB_2024" value-ref="dataSource_2024"></entry>
+                <entry key="DB_2025" value-ref="dataSource_2025"></entry>
             </map>
         </property>
         <property name="defaultTargetDataSource" ref="currDataSource"/>

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

@@ -22,6 +22,10 @@ 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
+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
 #alibaba druid config
 dbPool.initialSize=1
 dbPool.minIdle=1