diff --git a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/ConditionalOnMybatisFlexDatasource.java b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/ConditionalOnMybatisFlexDatasource.java index fb0c0a12..e5bffd8e 100644 --- a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/ConditionalOnMybatisFlexDatasource.java +++ b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/ConditionalOnMybatisFlexDatasource.java @@ -41,7 +41,7 @@ import java.util.Iterator; @Conditional(ConditionalOnMybatisFlexDatasource.OnMybatisFlexDataSourceCondition.class) public @interface ConditionalOnMybatisFlexDatasource { - @Order(Ordered.HIGHEST_PRECEDENCE + 40) + @Order(Ordered.HIGHEST_PRECEDENCE) class OnMybatisFlexDataSourceCondition extends SpringBootCondition { @Override 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 ee8b331e..f9497221 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 @@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.TransactionManagementConfigure @ConditionalOnClass(Db.class) @ConditionalOnMissingBean(TransactionManager.class) @Configuration(proxyBeanMethods = false) -@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE) +@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) @AutoConfigureAfter({MybatisFlexAutoConfiguration.class}) @AutoConfigureBefore(value = {TransactionAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class}) public class FlexTransactionAutoConfiguration implements TransactionManagementConfigurer {