重构初始化sqlSessionFactory的过程

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/core/context/SqlSessionFactoryContext.java

 package cn.stylefeng.guns.dbcontainer.core.context;
 
 import cn.stylefeng.guns.dbcontainer.core.collector.SqlSessionFactoryCreator;
-import cn.stylefeng.guns.dbcontainer.core.exception.DataSourceInitException;
-import cn.stylefeng.roses.core.config.properties.DruidProperties;
-import cn.stylefeng.roses.core.util.SpringContextHolder;
 import org.apache.ibatis.session.SqlSessionFactory;
 
 import javax.sql.DataSource;
@@ -50,14 +47,6 @@ public class SqlSessionFactoryContext {
      */
     public static void initBaseSqlSessionFactory(SqlSessionFactoryCreator sqlSessionFactoryCreator) {
 
-        //初始化数据源容器
-        try {
-            DruidProperties druidProperties = SpringContextHolder.getBean(DruidProperties.class);
-            DataSourceContext.initDataSource(druidProperties);
-        } catch (Exception e) {
-            throw new DataSourceInitException(DataSourceInitException.ExEnum.INIT_DATA_SOURCE_ERROR);
-        }
-
         //获取数据库的数据源
         Map<String, DataSource> dataSources = DataSourceContext.getDataSources();
 

guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/SqlSessionFactoryConfig.java

@@ -16,8 +16,12 @@
 package cn.stylefeng.guns.config.datasource;
 
 import cn.stylefeng.guns.dbcontainer.core.collector.SqlSessionFactoryCreator;
+import cn.stylefeng.guns.dbcontainer.core.context.DataSourceContext;
 import cn.stylefeng.guns.dbcontainer.core.context.SqlSessionFactoryContext;
+import cn.stylefeng.guns.dbcontainer.core.exception.DataSourceInitException;
+import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.mutidatasource.mybatis.OptionalSqlSessionTemplate;
+import cn.stylefeng.roses.core.util.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -60,6 +64,14 @@ public class SqlSessionFactoryConfig {
     public OptionalSqlSessionTemplate gunsSqlSessionTemplate(@Qualifier("sqlSessionFactoryPrimary") SqlSessionFactory sqlSessionFactoryPrimary,
                                                              SqlSessionFactoryCreator sqlSessionFactoryCreator) {
 
+        //初始化数据源容器
+        try {
+            DruidProperties druidProperties = SpringContextHolder.getBean(DruidProperties.class);
+            DataSourceContext.initDataSource(druidProperties);
+        } catch (Exception e) {
+            throw new DataSourceInitException(DataSourceInitException.ExEnum.INIT_DATA_SOURCE_ERROR);
+        }
+
         //添加主数据源的SqlSessionFactory
         SqlSessionFactoryContext.addSqlSessionFactory(MASTER_DATASOURCE_NAME, sqlSessionFactoryPrimary);