From accd432ac3cbbb6157bf83631ead7c8bbdd3ca03 Mon Sep 17 00:00:00 2001 From: witt Date: Thu, 22 Feb 2024 20:06:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20#I930JB=20transactionManager=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E7=BC=BA=E7=9C=81bean,=E5=85=81=E8=AE=B8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/boot/FlexTransactionAutoConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/FlexTransactionAutoConfiguration.java b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/FlexTransactionAutoConfiguration.java index 32992267..56f903d5 100644 --- a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/FlexTransactionAutoConfiguration.java +++ b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/FlexTransactionAutoConfiguration.java @@ -20,11 +20,13 @@ import com.mybatisflex.spring.FlexTransactionManager; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.lang.NonNull; import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.TransactionManager; import org.springframework.transaction.annotation.TransactionManagementConfigurer; /** @@ -33,6 +35,7 @@ import org.springframework.transaction.annotation.TransactionManagementConfigure * @author michael */ @ConditionalOnClass(Db.class) +@ConditionalOnMissingBean(TransactionManager.class) @Configuration(proxyBeanMethods = false) @AutoConfigureAfter({MybatisFlexAutoConfiguration.class}) @AutoConfigureBefore({TransactionAutoConfiguration.class})