修复进销存合并

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();

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/authentication/MultiUserDetailsAuthenticationProvider.java

@@ -143,6 +143,7 @@ public class MultiUserDetailsAuthenticationProvider extends AbstractUserDetailsA
         if (request.getRequestURI().startsWith(properties.getAdminApi().getPrefix())
                 || request.getRequestURI().startsWith("/common/")
                 || request.getRequestURI().startsWith("/bxg")
+                || request.getRequestURI().startsWith("/erp")
                 || request.getRequestURI().startsWith("/api/upload")
         ) {
             return UserTypeEnum.ADMIN;

yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java

@@ -49,6 +49,7 @@ public class YudaoSwaggerAutoConfiguration {
         return new Docket(DocumentationType.SWAGGER_2)
                 // 用来创建该 API 的基本信息，展示在文档的页面中（自定义展示的信息）
                 .apiInfo(apiInfo(properties))
+                .groupName("管理系统")
                 // 设置扫描指定 package 包下的
                 .select()
                 .apis(basePackage(properties.getBasePackage()))
@@ -75,7 +76,7 @@ public class YudaoSwaggerAutoConfiguration {
                 .build();
         pars.add(ticketPar.build());
         return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("ADMIN")
+                .groupName("商城后台")
                 .enable(true)
                 .apiInfo(apiInfo(properties))
                 .select()
@@ -103,7 +104,7 @@ public class YudaoSwaggerAutoConfiguration {
                 .build();
         pars.add(ticketPar.build());
         return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("APP")
+                .groupName("商城前台")
                 .enable(true)
                 .apiInfo(apiInfo(properties))
                 .select()
@@ -132,7 +133,7 @@ public class YudaoSwaggerAutoConfiguration {
                 .build();
         pars.add(ticketPar.build());
         return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("TOOL")
+                .groupName("电商工具")
                 .enable(true)
                 .apiInfo(apiInfo(properties))
                 .select()
@@ -146,6 +147,34 @@ public class YudaoSwaggerAutoConfiguration {
                 .securityContexts(securityContexts());
     }
 
+    @Bean("ERP")
+    @SuppressWarnings("all")
+    public Docket createErpApi() {
+        SwaggerProperties properties = swaggerProperties();
+        ParameterBuilder ticketPar = new ParameterBuilder();
+        List<Parameter> pars = new ArrayList<>();
+        ticketPar.name("token").description("token")
+                .modelRef(new ModelRef("string"))
+                .parameterType("header")
+                .defaultValue("token" + " ")
+                .required(true)
+                .build();
+        pars.add(ticketPar.build());
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("进销存")
+                .enable(true)
+                .apiInfo(apiInfo(properties))
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.zsw.erp"))
+                .paths(PathSelectors.regex("/error.*").negate())
+                .build()
+                .globalOperationParameters(pars)
+                //添加登陆认证
+                .securitySchemes(securitySchemes())
+                .globalRequestParameters(globalRequestParameters())
+                .securityContexts(securityContexts());
+    }
+
     // ========== apiInfo ==========
 
     /**