1. 关闭register , gateway , console 日志持久化技术

2. Sonar Bug 修复
3. 自定义日志持久化

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java

@@ -45,12 +45,6 @@ public interface ISysToolService {
     void updateSysTool(SysTool tool);
 
     /**
-     * 修改硬件
-     */
-    @ApiOperation(value = "造数据")
-    void insertBatch(int num,int waitTime);
-
-    /**
      * 查找全部硬件
      * @return
      */

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java

@@ -40,13 +40,11 @@ public class AppStartSystemInit implements CommandLineRunner {
     private static Environment environment;
 
     @Value("${spring.profiles.active}")
-    public String SPRING_PROFILES_ACTIVE;
+    private String SPRING_PROFILES_ACTIVE;
     // 限制组织数量
-    public static int organizeCount = 5;
+    private static final int organizeCount = 5;
     // 限制账号数量
-    public static int userInfoCount = 100;
+    private static final int userInfoCount = 100;
-
-    public String PROP_IMPP_ELASTICSEARCH_URL;
 
     @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java

@@ -45,37 +45,26 @@ import java.util.Locale;
 public class DemoResourceController extends CoreBaseController {
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class);
 
-    /**
-     * 缓存
-     */
-    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
-    private ImppRedis redisCore;
-
-    /**
-     * rabbitMQ队列
-     */
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
 
     @Autowired
     private ISystemResourceService systemResourceService;
 
     @PutMapping(value="/language/insert")
     @ApiOperation(value="添加语言",notes = "添加系统语言，可用于国际化")
-    public ResultBean insertLanguage(SysLocaleLanguage lang) {
+    public ResultBean insertLanguage(SysLocaleLanguage bean) {
         try {
             //登陆用户
             SessionUser user = AuthUtil.getSessionUser();
 
             //条件验证
-            ValidatorBean.beginValid(lang)
+            ValidatorBean.beginValid(bean)
-                    .notNull("languageName",lang.getLanguageName())
+                    .notNull("languageName", bean.getLanguageName())
-                    .notNull("languageCode",lang.getLanguageCode());
+                    .notNull("languageCode", bean.getLanguageCode());
 
             //新增初始化
-            ConvertBean.modelInitialize(lang,user);
+            ConvertBean.modelInitialize(bean,user);
 
-            systemResourceService.insertSysLocaleLanguage(lang);
+            systemResourceService.insertSysLocaleLanguage(bean);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep).build();
@@ -86,24 +75,24 @@ public class DemoResourceController extends CoreBaseController {
 
     /**
      * 修改系统语言，可用于国际化
-     * @param lang 国际化语言
+     * @param bean 国际化语言
      * @return
      */
     @PutMapping(value="/language/update")
     @ApiOperation(value="修改语言",notes = "修改系统语言，可用于国际化")
-    public ResultBean updateLanguage(SysLocaleLanguage lang) {
+    public ResultBean updateLanguage(SysLocaleLanguage bean) {
         try {
             //登陆用户
             SessionUser user = AuthUtil.getSessionUser();
 
             //条件验证
-            ValidatorBean.beginValid(lang)
+            ValidatorBean.beginValid(bean)
-                    .notNull("languageName",lang.getLanguageName())
+                    .notNull("languageName", bean.getLanguageName())
-                    .notNull("languageCode",lang.getLanguageCode());
+                    .notNull("languageCode", bean.getLanguageCode());
 
             //修改条件
-            ConvertBean.modelUpdate(lang,user);
+            ConvertBean.modelUpdate(bean,user);
-            systemResourceService.updateSysLocaleLanguage(lang);
+            systemResourceService.updateSysLocaleLanguage(bean);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep).build();
@@ -114,15 +103,15 @@ public class DemoResourceController extends CoreBaseController {
 
     /**
      * 查询语言
-     * @param lang 查询条件
+     * @param bean 查询条件
      * @param pager  分页信息
      * @return 处理结果
      */
     @PutMapping(value="/language/query")
     @ApiOperation(value="查询语言",notes = "添加系统语言，可用于国际化")
-    public ResultBean queryLanguage(SysLocaleLanguage lang,Pager pager) {
+    public ResultBean queryLanguage(SysLocaleLanguage bean, Pager pager) {
         try {
-            ListPager listPager = systemResourceService.listSysLocaleLanguageByPager(lang,pager);
+            ListPager listPager = systemResourceService.listSysLocaleLanguageByPager(bean,pager);
             return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -233,88 +222,4 @@ public class DemoResourceController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
-
-
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private ISysUserInfoService userInfoServicer;
-
-    /**
-     * 测试重复ID1
-     * @param key id
-     * @return 处理结果
-     */
-    @GetMapping(value="/dup-id1")
-    @ApiOperation(value="测试重复ID1",notes="测试重复ID1")
-    public ResultBean testDuplicatedIdOne(long key) {
-        try {
-            LOGGER.info("获取：{}",key);
-
-            SysUser user = userService.getSysUserById(key);
-            System.out.println("1==="+user.toString());
-
-            return ResultBean.success("操作成功");
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-
-    /**
-     * 测试重复ID2
-     * @param key id
-     * @return 处理结果
-     */
-    @GetMapping(value="/dup-id2")
-    @ApiOperation(value="测试重复ID2",notes="测试重复ID2")
-    public ResultBean testDuplicatedIdTwo(long key) {
-        try {
-            LOGGER.info("获取：{}",key);
-
-            SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key);
-            System.out.println("2==="+userInfo.toString());
-
-            return ResultBean.success("操作成功");
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    /**
-     * 测试重复ID
-     * @param key id
-     * @return 处理结果
-     * @return 处理结果
-     */
-    @GetMapping(value="/dup-id")
-    @ApiOperation(value="测试重复ID",notes="测试重复ID")
-    public ResultBean testDuplicatedId(long key) {
-        try {
-            LOGGER.info("获取：{}",key);
-//            SysUser u1 = new SysUser();
-//            u1.setId(key);
-//            SysUserInfo u2 = new SysUserInfo();
-//            u2.setId(key);
-//            System.out.println(u1.equals(u2));
-//            System.out.println("1====" + u1.hashCode());
-//            System.out.println("2====" + u2.hashCode());
-
-//            SysUser user = userService.getSysUserById(key);
-//            System.out.println("1==="+user);
-//            SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key);
-//            System.out.println("2==="+userInfo);
-
-            return ResultBean.success("操作成功");
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java

@@ -76,7 +76,7 @@
 //
 //    private String TEXT = "飓风黑兹尔是1954年大西洋飓风季期间造成死亡人数最多、经济损失最惨重的飓风。这场风暴夺走了海地多达1000人的生命，然后又以四级飓风强度从南、北卡罗莱纳州边境附近袭击美国，造成95人丧生。之后黑兹尔转变成温带风暴，但仍然致使81人遇难，其中大部分来自多伦多。由于风暴造成了重大人员伤亡和财产损失，其名称“黑兹尔”因此从大西洋风暴命名名单上退役。黑兹尔摧毁了海地40%的咖啡树和50%的可可作物，对当地经济的影响持续了数年之久。飓风在南、北卡罗莱纳州登陆，冲击点附近的大部分海滨住宅被毁。气旋从北卡罗莱纳州沿大西洋海岸北上，先后影响了弗吉尼亚州、西弗吉尼亚州、马里兰州、特拉华州、新泽西州、宾夕法尼亚州和纽约州，产生的阵风时速有近160公里，造成的经济损失高达3.08亿美元。多伦多市内及周边有许多溪流溢出，导致严重的洪涝灾害。加拿大遭受的损失达到1.35亿加拿大元。由于缺少应对热带气旋的经验，加上风暴强度的保持时间异常之长，多伦多所受影响的严重程度是前所未有的";
 //
-//    private SnowflakeIdMaker snowflakeIdMaker = SnowflakeIdMaker.getSnowflakeIdMaker(10,10);
+//    private SnowflakeIdMaker snowflakeIdMaker = SnowflakeIdMaker.getSnowflake(10,10);
 //
 //    @Autowired
 //    private PersonnelController personnelController;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -268,11 +268,11 @@ public class WhiteController extends CoreBaseController {
 
     @PostMapping(value = "/find-resource")
     @ApiOperation(value = "按条件查询资源")
-    public ResultBean<SysLocaleResource> findSysLocaleResource(@RequestBody SysLocaleResource sysLocaleResource){
+    public ResultBean<SysLocaleResource> findSysLocaleResource(@RequestBody SysLocaleResource resource){
         try {
             startMultiService();
 
-            List<SysLocaleResource> resourceList = sysLocaleResourceService.findSysLocaleResource(sysLocaleResource);
+            List<SysLocaleResource> resourceList = sysLocaleResourceService.findSysLocaleResource(resource);
 
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resourceList);
         }catch(ImppBusiException busExcep){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java

@@ -253,9 +253,7 @@ public class PersonnelController extends CoreBaseController {
             personnelService.checkSysUserOnly(user);
 
             SysDepartment userDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getUserDepartmentId()));
-            if (userDepartment == null) {
+            ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在");
-                ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在");
-            }
             SysOrganize userOrganize = personnelService.getSysOrganizeById(userDepartment.getOrganizeId());
 
             user.setDepartmentId(userDepartment.getId());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -153,9 +153,6 @@ public class SysDictionaryController extends CoreBaseController{
             ValidatorBean.checkNotNull(idStr,"id不能为空");
             SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(Long.parseLong(idStr));
             List<SysDictionary> childList = null;
-            if(sysDictionary.getParentIdVal() == CommonEnumUtil.PARENT.DEFAULT.getValue()){
-                childList = sysDictionaryService.findSysDictionaryByParentId(sysDictionary.getId());
-            }
             if(sysDictionary == null){
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@@ -163,7 +160,13 @@ public class SysDictionaryController extends CoreBaseController{
                         .setErrorDetail("字典不存在")
                         .setErrorSolution("请重新选择")
                         .build();
-            }else if(childList!= null && !childList.isEmpty()){
+            }
+
+            if(sysDictionary.getParentIdVal() == CommonEnumUtil.PARENT.DEFAULT.getValue()){
+                childList = sysDictionaryService.findSysDictionaryByParentId(sysDictionary.getId());
+            }
+
+            if(childList!= null && !childList.isEmpty()){
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java

@@ -257,7 +257,7 @@ public class SysLogOperateController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         } finally {
             // 清理临时文件文件
-            if(excelDir == null) {
+            if(excelDir != null) {
                 FileTool.deleteFile(excelDir.getPath());
             }
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java

@@ -26,6 +26,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -408,15 +409,14 @@ public class SysMenuController extends CoreBaseController {
                     ,"menuCss","menuIcon","menuDescription"
             });
 
-            InputStream targetStream = new DataInputStream(new FileInputStream(excle));
             response.setContentType("application/force-download"); // 设置强制下载不打开
             response.addHeader("Content-Disposition", "attachment;fileName=" + fileName); // 设置文件名
             response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName,true)));
-            // 设置文件名
 
+            // 设置文件名
             BufferedInputStream bis = null;
             try {
-                bis = new BufferedInputStream(targetStream);
+                bis = new BufferedInputStream(new DataInputStream(new FileInputStream(excle)));
                 OutputStream os = response.getOutputStream();
                 byte[] buffer = new byte[1024];
                 int i = bis.read(buffer);
@@ -427,19 +427,14 @@ public class SysMenuController extends CoreBaseController {
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {
-                if (bis != null) {
+                IOUtils.closeQuietly(bis);
-                    try {
-                        bis.close();
-                        targetStream.close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
             }
             file.delete(); // 删除临时文件
             ResultBean.success("下载").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             ResultBean.fail(busExcep);
+        } catch (FileNotFoundException e) {
+            ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         } catch (Exception e) {
             ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description : 组织对外接口
@@ -320,7 +321,7 @@ public class SysOrganizeController extends CoreBaseController{
 
         LOGGER.info("Copy Wms Process Config:{}",config);
         if(config != null){
-            if(config.getConfigValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue())){
+            if(Objects.equals(config.getConfigValue(),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue())){
 
                 // 获取目标组织代码
                 redisKey = CommonConstWords.REDIS_PREFIX_CACHE_CONFIG + "_" + CommonConstWords.CONFIG_ORGANIZE_INSERT_INIT_WMS_COPY_PROCESS_CODE;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java

@@ -248,11 +248,7 @@ public class SysUserInfoController extends CoreBaseController{
             SysUserInfo userInfo = sysUserInfoService.getSysUserInfoById(Long.parseLong(id));
             ValidatorBean.beginValid(userInfo).notNull("id",userInfo.getId());
 
-            if(userInfo != null){
+            return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-                return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-            }else {
-                return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
-            }
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java

@@ -12,7 +12,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-import cn.estsh.impp.framework.boot.util.ImppLog;
+import cn.estsh.impp.framework.boot.log.ImppLog;
 import com.alibaba.fastjson.JSON;
 import com.rabbitmq.client.Channel;
 import org.slf4j.Logger;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java

@@ -12,7 +12,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-import cn.estsh.impp.framework.boot.util.ImppLog;
+import cn.estsh.impp.framework.boot.log.ImppLog;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.bucket.terms.ParsedTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java

@@ -11,7 +11,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.util.ImppLog;
+import cn.estsh.impp.framework.boot.log.ImppLog;
 import cn.estsh.impp.framework.boot.util.ImppSwitchUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -85,8 +85,8 @@ public class SystemInitService implements ISystemInitService {
             list.forEach(config -> {
                 RedisUtilTool.setSysConfigByConfigCode(config);
             });
+            LOGGER.info("加载系统配置数量：【{}】",list.size());
         }
-        LOGGER.info("加载系统配置数量：【{}】",list.size());
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java

@@ -84,14 +84,7 @@ public class SystemLoginService implements ISystemLoginService {
     @Override
     @ApiOperation(value = "封装用户",notes = "封装超级管理员信息")
     public SessionUser queryCheckSaAdminLogin(SaAdminToken saAdminToken) {
-        //SysUser user = getUserLoginInfo(saAdminToken.getLoginName(),saAdminToken.getLoginPwd());
+        SysUser user = getUserLoginInfo(saAdminToken.getLoginName(),saAdminToken.getLoginPwd());
-        SysUser user = null;
-        /**
-         * to do
-         *
-         * 此处外网获取sa超级管理员用户名密码
-         * 或者导入加密证书生成内存超级管理员用户名密码
-         */
         return packSessionUser(user,CommonEnumUtil.USER_TYPE.SA.getCode(),saAdminToken.getLanguageCode());
     }
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java

@@ -1116,7 +1116,7 @@ public class PersonnelServiceService implements IPersonnelService {
 
    @Override
     public void refreshRefSysUserInfoPosition(Long userInfoId, Long[] positionIds) {
-        LOGGER.info("用户岗位关系信息 RefSysUserInfoPosition userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds);
+        LOGGER.info("用户岗位关系信息 RefSysUserInfoPosition userInfoId:{} positionIds:{} ",userInfoId,positionIds);
 
         SysUserInfo userInfo = userInfoRDao.getById(userInfoId);
         if(userInfo != null ){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java

@@ -95,7 +95,7 @@ public class SysMessageService implements ISysMessageService {
             SysFile sysFile;
             for (SysFileAttach sysFileAttach : sysMessage.getSysFileAttachList()) {
                 sysFile = sysFileRDao.getById(sysFileAttach.getFileId());
-                if(sysFile == null){
+                if(sysFile != null){
                     sysFileAttach.setRefId(sysMessage.getId());
                     sysFileAttach.setFileNameRdd(sysFile.getName());
                     sysFileAttach.setFilePathRdd(sysFile.getFilePath());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java

@@ -103,16 +103,6 @@ public class SysToolService implements ISysToolService {
     }
 
     @Override
-    public void insertBatch(int num,int waitTime){
-        try {
-//            testDao.insertBatch(num,waitTime);
-            Thread.sleep(waitTime);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
     @ApiOperation(value = "查询设备信息",notes = "查询所有设备信息")
     public List<SysTool> listSysTool() {
         LOGGER.info("硬件 TOOL list");

modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml

@@ -1,33 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="WARN">
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
-<!--全局参数-->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
-<Properties>
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
-    <Property name="log4j2.level" value="INFO"/>
+<configuration status="WARN" monitorInterval="30" packages="cn.estsh.impp.framework.boot.log">
-    <Property name="info_pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n</Property>
+    <Properties>
-    <Property name="system_log_pattern">[SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n</Property>
+        <Property name="log4j2.level" value="INFO"/>
-</Properties>
+        <!-- 日志存放位置 -->
-<Loggers>
+        <Property name="logFileRootPath" value="../logs"/>
-    <Root level="${log4j2.level}">
+
-        <AppenderRef ref="console"></AppenderRef>
+        <!-- 日志输出格式 -->
-    </Root>
+        <Property name="pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n</Property>
-    <!--系统提示信息-->
+        <Property name="info_pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n</Property>
-    <Logger name="system_log" level="${log4j2.level}" additivity="false">
+        <Property name="system_log_pattern">[SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n</Property>
-        <AppenderRef ref="system_log_console"></AppenderRef>
+    </Properties>
-    </Logger>
+
-</Loggers>
+    <appenders>
-<Appenders>
+        <ImppLog4j2Appender name="impp-log">
-    <Console name="console" target="SYSTEM_OUT" follow="true">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %t [%c{1.}(%M:%L)] ==>> %msg%xEx"/>
-        <!--控制台只输出level及以上级别的信息-->
+        </ImppLog4j2Appender>
-        <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+
-        <PatternLayout>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
-            <Pattern>${info_pattern}</Pattern>
+        <RollingFile name="log" fileName="${logFileRootPath}/${project.name}.log" append="false"
-        </PatternLayout>
+              filePattern="${logFileRootPath}/${project.name}-%d{yyyy-MM-dd}-warn-%i.log">
-    </Console>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss-SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
-    <Console name="system_log_console" target="SYSTEM_OUT" follow="true">
+            <Policies>
-        <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+                <TimeBasedTriggeringPolicy/>
-        <PatternLayout>
+                <SizeBasedTriggeringPolicy size="1024 MB"/>
-            <Pattern>${system_log_pattern}</Pattern>
+            </Policies>
-        </PatternLayout>
+            <DefaultRolloverStrategy max="3"/>
-    </Console>
+        </RollingFile>
-</Appenders>
+    </appenders>
+
+    <loggers>
+        <!-- 忽略 Swagger 格式化错误 -->
+        <logger name="io.swagger.models.parameters.AbstractSerializableParameter" level="ERROR" />
+        <root level="${log4j2.level}">
+            <appender-ref ref="impp-log"/>
+            <appender-ref ref="log"/>
+        </root>
+    </loggers>
 </configuration>

modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml

@@ -2,7 +2,7 @@
 <!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
 <!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
 <!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
-<configuration status="WARN" monitorInterval="30">
+<configuration status="WARN" monitorInterval="30"  packages="cn.estsh.impp.framework.boot.log">
     <Properties>
         <Property name="log4j2.level" value="INFO"/>
         <!-- 日志存放位置 -->
@@ -14,88 +14,38 @@
         <Property name="system_log_pattern">[SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n</Property>
     </Properties>
 
-    <!--先定义所有的appender-->
     <appenders>
-        <!--这个输出控制台的配置-->
+        <!-- Impp 自定义 Appender 日志持久化 -->
-        <console name="Console" target="SYSTEM_OUT" follow="true">
+        <ImppLog4j2Appender name="impp-log">
-            <!--输出日志的格式-->
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %t [%c{1.}(%M:%L)] ==>> %msg%xEx"/>
-            <PatternLayout>
+        </ImppLog4j2Appender>
-                <Pattern>${info_pattern}</Pattern>
+
-            </PatternLayout>
-        </console>
         <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
-        <File name="log" fileName="${logFileRootPath}/${project.name}.log" append="false">
+        <RollingFile name="log" fileName="${logFileRootPath}/${project.name}.log" append="false"
+                     filePattern="${logFileRootPath}/${project.name}-%d{yyyy-MM-dd}-warn-%i.log">
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss-SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy/>
                 <SizeBasedTriggeringPolicy size="1024 MB"/>
             </Policies>
-        </File>
-
-        <File name="system_log_console"  fileName="${logFileRootPath}/${project.name}-system.log"
-              filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-system-%i.log">
-            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${system_log_pattern}</Pattern>
-            </PatternLayout>
-        </File>
-
-        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
-        <RollingFile name="RollingFileInfo" fileName="${logFileRootPath}/${project.name}-info.log"
-                     filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-info-%i.log">
-            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
-            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${pattern}</Pattern>
-            </PatternLayout>
-            <Policies>
-                <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="1024 MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="3"/>
-        </RollingFile>
-        <RollingFile name="RollingFileWarn" fileName="${logFileRootPath}/${project.name}-warn.log"
-                     filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-warn-%i.log">
-            <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${pattern}</Pattern>
-            </PatternLayout>
-            <Policies>
-                <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="1024 MB"/>
-            </Policies>
-            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
             <DefaultRolloverStrategy max="3"/>
         </RollingFile>
-        <RollingFile name="RollingFileError" fileName="${logFileRootPath}/${project.name}-error.log"
+        <Console name="console" target="SYSTEM_OUT" follow="true">
-                     filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-error-%i.log">
+            <!--控制台只输出level及以上级别的信息-->
-            <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
-                <Pattern>${pattern}</Pattern>
+                <Pattern>${info_pattern}</Pattern>
             </PatternLayout>
-            <Policies>
+        </Console>
-                <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="1024 MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="3"/>
-        </RollingFile>
     </appenders>
-    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+
     <loggers>
-        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <!-- 忽略 Swagger 格式化错误 -->
-        <!--        <logger name="org.springframework" level="INFO"></logger>-->
+        <logger name="io.swagger.models.parameters.AbstractSerializableParameter" level="ERROR" />
-        <!--        <logger name="org.mybatis" level="INFO"></logger>-->
         <root level="${log4j2.level}">
             <appender-ref ref="log"/>
-            <appender-ref ref="Console"/>
+            <appender-ref ref="impp-log"/>
-            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="console"/>
-            <appender-ref ref="RollingFileWarn"/>
-            <appender-ref ref="RollingFileError"/>
         </root>
-
-        <!--系统提示信息-->
-        <Logger name="system_log" level="${log4j2.level}" additivity="false">
-            <AppenderRef ref="system_log_console"></AppenderRef>
-        </Logger>
     </loggers>
 </configuration>