梳理配置内容

matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/constant/DataSourceConstant.java

@@ -6,7 +6,7 @@ public interface DataSourceConstant {
     /**
      * 解密服务
      */
-    String APP_SECURITY_SERVER_HOST = "http://localhost:9080";
+    String APP_SECURITY_SERVER_HOST = "http://app-security.secoolocal.com";
     /**
      * 解密文件
      */

matrix-mybatis/matrix-mybatis-starter/src/main/java/com/secoo/mall/mybatis/config/MatrixMybatisConfiguration.java

-package com.secoo.mall.mybatis.config;
-
-import com.secoo.mall.mybatis.bean.MatrixMybatisSqlSessionFactoryBean;
-import com.secoo.mall.mybatis.spring.boot.autoconfigure.MatrixMybatisAutoConfiguration;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import javax.sql.DataSource;
-
-//@Configuration
-//@AutoConfigureAfter(MatrixMybatisAutoConfiguration.class)
-public class MatrixMybatisConfiguration {
-/*    @Bean
-    @ConditionalOnMissingBean(SqlSessionFactory.class)
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource,MatrixMybatisConfig matrixMybatisConfig,MatrixMybatisGlobalConfig matrixMybatisGlobalConfig) throws Exception {
-        MatrixMybatisSqlSessionFactoryBean sqlSessionFactory = new MatrixMybatisSqlSessionFactoryBean(matrixMybatisConfig,matrixMybatisGlobalConfig);
-*//*        sqlSessionFactory.setGlobalConfig(matrixMybatisGlobalConfig());
-        sqlSessionFactory.setConfiguration(matrixMybatisConfig());*//*
-        sqlSessionFactory.setDataSource(dataSource);
-        return sqlSessionFactory.getObject();
-    }*/
-}

matrix-mybatis/matrix-mybatis-starter/src/main/java/com/secoo/mall/mybatis/spring/boot/autoconfigure/MatrixMybatisAutoConfiguration.java

 package com.secoo.mall.mybatis.spring.boot.autoconfigure;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
-import com.baomidou.mybatisplus.extension.toolkit.PackageHelper;
 import com.ctrip.framework.apollo.spring.boot.ApolloAutoConfiguration;
-import com.secoo.mall.common.util.string.StringUtil;
 import com.secoo.mall.datasource.bean.MatrixDataSource;
 import com.secoo.mall.datasource.bean.MatrixDynamicDataSource;
 import com.secoo.mall.datasource.provider.ApolloDataSourceProvider;
@@ -24,7 +22,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
 import javax.sql.DataSource;
 
@@ -33,7 +30,6 @@ import javax.sql.DataSource;
 @AutoConfigureBefore({DataSourceAutoConfiguration.class, MybatisPlusAutoConfiguration.class})
 @AutoConfigureAfter(ApolloAutoConfiguration.class)
 @EnableConfigurationProperties({MatrixDefaultDataSourceProperties.class})
-//@Import(MatrixMybatisAutoConfiguration.class)
 @Slf4j
 public class MatrixMybatisAutoConfiguration {
     @Setter
@@ -67,8 +63,8 @@ public class MatrixMybatisAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean(SqlSessionFactory.class)
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource, MatrixMybatisConfig matrixMybatisConfig, MatrixMybatisGlobalConfig matrixMybatisGlobalConfig) throws Exception {
-        MatrixMybatisSqlSessionFactoryBean sqlSessionFactory = new MatrixMybatisSqlSessionFactoryBean(matrixMybatisConfig,matrixMybatisGlobalConfig);
-         sqlSessionFactory.setDataSource(dataSource);
+        MatrixMybatisSqlSessionFactoryBean sqlSessionFactory = new MatrixMybatisSqlSessionFactoryBean(matrixMybatisConfig, matrixMybatisGlobalConfig);
+        sqlSessionFactory.setDataSource(dataSource);
         return sqlSessionFactory.getObject();
     }