emergency/emergency-service/pom.xml

@@ -9,10 +9,13 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>


    <artifactId>emergency-service</artifactId>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>

    <dependencies>
        <dependency>
            <groupId>com.gkhy.safePlatfrom</groupId>

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml

文件名从 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml 修改
@@ -23,7 +23,9 @@
        LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
        WHERE
        a.del_flag = 0
        <if test="query.suppliesId != null  and query.suppliesId != ''">and a.supplies_id = #{query.suppliesId}</if>
        <if test="query.suppliesId != null  and query.suppliesId != ''">
          and a.supplies_id = #{query.suppliesId}
        </if>
    </select>

    <insert id="addEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo"

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml

 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java

@@ -84,18 +84,6 @@
//    }


    /**
     * 分页查询所有数据
     *
     * @param pageQuery 查询实体
     * @return 所有数据
     */
    @PostMapping(value = "/page/list")
    public ResultVO selectAll(@RequestBody PageQuery<TargetExamineQueryCriteria> pageQuery){
        PageUtils.checkCheck(pageQuery);
        return this.targetExamineService.queryAll(pageQuery);
    }


    /**
     * 通过主键查询单条数据

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java

@@ -35,7 +35,6 @@
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 目标指标(TargetMng)表控制层
@@ -74,7 +73,7 @@
        PageUtils.checkCheck(pageQuery);
        return this.targetMngService.queryAll(pageQuery);
    }

	

    /**
     * 通过主键查询单条数据
@@ -96,7 +95,7 @@
    @PostMapping(value = "/addOrUpdate")
    public ResultVO update(@RequestBody TargetMng targetMng) {

        if( !StringUtils.hasText(targetMng.getqName()) ||  !StringUtils.hasText(targetMng.getIndexNum())
        if( !StringUtils.hasText(targetMng.getQName()) ||  !StringUtils.hasText(targetMng.getIndexNum())
                ||  !StringUtils.hasText(targetMng.getYear()) ||  !StringUtils.hasText(targetMng.getValue())
                ||  targetMng.getTargetType() == null){
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少必填字段");
@@ -238,7 +237,7 @@

    public static void main(String[] args) {
        TargetMng mng = new TargetMng();
        mng.setqName("12");
        mng.setQName("12");
        mng.setIndexNum("3");
        mng.setYear("2021");
        mng.setValue("312");
@@ -250,4 +249,4 @@
        System.out.println(JSONObject.toJSONString(mng));

    }
}
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java

@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.targetDuty.entity;

import java.sql.Timestamp;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * 目标指标(TargetMng)表实体类
 *
 * @author xurui
 * @since 2022-07-20 11:49:22
 * @since 2022-08-22 10:14:22
 */
