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(); //1.注册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); }