From 8538246dd09902fd51c5f783b184ae260ebe2125 Mon Sep 17 00:00:00 2001 From: yangyang01000846 <15195822163@163.com> Date: Tue, 23 Dec 2025 00:59:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdm/approve/config/mybatis/MybatisPlusConfig.java | 3 ++- .../capability/config/mybatis/MybatisPlusConfig.java | 2 +- capability/src/main/resources/application-lyric.yml | 8 ++++---- .../com/sdm/data/config/mybatis/MybatisPlusConfig.java | 2 +- .../sdm/outbridge/config/SecondMybatisPlusConfig.java | 10 ---------- .../com/sdm/pbs/config/mybatis/MybatisPlusConfig.java | 2 +- .../performance/config/mybatis/MybatisPlusConfig.java | 2 +- .../sdm/project/config/mybatis/MybatisPlusConfig.java | 2 +- .../sdm/system/config/mybatis/MybatisPlusConfig.java | 3 ++- system/src/main/resources/application-lyric.yml | 2 +- .../com/sdm/task/config/mybatis/MybatisPlusConfig.java | 2 +- 11 files changed, 15 insertions(+), 23 deletions(-) diff --git a/approve/src/main/java/com/sdm/approve/config/mybatis/MybatisPlusConfig.java b/approve/src/main/java/com/sdm/approve/config/mybatis/MybatisPlusConfig.java index a1a33401..b6fa5b2c 100644 --- a/approve/src/main/java/com/sdm/approve/config/mybatis/MybatisPlusConfig.java +++ b/approve/src/main/java/com/sdm/approve/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,8 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; +// dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; } diff --git a/capability/src/main/java/com/sdm/capability/config/mybatis/MybatisPlusConfig.java b/capability/src/main/java/com/sdm/capability/config/mybatis/MybatisPlusConfig.java index a5ea4dfc..1d3e5b40 100644 --- a/capability/src/main/java/com/sdm/capability/config/mybatis/MybatisPlusConfig.java +++ b/capability/src/main/java/com/sdm/capability/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,7 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; } diff --git a/capability/src/main/resources/application-lyric.yml b/capability/src/main/resources/application-lyric.yml index 1ef4cf07..ee06b0d5 100644 --- a/capability/src/main/resources/application-lyric.yml +++ b/capability/src/main/resources/application-lyric.yml @@ -10,10 +10,10 @@ spring: jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: - maximum-pool-size: 450 # 连接池最大连接数（关键！） - minimum-idle: 50 # 最小空闲连接数（与最大一致，避免频繁创建销毁） - idle-timeout: 300000 # 空闲连接超时时间（5分钟） - max-lifetime: 600000 # 连接最大存活时间（10分钟） + maximum-pool-size: 20 # 连接池最大连接数（关键！） + minimum-idle: 5 # 最小空闲连接数（与最大一致，避免频繁创建销毁） + idle-timeout: 600000 # 空闲连接超时时间（5分钟） + max-lifetime: 1800000 # 连接最大存活时间（10分钟） connection-timeout: 30000 # 获取连接超时时间（30秒，避免线程阻塞） master: username: root diff --git a/data/src/main/java/com/sdm/data/config/mybatis/MybatisPlusConfig.java b/data/src/main/java/com/sdm/data/config/mybatis/MybatisPlusConfig.java index c14d3ef0..ffa5c1b8 100644 --- a/data/src/main/java/com/sdm/data/config/mybatis/MybatisPlusConfig.java +++ b/data/src/main/java/com/sdm/data/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,7 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; } diff --git a/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java b/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java index 25fb93be..9e3c42da 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java +++ b/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java @@ -36,16 +36,6 @@ public class SecondMybatisPlusConfig { return DataSourceBuilder.create().build(); } - /** - * 第二个数据源的事务管理器 - * 非Primary，因为原有动态数据源已标记为Primary - */ - @Bean(name = "secondTransactionManager") - public DataSourceTransactionManager secondTransactionManager( - @Qualifier("secondDataSource") DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } - /** * 第二个数据源的SqlSessionFactory */ diff --git a/pbs/src/main/java/com/sdm/pbs/config/mybatis/MybatisPlusConfig.java b/pbs/src/main/java/com/sdm/pbs/config/mybatis/MybatisPlusConfig.java index 26e804fb..8e51bcd4 100644 --- a/pbs/src/main/java/com/sdm/pbs/config/mybatis/MybatisPlusConfig.java +++ b/pbs/src/main/java/com/sdm/pbs/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,7 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; } diff --git a/performance/src/main/java/com/sdm/performance/config/mybatis/MybatisPlusConfig.java b/performance/src/main/java/com/sdm/performance/config/mybatis/MybatisPlusConfig.java index a02e98f4..c1de7440 100644 --- a/performance/src/main/java/com/sdm/performance/config/mybatis/MybatisPlusConfig.java +++ b/performance/src/main/java/com/sdm/performance/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,7 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; } diff --git a/project/src/main/java/com/sdm/project/config/mybatis/MybatisPlusConfig.java b/project/src/main/java/com/sdm/project/config/mybatis/MybatisPlusConfig.java index 5bf7b029..18490cec 100644 --- a/project/src/main/java/com/sdm/project/config/mybatis/MybatisPlusConfig.java +++ b/project/src/main/java/com/sdm/project/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,7 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; } diff --git a/system/src/main/java/com/sdm/system/config/mybatis/MybatisPlusConfig.java b/system/src/main/java/com/sdm/system/config/mybatis/MybatisPlusConfig.java index dd50fa0c..6c453af3 100644 --- a/system/src/main/java/com/sdm/system/config/mybatis/MybatisPlusConfig.java +++ b/system/src/main/java/com/sdm/system/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,8 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; +// dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; } diff --git a/system/src/main/resources/application-lyric.yml b/system/src/main/resources/application-lyric.yml index 55c7db5f..f8fe564d 100644 --- a/system/src/main/resources/application-lyric.yml +++ b/system/src/main/resources/application-lyric.yml @@ -43,7 +43,7 @@ spring: # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 database: 0 # redis服务器地址（填写自己的服务器地址） - host: 92.168.30.147 + host: 192.168.30.147 # redis端口（默认6379） port: 6379 #redis连接超时等待,10秒 diff --git a/task/src/main/java/com/sdm/task/config/mybatis/MybatisPlusConfig.java b/task/src/main/java/com/sdm/task/config/mybatis/MybatisPlusConfig.java index e76b7105..830dc10d 100644 --- a/task/src/main/java/com/sdm/task/config/mybatis/MybatisPlusConfig.java +++ b/task/src/main/java/com/sdm/task/config/mybatis/MybatisPlusConfig.java @@ -73,7 +73,7 @@ public class MybatisPlusConfig { DynamicDataSource dataSource = new DynamicDataSource(); dataSource.setTargetDataSources(targetDataSources);// 该方法是AbstractRoutingDataSource的方法 - dataSource.setDefaultTargetDataSource(slave);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; + dataSource.setDefaultTargetDataSource(master);// 默认的datasource设置为myTestDbDataSourcereturn dataSource; return dataSource; }