From b8041e59c32aeef897242e94414c45ef4c618ce1 Mon Sep 17 00:00:00 2001
From: lsy <18332763730@163.com>
Date: Thu, 12 Oct 2017 15:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fast/common/config/DynamicDataSourceConfig.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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<Object,Object> dataSourceMap = new HashMap<>();
+    //填入主数据源
     dataSourceMap.put("master",masterDataSource);
+    //如果从数据源存在，填入从数据源
     if (slaveDataSource!=null){
       dataSourceMap.put("slave",slaveDataSource);
     }