Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zf

2024-03-25 cd02923a7ce1ffa004b3abbb7af67ab6173dd99d

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java

@@ -1,7 +1,5 @@
package com.gkhy.safePlatform.config.database;

import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.plugin.Interceptor;
@@ -23,7 +21,7 @@
import java.util.Arrays;

@Configuration
@MapperScan(basePackages = {"com.gkhy.safePlatform.goalManage"},
@MapperScan(basePackages = {"com.gkhy.safePlatform.targetDuty"},
        sqlSessionTemplateRef = "sqlTemplateGoalManage",annotationClass =
        Repository.class)
public class MyBatisConfigGoalManage {
@@ -35,22 +33,16 @@
    @Autowired
    private MybatisPlusInterceptor mybatisPlusInterceptor;

    @Bean(name = "dataSourceGoalManage")
    @ConfigurationProperties(prefix = "spring.datasource.goalmanage")
    public DruidDataSource dataSourceGoalManage(){
        return DruidDataSourceBuilder.create().build();
    }

    @Bean(name = "sqlFactoryGoalManage")
    public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSourceGoalManage") DruidDataSource dataSource)
    public SqlSessionFactory sqlSessionFactory()
            throws Exception
    {
        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
        factoryBean.setDataSource(dataSource);
        factoryBean.setDataSource(dsGoalManage);
        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();

        //-------------------
        Resource[] rs1 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
        Resource[] rs1 = resolver.getResources("classpath*:config/mapper/goalManage/**/**Mapper.xml");
//        Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
        ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
//        resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2)));