From cd74a32e584cccc4214f72beffae3d93e26ec0da Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 13 Apr 2020 18:37:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=85=B3=E9=97=ADregister=20,=20gateway?= =?UTF-8?q?=20,=20console=20=E6=97=A5=E5=BF=97=E6=8C=81=E4=B9=85=E5=8C=96?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=202.=20Sonar=20Bug=20=E4=BF=AE=E5=A4=8D=203.?= =?UTF-8?q?=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=A5=E5=BF=97=E6=8C=81?= =?UTF-8?q?=E4=B9=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysToolService.java | 6 - .../configuration/AppStartSystemInit.java | 8 +- .../controller/DemoResourceController.java | 127 +++------------------ .../controller/DemoTestingController.java | 2 +- .../controller/base/WhiteController.java | 4 +- .../controller/busi/PersonnelController.java | 4 +- .../controller/busi/SysDictionaryController.java | 11 +- .../controller/busi/SysLogOperateController.java | 2 +- .../controller/busi/SysMenuController.java | 17 +-- .../controller/busi/SysOrganizeController.java | 3 +- .../controller/busi/SysUserInfoController.java | 6 +- .../core/apiservice/mq/ScheduleQueueReceiver.java | 2 +- .../base/SysLogElasticSearchService.java | 2 +- .../apiservice/serviceimpl/base/SysLogFactory.java | 2 +- .../serviceimpl/base/SystemInitService.java | 2 +- .../serviceimpl/base/SystemLoginService.java | 9 +- .../serviceimpl/busi/PersonnelServiceService.java | 2 +- .../serviceimpl/busi/SysMessageService.java | 2 +- .../serviceimpl/busi/SysToolService.java | 10 -- .../src/main/resources/log4j2-spring-dev.xml | 73 ++++++------ .../src/main/resources/log4j2-spring.xml | 86 +++----------- 21 files changed, 106 insertions(+), 274 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java index 0e4712d..f608cd3 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java +++ b/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 */ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 2df4adc..138f655 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/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; - - public String PROP_IMPP_ELASTICSEARCH_URL; + private static final int userInfoCount = 100; @Resource(name = CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 37b9966..4f0cd58 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/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) - .notNull("languageName",lang.getLanguageName()) - .notNull("languageCode",lang.getLanguageCode()); + ValidatorBean.beginValid(bean) + .notNull("languageName", bean.getLanguageName()) + .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) - .notNull("languageName",lang.getLanguageName()) - .notNull("languageCode",lang.getLanguageCode()); + ValidatorBean.beginValid(bean) + .notNull("languageName", bean.getLanguageName()) + .notNull("languageCode", bean.getLanguageCode()); //修改条件 - ConvertBean.modelUpdate(lang,user); - systemResourceService.updateSysLocaleLanguage(lang); + ConvertBean.modelUpdate(bean,user); + 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); - } - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java index 068fed2..4b2eee7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java +++ b/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; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 34e0081..7f31df3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/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 findSysLocaleResource(@RequestBody SysLocaleResource sysLocaleResource){ + public ResultBean findSysLocaleResource(@RequestBody SysLocaleResource resource){ try { startMultiService(); - List resourceList = sysLocaleResourceService.findSysLocaleResource(sysLocaleResource); + List resourceList = sysLocaleResourceService.findSysLocaleResource(resource); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resourceList); }catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index b48c330..bb6f84c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/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()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index cbeeb6d..7c5be56 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/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 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()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index f65b2c2..7634d35 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/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()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index bad3b6b..3c84b38 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/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) { - try { - bis.close(); - targetStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } + IOUtils.closeQuietly(bis); } 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); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 7d45ff3..d8e0806 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/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; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 0e3c075..4f2027d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/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()); - }else { - return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); - } + return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index 853dd1f..389221f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/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; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java index b88d1c2..346be80 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java +++ b/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; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java index 1d3b038..147ee37 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java +++ b/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; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index 839fe55..885a520 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/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 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index a5af288..9897e53 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/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 = null; - /** - * to do - * - * 此处外网获取sa超级管理员用户名密码 - * 或者导入加密证书生成内存超级管理员用户名密码 - */ + SysUser user = getUserLoginInfo(saAdminToken.getLoginName(),saAdminToken.getLoginPwd()); return packSessionUser(user,CommonEnumUtil.USER_TYPE.SA.getCode(),saAdminToken.getLanguageCode()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 0ead1ec..61ec43c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/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 ){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index 4fe3265..db4228d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/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()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java index 051a240..68bc7cf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java +++ b/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 listSysTool() { LOGGER.info("硬件 TOOL list"); diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml index d4107e7..5d41628 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml @@ -1,33 +1,42 @@ - - - - - - [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n - [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n - - - - - - - - - - - - - - - - ${info_pattern} - - - - - - ${system_log_pattern} - - - + + + + + + + + + + + + [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n + [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n + [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml index 255404f..9746c7d 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml @@ -2,7 +2,7 @@ - + @@ -14,88 +14,38 @@ [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n - - - - - - ${info_pattern} - - + + + + + - + - - - - - - ${system_log_pattern} - - - - - - - - - ${pattern} - - - - - - - - - - - ${pattern} - - - - - - - - + + + - ${pattern} + ${info_pattern} - - - - - - + - + - - - + + - - - - + + - - - - - \ No newline at end of file