From 6fde8b613ed8ec2ff8610015b69899c492584ad2 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Sun, 3 Mar 2024 11:19:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=20SpringBoot3=20Druid?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=BA=90=E3=80=82https://gitee.com/mybati?= =?UTF-8?q?s-flex/mybatis-flex/issues/I94P5P?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/boot/MultiDataSourceAutoConfiguration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java index 62e3980a..8e68c4ed 100644 --- a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java +++ b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java @@ -39,18 +39,19 @@ import org.springframework.context.annotation.Role; import javax.sql.DataSource; import java.util.Map; - /** * MyBatis-Flex 多数据源的配置支持。 * * @author michael + * @author 王帅 */ @ConditionalOnMybatisFlexDatasource() @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(MybatisFlexProperties.class) @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class}) @AutoConfigureBefore(value = DataSourceAutoConfiguration.class - , name = "com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure") + , name = {"com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure", + "com.alibaba.druid.spring.boot3.autoconfigure.DataSourceAutoConfiguration"}) public class MultiDataSourceAutoConfiguration { @@ -58,7 +59,7 @@ public class MultiDataSourceAutoConfiguration { private final SeataConfig seataConfig; - //数据源解密器 + // 数据源解密器 protected final DataSourceDecipher dataSourceDecipher;