diff --git a/common/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java b/common/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java index 63a369d..3c95596 100644 --- a/common/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java +++ b/common/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java @@ -1,14 +1,10 @@ package com.micro.fast.common.config; -import com.micro.fast.common.condition.SalveDataSourceCondition; import com.micro.fast.common.dao.DynamicDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @@ -26,11 +22,16 @@ import java.util.Map; @Configuration @AutoConfigureBefore({SqlSessionFactoryConfig.class}) public class DynamicDataSourceConfig { - + /** + * 注入主数据源 + */ @Autowired @Qualifier("masterDataSource") private DataSource masterDataSource; + /** + * 从数据源 + */ @Autowired(required = false) @Qualifier("slaveDataSource") private DataSource slaveDataSource; @@ -44,7 +45,9 @@ public class DynamicDataSourceConfig { dynamicDataSource.setDefaultTargetDataSource(masterDataSource); //配置多数据源 Map dataSourceMap = new HashMap<>(); + //填入主数据源 dataSourceMap.put("master",masterDataSource); + //如果从数据源存在,填入从数据源 if (slaveDataSource!=null){ dataSourceMap.put("slave",slaveDataSource); }