mirror of
https://gitee.com/mybatis-flex/mybatis-flex.git
synced 2025-12-08 01:28:24 +08:00
fix: #I930JB transactionManager作为缺省bean,允许用户自定义
This commit is contained in:
parent
797a3656b7
commit
accd432ac3
@ -20,11 +20,13 @@ import com.mybatisflex.spring.FlexTransactionManager;
|
|||||||
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
|
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
|
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.lang.NonNull;
|
import org.springframework.lang.NonNull;
|
||||||
import org.springframework.transaction.PlatformTransactionManager;
|
import org.springframework.transaction.PlatformTransactionManager;
|
||||||
|
import org.springframework.transaction.TransactionManager;
|
||||||
import org.springframework.transaction.annotation.TransactionManagementConfigurer;
|
import org.springframework.transaction.annotation.TransactionManagementConfigurer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,6 +35,7 @@ import org.springframework.transaction.annotation.TransactionManagementConfigure
|
|||||||
* @author michael
|
* @author michael
|
||||||
*/
|
*/
|
||||||
@ConditionalOnClass(Db.class)
|
@ConditionalOnClass(Db.class)
|
||||||
|
@ConditionalOnMissingBean(TransactionManager.class)
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
@AutoConfigureAfter({MybatisFlexAutoConfiguration.class})
|
@AutoConfigureAfter({MybatisFlexAutoConfiguration.class})
|
||||||
@AutoConfigureBefore({TransactionAutoConfiguration.class})
|
@AutoConfigureBefore({TransactionAutoConfiguration.class})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user