diff --git a/mybatis-flex-loveqq-starter/pom.xml b/mybatis-flex-loveqq-starter/pom.xml index 962104e8..e767cbce 100644 --- a/mybatis-flex-loveqq-starter/pom.xml +++ b/mybatis-flex-loveqq-starter/pom.xml @@ -6,7 +6,7 @@ com.mybatis-flex parent - 1.10.8 + 1.10.9 mybatis-flex-loveqq-starter diff --git a/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/FlexSqlSessionFactoryBean.java b/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/FlexSqlSessionFactoryBean.java index 765368f2..6e2e59c5 100644 --- a/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/FlexSqlSessionFactoryBean.java +++ b/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/FlexSqlSessionFactoryBean.java @@ -80,7 +80,7 @@ public class FlexSqlSessionFactoryBean extends SqlSessionFactoryBean { } @Override - protected void buildMapperLocations() { + protected void buildMapperLocations(Configuration configuration) { // mybatis-flex 要延迟加载 } @@ -92,7 +92,7 @@ public class FlexSqlSessionFactoryBean extends SqlSessionFactoryBean { @Override protected SqlSessionFactory build(Configuration configuration) { SqlSessionFactory sqlSessionFactory = new FlexSqlSessionFactoryBuilder().build(configuration); - super.buildMapperLocations(); + super.buildMapperLocations(configuration); return sqlSessionFactory; } } diff --git a/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/MybatisFlexAutoConfiguration.java b/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/MybatisFlexAutoConfiguration.java index e465ee34..f678d7e6 100644 --- a/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/MybatisFlexAutoConfiguration.java +++ b/mybatis-flex-loveqq-starter/src/main/java/com/mybatisflex/loveqq/framework/boot/autoconfig/MybatisFlexAutoConfiguration.java @@ -189,6 +189,7 @@ public class MybatisFlexAutoConfiguration implements InitializingBean { * @param dataSource 数据源 * @return 事务管理器 */ + @ConditionalOnMybatisFlexDatasource @Bean(resolveNested = false, independent = true) public PlatformTransactionManager flexDataSourceTransactionManager(DataSource dataSource) { return new FlexTransactionManager(); diff --git a/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml b/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml index 35cde995..5334a5a3 100644 --- a/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml @@ -6,7 +6,7 @@ mybatis-flex-test com.mybatis-flex - 1.10.8 + 1.10.9 mybatis-flex-loveqq-test