From a3edfdce57e37dfa4c746f9bc8ca49bb59fc8a44 Mon Sep 17 00:00:00 2001
From: lsy <18332763730@163.com>
Date: Tue, 10 Oct 2017 21:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E4=BB=8E=E5=8A=A8=E6=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?druid=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/micro/fast/common/config/DataSourceMasterConfig.java | 2 +-
 .../com/micro/fast/common/config/DataSourceSlaveConfig.java  | 5 +++++
 .../com/micro/fast/common/dao/DataSourceContextHolder.java   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java b/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
index ca2812a..7fc794c 100644
--- a/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
+++ b/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
@@ -54,7 +54,7 @@ public class DataSourceMasterConfig {
    * 注册druid的servlet
    * @return servletRegistrationBean
    */
-  @Bean
+  @Bean(name = "masterDruidServlet")
   public ServletRegistrationBean servletRegistrationBean() {
     ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean();
     //１.注册servlet
diff --git a/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java b/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java
index 704dad7..d4e1820 100644
--- a/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java
+++ b/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java
@@ -1,6 +1,7 @@
 package com.micro.fast.common.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
 import com.micro.fast.common.condition.SalveDataSourceCondition;
 import com.micro.fast.common.config.param.DruidSlaveParamConfig;
 import com.micro.fast.common.config.param.JdbcConnectionSlaveParamConfig;
@@ -9,12 +10,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 替换默认的数据源,使用自定义的druid数据源　从数据库
diff --git a/common/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java b/common/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java
index d1711fc..bc9560d 100644
--- a/common/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java
+++ b/common/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java
@@ -32,7 +32,7 @@ public class DataSourceContextHolder {
    * @param datasourceName 数据源的名字
    */
   public static void setDatasourceName(String datasourceName){
-    logger.debug("切换到{}数据源",datasourceName);
+    logger.info("切换到{}数据源",datasourceName);
     contextHolder.set(datasourceName);
   }