@SuppressWarnings("serial")
@TableName("target_mng")
@@ -30,18 +29,17 @@
    }

                //安全目标指标
    private String qName;

    public String getqName() {
            private String qName;
        
    public String getQName() {
        return qName;
    }

    public void setqName(String qName) {
    public void setQName(String qName) {
        this.qName = qName;
    }

    //目标指标编号
    private String indexNum;
                //目标指标编号
            private String indexNum;
        
    public String getIndexNum() {
        return indexNum;
@@ -51,7 +49,7 @@
        this.indexNum = indexNum;
    }
                //年度
    private String year;
            private String year;
        
    public String getYear() {
        return year;
@@ -61,7 +59,7 @@
        this.year = year;
    }
                //指标值
    private String value;
            private String value;
        
    public String getValue() {
        return value;
@@ -71,7 +69,7 @@
        this.value = value;
    }
                //指标级别 1:公司级 2:部门分厂级 3:工段班组级
    private Integer level;
            private Integer level;
        
    public Integer getLevel() {
        return level;
@@ -81,8 +79,8 @@
        this.level = level;
    }
                //完成期限
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp completeDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp completeDate;
        
    public Timestamp getCompleteDate() {
        return completeDate;
@@ -92,7 +90,7 @@
        this.completeDate = completeDate;
    }
                //备注信息
    private String memo;
            private String memo;
        
    public String getMemo() {
        return memo;
@@ -101,8 +99,8 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }
                //指标类型 1:年指标 2:月指标
    private Integer targetType;
                //指标类型 1:年指标 2:月指标 3:半年 4:季度
            private Integer targetType;
        
    public Integer getTargetType() {
        return targetType;
@@ -112,7 +110,7 @@
        this.targetType = targetType;
    }
                //分解状态 1:已分解 2:未分解
    private Integer divideStatus;
            private Integer divideStatus;
        
    public Integer getDivideStatus() {
        return divideStatus;
@@ -121,5 +119,15 @@
    public void setDivideStatus(Integer divideStatus) {
        this.divideStatus = divideStatus;
    }
            
                        //目标制定部门
            private Long makerDepartmentId;
        
    public Long getMakerDepartmentId() {
        return makerDepartmentId;
    }

    public void setMakerDepartmentId(Long makerDepartmentId) {
        this.makerDepartmentId = makerDepartmentId;
    }
    
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineMngDto.java

@@ -232,4 +232,5 @@
    public void setExamineTemplateName(String examineTemplateName) {
        this.examineTemplateName = examineTemplateName;
    }

}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java

@@ -140,4 +140,27 @@
    public void setUpdateTime(Timestamp updateTime) {
        this.updateTime = updateTime;
    }

    //目标制定部门
    private Long makerDepartmentId;

    public Long getMakerDepartmentId() {
        return makerDepartmentId;
    }

    public void setMakerDepartmentId(Long makerDepartmentId) {
        this.makerDepartmentId = makerDepartmentId;
    }


    //目标制定部门名称
    private String makerDepartmentName;

    public String getMakerDepartmentName() {
        return makerDepartmentName;
    }

    public void setMakerDepartmentName(String makerDepartmentName) {
        this.makerDepartmentName = makerDepartmentName;
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetMngRepository.java

@@ -23,12 +23,12 @@
            "</script> ")
    Integer selectTotal(Map<String, Object> beanToMap);

    @Select("<script>select COUNT(target_id) from target_divide_detail a INNER JOIN target_mng b on a.target_id = b.id \n" +
    @Select("<script>select COUNT(1) from (select a.target_id from target_divide_detail a INNER JOIN target_mng b on a.target_id = b.id \n" +
            "WHERE a.id not in (select target_divide_detail_id from target_examine where examine_result = 1)\n" +
            "<if test =\"divideStatus !='' and divideStatus !=null\">and b.divide_status = #{divideStatus}</if> " +
            "<if test =\"targetType !='' and targetType !=null\">and b.target_type = #{targetType}</if>" +
            "<if test =\"qName !='' and qName !=null\">and b.q_name = #{qName}</if>" +
            "<if test =\"indexNum !='' and indexNum !=null\">and b.index_num = #{indexNum}</if>" +
            "GROUP BY a.target_id</script> ")
            "GROUP BY a.target_id) x</script> ")
    Integer selectNoComplete(Map<String, Object> beanToMap);
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetExamineService.java

@@ -17,8 +17,6 @@
 * @since 2022-07-22 09:30:01
 */
public interface TargetExamineService extends IService<TargetExamine> {
    ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery);
    
    List<TargetExamine> queryAll(TargetExamineQueryCriteria criteria);

//    void addOrUpdate(TargetExamineSaveOrUpdate infoDto);

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java

@@ -16,7 +16,6 @@
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.ExamineMngService;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -56,8 +55,8 @@

    @Resource
    private CommonService commonService;


    
	
    @Override
    public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
@@ -88,7 +87,7 @@
            List<CurrentExamineDto> list = JSONObject.parseArray( dto.getNumberDetailJson(), CurrentExamineDto.class);
            List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());

            if (!idList.isEmpty()){
            if(!idList.isEmpty()){
                List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList);
                Map<Long,ExamineItem> itemMap = itemList.stream().collect(
                        Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
@@ -164,4 +163,4 @@

        return dto;
    }
}
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java

@@ -56,86 +56,6 @@
    @Autowired
    private TargetTypeRepository targetTypeRepository;

    @Override
    public ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
        Long pageSize = pageQuery.getPageSize();
        IPage<TargetMng> page = new Page<>(pageIndex, pageSize);

        page = targetMngRepository.selectPage(page,
                QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
        List<TargetExamineDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetExamineDto.class);
        respList.forEach(dto->{
            //查询关联分解信息
            TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
            criteria.setTargetId(dto.getId());
            List<TargetDivideDetailDto> respList1 = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);

            // --------------------------- 获取部门信息-----------------------
            //收集所用到的部门ID
            Set<Long> collectDepIdSet = new HashSet();
            respList1.forEach(f->{
                collectDepIdSet.add(f.getDutyDepartmentId());
                collectDepIdSet.add(f.getMakerDepartmentId());
            });
            //获取部门名集合
            Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

            respList1.forEach(f->{
                f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
                f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
            });


            // --------------------------- 获取目标分类名称-----------------------
            //收集所用到的目标分类ID
            Set<Long> collectTypeSet = new HashSet();
            respList1.forEach(f->{
                collectTypeSet.add(f.getTargetTypeId());
            });
            //获取目标分类名集合
            if(!collectTypeSet.isEmpty()){
                List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
                Map<Long,String> typeNameMap = typeList.stream()
                        .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));

                respList1.forEach(f->{
                    f.setTargetTypeName(typeNameMap.get(f.getTargetTypeId()));
                });
            }


            // --------------------------- 获取考核结果-----------------------
            //收集所用到的分解详情ID
            Set<Long> collectExamResultSet = new HashSet();
            respList1.forEach(f->{
                collectExamResultSet.add(f.getId());
            });
            //获取核结果集合
            if(!collectTypeSet.isEmpty()){
                List<TargetExamine> typeList = targetExamineRepository.selectBatchIds(collectTypeSet);
                Map<Long,Integer> examResultMap = typeList.stream()
                        .collect(Collectors.toMap(TargetExamine::getId, TargetExamine::getExamineResult,(k1, k2)->k1));

                respList1.forEach(f->{
                    f.setExamineResult(examResultMap.get(f.getId()));
                });
            }


            dto.setTargetDivideDetailList(respList1);
        });

        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
        );
    }


    @Override
    public List<TargetExamine> queryAll(TargetExamineQueryCriteria criteria) {

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -21,16 +20,13 @@
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
import com.gkhy.safePlatform.targetDuty.utils.BeanToMapUtil;
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.beans.IntrospectionException;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -75,6 +71,9 @@
                QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
        List<TargetMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetMngDto.class);
        respList.forEach(dto->{
            // --------------------------- 获取部门信息-----------------------
            dto.setMakerDepartmentName(commonService.getDepName(dto.getMakerDepartmentId()));

            //查询关联分解信息
            TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
            criteria.setTargetId(dto.getId());
@@ -88,7 +87,7 @@
                collectDepIdSet.add(f.getMakerDepartmentId());
            });
            //获取部门名集合
            Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
            Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);

            respList1.forEach(f->{
                f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
@@ -105,7 +104,7 @@
            //获取目标分类名集合
            if(!collectTypeSet.isEmpty()){
                List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
                Map<Long,String> typeNameMap = typeList.stream()
                Map<Long, String> typeNameMap = typeList.stream()
                        .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));

                respList1.forEach(f->{
@@ -139,6 +138,8 @@
            return null;
        }
        TargetMngDto targetMngDto = BeanCopyUtils.copyBean(targetMng, TargetMngDto.class);
        // --------------------------- 获取部门信息-----------------------
        targetMngDto.setMakerDepartmentName(commonService.getDepName(targetMngDto.getMakerDepartmentId()));

        //查询关联分解信息
        TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
@@ -153,7 +154,7 @@
            collectDepIdSet.add(f.getMakerDepartmentId());
        });
        //获取部门名集合
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
        Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);

        respList.forEach(f->{
            f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
@@ -172,7 +173,7 @@
        //获取核结果集合
        if(!collectExamResultSet.isEmpty()){
            List<TargetExamine> typeList = targetExamineRepository.selectList(new QueryWrapper<TargetExamine>().in("target_divide_detail_id",collectExamResultSet));
            Map<Long,TargetExamine> examResultMap = typeList.stream()
            Map<Long, TargetExamine> examResultMap = typeList.stream()
                    .collect(Collectors.toMap(TargetExamine::getTargetDivideDetailId, Function.identity(),(k1, k2)->k1));

            respList.forEach(f->{
@@ -232,7 +233,7 @@

    @Override
    public Object statistics(TargetMngQueryCriteria criteria) {
        Map<String,String> map = new HashMap<>();
        Map<String, String> map = new HashMap<>();
        // 查询总数
        Integer total = 0;
        // 完成数量

 pom.xml

@@ -257,6 +257,11 @@

    <build>
        <plugins>
            <!-- 修改打包插件
                修改打包方式jar为pom后
                默认打包方式为spring-boot-maven-plugin
                    等到后期打包的时候他会一直提示你，你引入的依赖不存在
             -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
@@ -266,6 +271,13 @@
                    <target>1.8</target>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
                </configuration>
            </plugin>
        </plugins>
    </build>


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

@@ -38,7 +38,7 @@
    @Bean(name = "dsGoalManage")
    @Primary
    @Autowired
    public DataSource dsAccount(Environment env) {
    public DataSource dsGoalManage(Environment env) {
        AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
        Properties prop = build(env, "spring.datasource.goalmanage.");
//        ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
@@ -46,6 +46,8 @@
        ds.setUniqueResourceName("goalmanage");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        return ds;

    }
@@ -54,7 +56,7 @@
    @Autowired
    @Primary
    @Bean(name = "dsEmergency")
    public AtomikosDataSourceBean dsDoublePrevent(Environment env) {
    public AtomikosDataSourceBean dsEmergency(Environment env) {
        AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
        Properties prop = build(env, "spring.datasource.emergency.");
//        ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
@@ -62,13 +64,15 @@
        ds.setUniqueResourceName("emergency");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        return ds;
    }

    @Autowired
    @Primary
    @Bean(name = "dsIncidentManage")
    public AtomikosDataSourceBean dsSafeCheck(Environment env) {
    public AtomikosDataSourceBean dsIncidentManage(Environment env) {
        AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
        Properties prop = build(env, "spring.datasource.incidentmanage.");
        ds.setXaDataSourceClassName(datasourceClass);
@@ -76,6 +80,8 @@
        ds.setUniqueResourceName("incidentmanage");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        return ds;
    }

@@ -90,6 +96,8 @@
        ds.setUniqueResourceName("equipment");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        return ds;
    }


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

@@ -19,12 +19,14 @@
import org.springframework.stereotype.Repository;

import javax.sql.DataSource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@Configuration
@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency"},
        sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass =
        sqlSessionTemplateRef = "sqlSessionTemplateEmergency",annotationClass =
        Repository.class)
public class MyBatisConfigEmergency {

@@ -35,41 +37,26 @@
    @Autowired
    private MybatisPlusInterceptor mybatisPlusInterceptor;

    @Bean(name = "datasourceEmergency")
    @Bean(name = "dataSourceEmergency")
    @ConfigurationProperties(prefix = "spring.datasource.emergency")
    public DruidDataSource druidDataSourceA(){
    public DruidDataSource dataSourceDoublePrevent(){
        return DruidDataSourceBuilder.create().build();
    }

    @Bean(name = "sqlFactoryEmergency")
    public SqlSessionFactory sqlSessionFactory(@Qualifier("datasourceEmergency") DruidDataSource dataSource)
            throws Exception
    {
    @Bean(name = "sqlSessionFactoryEmergency")
    public SqlSessionFactory sqlSessionFactoryEmergency(@Qualifier("dataSourceEmergency") DruidDataSource dataSource) throws Exception {
        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
        factoryBean.setDataSource(dataSource);
        factoryBean.setDataSource(dsEmergency);
        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();

        //-------------------
        Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**/**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)));
        Resource[] resourceArray = new Resource[resourceArrayList.size()];
        resourceArrayList.toArray(resourceArray);
        factoryBean.setMapperLocations(resourceArray);
        //-------------------

//        factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
        factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml"));
        //设置分页插件
        Interceptor[] plugins = {mybatisPlusInterceptor};
        factoryBean.setPlugins(plugins);
        return factoryBean.getObject();
    }

    @Bean(name = "sqlTemplateEmergency")
    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryEmergency") SqlSessionFactory sqlSessionFactory)
    {
    @Bean
    public SqlSessionTemplate sqlSessionTemplateEmergency(@Qualifier("sqlSessionFactoryEmergency") SqlSessionFactory sqlSessionFactory){
        return new SqlSessionTemplate(sqlSessionFactory);
    }

}

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

@@ -46,7 +46,7 @@
            throws Exception
    {
        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
        factoryBean.setDataSource(dataSource);
        factoryBean.setDataSource(dsEquipment);
        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();

        //-------------------

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

@@ -46,7 +46,7 @@
            throws Exception
    {
        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
        factoryBean.setDataSource(dataSource);
        factoryBean.setDataSource(dsGoalManage);
        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();

        //-------------------

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

@@ -46,7 +46,7 @@
            throws Exception
    {
        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
        factoryBean.setDataSource(dataSource);
        factoryBean.setDataSource(dsIncidentManage);
        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();

        //-------------------

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java

@@ -110,6 +110,9 @@
    public ResultVO errorHandler(Exception e) {
        e.printStackTrace();
        logger.error(e.getMessage());
        return new ResultVO(ResultCodes.SERVER_ERROR);
        ResultVO resultVO = new ResultVO<>();
        resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
        return resultVO;
//        return new ResultVO(ResultCodes.SERVER_ERROR);
    }
}

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/config/MinioConfig.java

@@ -1,90 +1,90 @@
package com.gkhy.safePlatform.minioFile.config;

import io.minio.MinioClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;

@Component
@ConfigurationProperties(prefix = "minio")
public class MinioConfig {

    private String endpoint;

    private int port;

    private String accessKey;

    private String secretKey;

    private Boolean secure;

    private String bucketName;

    private String urlPrefix;

    @Bean
    public MinioClient getMinioClient(){
        String endpointUrl = "http://"+endpoint+":"+port;
        MinioClient minioClient = MinioClient.builder().endpoint(endpointUrl)
                .credentials(accessKey,secretKey)
                .build();
        return minioClient;
    }

    public String getEndpoint() {
        return endpoint;
    }

    public void setEndpoint(String endpoint) {
        this.endpoint = endpoint;
    }

    public int getPort() {
        return port;
    }

    public void setPort(int port) {
        this.port = port;
    }

    public String getAccessKey() {
        return accessKey;
    }

    public void setAccessKey(String accessKey) {
        this.accessKey = accessKey;
    }

    public String getSecretKey() {
        return secretKey;
    }

    public void setSecretKey(String secretKey) {
        this.secretKey = secretKey;
    }

    public Boolean getSecure() {
        return secure;
    }

    public void setSecure(Boolean secure) {
        this.secure = secure;
    }

    public String getBucketName() {
        return bucketName;
    }

    public void setBucketName(String bucketName) {
        this.bucketName = bucketName;
    }

    public String getUrlPrefix() {
        return urlPrefix;
    }

    public void setUrlPrefix(String urlPrefix) {
        this.urlPrefix = urlPrefix;
    }
}
//package com.gkhy.safePlatform.minioFile.config;
//
//import io.minio.MinioClient;
//import org.springframework.boot.context.properties.ConfigurationProperties;
//import org.springframework.context.annotation.Bean;
//import org.springframework.stereotype.Component;
//
//@Component
//@ConfigurationProperties(prefix = "minio")
//public class MinioConfig {
//
//    private String endpoint;
//
//    private int port;
//
//    private String accessKey;
//
//    private String secretKey;
//
//    private Boolean secure;
//
//    private String bucketName;
//
//    private String urlPrefix;
//
//    @Bean
//    public MinioClient getMinioClient(){
//        String endpointUrl = "http://"+endpoint+":"+port;
//        MinioClient minioClient = MinioClient.builder().endpoint(endpointUrl)
//                .credentials(accessKey,secretKey)
//                .build();
//        return minioClient;
//    }
//
//    public String getEndpoint() {
//        return endpoint;
//    }
//
//    public void setEndpoint(String endpoint) {
//        this.endpoint = endpoint;
//    }
//
//    public int getPort() {
//        return port;
//    }
//
//    public void setPort(int port) {
//        this.port = port;
//    }
//
//    public String getAccessKey() {
//        return accessKey;
//    }
//
//    public void setAccessKey(String accessKey) {
//        this.accessKey = accessKey;
//    }
//
//    public String getSecretKey() {
//        return secretKey;
//    }
//
//    public void setSecretKey(String secretKey) {
//        this.secretKey = secretKey;
//    }
//
//    public Boolean getSecure() {
//        return secure;
//    }
//
//    public void setSecure(Boolean secure) {
//        this.secure = secure;
//    }
//
//    public String getBucketName() {
//        return bucketName;
//    }
//
//    public void setBucketName(String bucketName) {
//        this.bucketName = bucketName;
//    }
//
//    public String getUrlPrefix() {
//        return urlPrefix;
//    }
//
//    public void setUrlPrefix(String urlPrefix) {
//        this.urlPrefix = urlPrefix;
//    }
//}

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java

@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.minioFile.service;

import com.gkhy.safePlatform.minioFile.config.MinioConfig;
//import com.gkhy.safePlatform.minioFile.config.MinioConfig;
import com.gkhy.safePlatform.commons.config.file.MinioConfig;
import com.gkhy.safePlatform.minioFile.utils.UUIDUtil;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.MinioClient;
@@ -15,7 +16,6 @@
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

@Service
public class MinioAccessService {

 safePlatfrom-out-web/src/main/resources/config/application-dev.yaml

@@ -50,8 +50,6 @@
  cloud:
    nacos:
      discovery:
        #        server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
        #        server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
        server-addr: http://192.168.0.52:8848
        namespace: e07a2454-136b-4498-99eb-09dae3336ebe
        username: gkhy_safeplatform_out

 safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml

@@ -14,32 +14,31 @@
    type: com.alibaba.druid.pool.xa.DruidXADataSource
    emergency:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
      &allowPublicKeyRetrieval=true
      username: gkhy_out_team
      password: sas@sASDa28
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    goalmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_out_team
      password: sas@sASDa28
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    incidentmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_out_team
      password: sas@sASDa28
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
    equipment:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_out_team
      password: sas@sASDa28
      url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_safeplatform_guotai_out
      password: a7687@i8a1Sdd
      type: com.alibaba.druid.pool.DruidDataSource
  redis:
    host: 192.168.0.52
    port: 6377
    host: 192.168.30.107
    port: 6376
    password: SEF98uvs98dUAUEF90Udssa
    database: 0           # Redis 数据库号，默认为 0
    timeout: 15000        # Redis 连接超时时间，单位：毫秒。
@@ -57,19 +56,22 @@
  cloud:
    nacos:
      discovery:
        #        server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
        #        server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
        server-addr: http://192.168.0.52:8848
        namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
        username: gkhy_safeplatform_out
        server-addr: http://192.168.30.107:8848
        namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
        username: gkhy_dev_out_team
        password: 9485uyJHISes09t
        enabled: true
        register-enabled: true
      config:
        server-addr: http://192.168.0.52:8848
        namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
        username: gkhy_safeplatform_out
        server-addr: http://192.168.30.107:8848
        namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
        username: gkhy_dev_out_team
        password: 9485uyJHISes09t
    inetutils:
      ignored-interfaces:
        - VirtualBox Host-Only Network
      preferred-networks:
        - 192.168

  #是否允许跨域 true：允许；false：不允许
  enableCors: false
@@ -81,16 +83,17 @@
dubbo:
  registry:
    protocol: nacos
    address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t
    address: nacos://192.168.30.107:8848?namespace=8e59b946-36d6-4d29-81f1-27a55951b86e&username=gkhy_dev_out_team&password=9485uyJHISes09t
  application:
    name: gkhy-safeplatform-out-test
    name: gkhy-safeplatform-out
  scan:
    # 扫描rpc接口定义包
    base-packages: com.gkhy.safePlatform
  protocol:
    name: dubbo
    port: 18082
    port: 18083
    serialization: kryo
    host: ${spring.cloud.client.ip-address}
  consumer:
    # 服务连接超时时间
    timeout: 3000
@@ -98,7 +101,7 @@
    check: false

rocketmq:
  name-server: 192.168.0.52:9876
  name-server: 192.168.30.107:9876
  producer:
    group: gkhy-safeplatform-guotai
    sendMessageTimeout: 300000
@@ -108,13 +111,13 @@
    demoTopic: gkhy-safeplatform-topic-demo

minio:
  endPoint: 192.168.0.52
  endPoint: 121.239.169.27
  port: 9000
  accessKey: oddER8eSv211WVG3
  secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
  accessKey: QR0J7S55SZO8QI1TC2AD
  secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK
  secure: false
  bucketName: safeplatform-dev
  urlPrefix: http://192.168.0.52/file
  urlPrefix: http://121.239.169.27/file
  #用户名 gkhy_team_out_dev
  #密码 12345678


 safePlatfrom-out-web/src/main/resources/config/application-test.yaml

@@ -2,7 +2,7 @@
  tomcat:
    uri-encoding: UTF-8
    basedir: /
  port: 8009
  port: 7009
  servlet:
    context-path: /

@@ -56,8 +56,6 @@
  cloud:
    nacos:
      discovery:
        #        server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
        #        server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
        server-addr: http://192.168.0.52:8848
        namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
        username: gkhy_safeplatform_out
@@ -69,6 +67,11 @@
        namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
        username: gkhy_safeplatform_out
        password: 9485uyJHISes09t
    inetutils:
      ignored-interfaces:
        - VirtualBox Host-Only Network
      preferred-networks:
        - 192.168


  #是否允许跨域 true：允许；false：不允许
@@ -89,8 +92,9 @@
    base-packages: com.gkhy.safePlatform
  protocol:
    name: dubbo
    port: 18082
    port: 33003
    serialization: kryo
    host: ${spring.cloud.client.ip-address}
  consumer:
    # 服务连接超时时间
    timeout: 3000

 safePlatfrom-out-web/src/main/resources/config/application-uat.yaml

对比新文件
@@ -0,0 +1,133 @@
server:
  tomcat:
    uri-encoding: UTF-8
    basedir: /
  port: 8009
  servlet:
    context-path: /

# mysql
spring:
  jta:
    transaction-manager-id: txManager
  datasource:
    type: com.alibaba.druid.pool.xa.DruidXADataSource
    emergency:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_dev_out_team
      password: Adsdf675T6AC7yga
      type: com.alibaba.druid.pool.DruidDataSource
    goalmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_dev_out_team
      password: Adsdf675T6AC7yga
      type: com.alibaba.druid.pool.DruidDataSource
    incidentmanage:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_dev_out_team
      password: Adsdf675T6AC7yga
      type: com.alibaba.druid.pool.DruidDataSource
    equipment:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
      username: gkhy_dev_out_team
      password: Adsdf675T6AC7yga
      type: com.alibaba.druid.pool.DruidDataSource
  redis:
    host: 192.168.0.52
    port: 6375
    password: SEF98uvs98dUAUEF90Udssa
    database: 0           # Redis 数据库号，默认为 0
    timeout: 15000        # Redis 连接超时时间，单位：毫秒。
    lettuce:
      pool:
        max-active: 4
        max-idle: 4
    # 对应 RedisProperties.Jedis 内部类
    jedis:
      pool:
        max-active: 4     # 连接池最大连接数，默认为 8 。使用负数表示没有限制    同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
        max-idle: 4       # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
        min-idle: 0       # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
        max-wait: -1
  cloud:
    nacos:
      discovery:
        server-addr: http://192.168.0.52:8848
        namespace: 10e7997c-9d0b-4c3a-b64c-262abdcc87de
        username: gkhy_safeplatform_out
        password: 9485uyJHISes09t
        enabled: true
        register-enabled: true
      config:
        server-addr: http://192.168.0.52:8848
        namespace: 10e7997c-9d0b-4c3a-b64c-262abdcc87de
        username: gkhy_safeplatform_out
        password: 9485uyJHISes09t
    inetutils:
      ignored-interfaces:
        - VirtualBox Host-Only Network
      preferred-networks:
        - 192.168


  #是否允许跨域 true：允许；false：不允许
  enableCors: false

mybatis-plus:
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

dubbo:
  registry:
    protocol: nacos
    address: nacos://192.168.0.52:8848?namespace=10e7997c-9d0b-4c3a-b64c-262abdcc87de&username=gkhy_safeplatform_out&password=9485uyJHISes09t
  application:
    name: gkhy-safeplatform-out-uat
  scan:
    # 扫描rpc接口定义包
    base-packages: com.gkhy.safePlatform
  protocol:
    name: dubbo
    port: 33004
    serialization: kryo
    host: ${spring.cloud.client.ip-address}
  consumer:
    # 服务连接超时时间
    timeout: 3000
    # 取消服务启动检查
    check: false

rocketmq:
  name-server: 192.168.0.52:9876
  producer:
    group: gkhy-safeplatform-uat
    sendMessageTimeout: 300000
  consumer:
    group: gkhy-safeplatform-guotai
  topic:
    demoTopic: gkhy-safeplatform-topic-demo

minio:
  endPoint: 192.168.0.52
  port: 9000
  accessKey: oddER8eSv211WVG3
  secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
  secure: false
  bucketName: safeplatform-dev
  urlPrefix: http://192.168.0.52/file
  #用户名 gkhy_team_out_dev
  #密码 12345678


token:
  header: Authorization
  secret: safe666
  expiration: 7200
  refreshExpiration: 14400
  tokenHead: Bearer
  loginUserHeader: uid


 safePlatfrom-out-web/src/main/resources/config/application.yaml

@@ -2,11 +2,9 @@
  application:
    name: safeplatform-out
  profiles:
#    active: test
    active: guotai-demo

#mybatis-plus:
#  mapper-locations: classpath:config/mapper/**/*.xml
#    active: test
#    active: uat

logging:
  config: classpath:config/log/log4j2.xml