修复进销存合并

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java

@@ -20,8 +20,11 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
 import javax.sql.DataSource;
+import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -32,6 +35,7 @@ import java.util.Map;
 
 @MapperScans({
         @MapperScan(basePackages ={"co.yixiang.**.service.mapper", "co.yixiang.config"},sqlSessionFactoryRef = "shangcheng"),
+        @MapperScan(basePackages = {"com.zsw.erp.datasource.mappers"},sqlSessionFactoryRef = "erp"),
         @MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class,
                 lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试
 })
@@ -69,6 +73,21 @@ public class YudaoMybatisAutoConfiguration {
         return getSqlSessionFactory(factory);
     }
 
+    @Bean("erp")
+    public SqlSessionFactory erpSqlSessionFactory(DynamicDataSourceProvider dynamicDataSourceProvider) throws Exception {
+        MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean();
+        Resource[] resources = new PathMatchingResourcePatternResolver().getResources("classpath*:/erp_mapper/*.xml");
+        Arrays.stream(resources).forEach(resource -> {
+            log.info("erp mapper:{}",resource.getFilename());
+        });
+        factory.setMapperLocations(resources);
+        Map<String, DataSource> map = dynamicDataSourceProvider.loadDataSources();
+        DataSource dataSource = map.get("erp");
+        factory.setDataSource(map.get("erp"));
+        return getSqlSessionFactory(factory);
+    }
+
+
     private SqlSessionFactory getSqlSessionFactory(MybatisSqlSessionFactoryBean factory) throws Exception {
         GlobalConfig globalConfig = new GlobalConfig();
         GlobalConfig.DbConfig dbConfig = new GlobalConfig.DbConfig();