admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-06 16:48:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed: 修复在使用事务的情况下，无法切换数据源的问题 close #I70QWU

Browse Source
This commit is contained in:
开源海哥 2023-05-09 11:35:10 +08:00
parent 78ef98b35a
commit a32e04c831
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSqlSessionFactoryBean.java
View File

@ -35,6 +35,7 @@ import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
import org.apache.ibatis.type.TypeHandler;
import org.mybatis.logging.Logger;
import org.mybatis.logging.LoggerFactory;
@ -581,14 +582,17 @@ public class FlexSqlSessionFactoryBean extends SqlSessionFactoryBean
}
}
// 事务由 flex 管理了，无需使用 SpringManagedTransactionFactory，否则会造成在同一个事物下，无法切换数据源的问题
// fixed https://gitee.com/mybatis-flex/mybatis-flex/issues/I70QWU
targetConfiguration.setEnvironment(new Environment(this.environment,
this.transactionFactory == null ? new SpringManagedTransactionFactory() : this.transactionFactory,
// this.transactionFactory == null ? new SpringManagedTransactionFactory() : this.transactionFactory,
this.transactionFactory == null ? new JdbcTransactionFactory() : this.transactionFactory,
dataSource instanceof FlexDataSource ? dataSource : new FlexDataSource(FlexConsts.NAME, dataSource)));
// 需先构建 sqlSessionFactory，再去初始化 mapperLocations
// 因为 xmlMapperBuilder.parse() 用到 FlexGlobalConfig， FlexGlobalConfig 的初始化是在 sqlSessionFactory 的构建方法里进行的
// fixed gitee https://gitee.com/mybatis-flex/mybatis-flex/issues/I6X59V
// fixed https://gitee.com/mybatis-flex/mybatis-flex/issues/I6X59V
SqlSessionFactory sqlSessionFactory = this.sqlSessionFactoryBuilder.build(targetConfiguration);
if (this.mapperLocations != null) {