diff --git a/play-admin/src/main/java/com/starry/admin/common/conf/DataSourceConfig.java b/play-admin/src/main/java/com/starry/admin/common/conf/DataSourceConfig.java deleted file mode 100644 index 8b59276..0000000 --- a/play-admin/src/main/java/com/starry/admin/common/conf/DataSourceConfig.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.starry.admin.common.conf; - -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; -import javax.sql.DataSource; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - -@Configuration -public class DataSourceConfig { - - // For flyway only - @Bean(name = "primaryDataSource") - @Primary - public DataSource dataSource() { - return DruidDataSourceBuilder.create().build(); - } - -} diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java index b5cd0fd..1ff0065 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java @@ -10,9 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerIntercept import com.starry.admin.common.mybatis.handler.MyTenantLineHandler; import javax.sql.DataSource; import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.flyway.FlywayDataSource; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -30,6 +32,8 @@ public class MybatisPlusConfig { * @return dataSource */ @Bean(name = "dataSource") + @Primary + @FlywayDataSource @ConfigurationProperties(prefix = "spring.datasource.druid") public DataSource dataSource() { return DruidDataSourceBuilder.create().build();