diff --git a/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonCryptogramUtil.java b/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonCryptogramUtil.java index 7ca23a34..53c9bf80 100644 --- a/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonCryptogramUtil.java +++ b/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonCryptogramUtil.java @@ -95,7 +95,7 @@ public class CommonCryptogramUtil { sm4Options8.setMode("cbc"); sm4Options8.setIv("fedcba98765432100123456789abcdef"); String docString = Sm4.decrypt(str, KEY, sm4Options8); - if (docString.equals("")) { + if ("".equals(docString)) { log.warn(">>> 字段解密失败，返回原文值：{}", str); return str; } else { diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java index ed5649ed..44015fd9 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java @@ -302,7 +302,7 @@ public class BizOrgServiceImpl extends ServiceImpl impleme bizOrg.setName(orgName); bizOrg.setCode(RandomUtil.randomString(10)); bizOrg.setParentId(parentId); - bizOrg.setCategory(parentId.equals("0")?BizOrgCategoryEnum.COMPANY.getValue():BizOrgCategoryEnum.DEPT.getValue()); + bizOrg.setCategory("0".equals(parentId)?BizOrgCategoryEnum.COMPANY.getValue():BizOrgCategoryEnum.DEPT.getValue()); bizOrg.setSortCode(99); this.save(bizOrg); // 发布增加事件 diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsAliyunUtil.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsAliyunUtil.java index 7893bc3a..dd6e7ca1 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsAliyunUtil.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsAliyunUtil.java @@ -110,7 +110,7 @@ public class DevSmsAliyunUtil { SendSmsResponse sendSmsResponse = client.sendSms(sendSmsRequest); SendSmsResponseBody body = sendSmsResponse.getBody(); String code = body.getCode().toLowerCase(); - if(code.equals("ok")) { + if("ok".equals(code)) { return JSONUtil.toJsonStr(body); } else { throw new CommonException(body.getMessage()); diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsTencentUtil.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsTencentUtil.java index d86c15d6..2ed32541 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsTencentUtil.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/util/DevSmsTencentUtil.java @@ -119,7 +119,7 @@ public class DevSmsTencentUtil { SendSmsResponse sendSmsResponse = client.SendSms(sendSmsRequest); SendStatus sendStatus = sendSmsResponse.getSendStatusSet()[0]; String code = sendStatus.getCode().toLowerCase(); - if(code.equals("ok")) { + if("ok".equals(code)) { return JSONUtil.toJsonStr(sendSmsResponse); } else { throw new CommonException(sendStatus.getMessage()); diff --git a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java index 4b3b7044..ac3154bd 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java +++ b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java @@ -503,7 +503,7 @@ public class GenBasicServiceImpl extends ServiceImpl i Template templateFront = groupTemplateFront.getTemplate(fileTemplateName); templateFront.binding(bindingJsonObject); String resultName = StrUtil.removeSuffix(fileTemplateName, ".btl"); - if(fileTemplateName.equalsIgnoreCase("Api.js.btl")) { + if("Api.js.btl".equalsIgnoreCase(fileTemplateName)) { resultName = StrUtil.lowerFirst(genBasic.getClassName()) + resultName; genBasicCodeFrontResult.setCodeFileName(resultName); genBasicCodeFrontResult.setCodeFileWithPathName(genFrontBasicPath + fileTemplatePath + File.separator + resultName); @@ -530,7 +530,7 @@ public class GenBasicServiceImpl extends ServiceImpl i Template templateBackend = groupTemplateBackEnd.getTemplate(fileTemplateName); templateBackend.binding(bindingJsonObject); String resultName = StrUtil.removeSuffix(fileTemplateName, ".btl"); - if(fileTemplateName.equalsIgnoreCase("Entity.java.btl")) { + if("Entity.java.btl".equalsIgnoreCase(fileTemplateName)) { resultName = ".java"; } genBasicCodeBackendResult.setCodeFileName(genBasic.getClassName() + resultName); @@ -555,7 +555,7 @@ public class GenBasicServiceImpl extends ServiceImpl i Template templateMobile = groupTemplateMobile.getTemplate(fileTemplateName); templateMobile.binding(bindingJsonObject); String resultName = StrUtil.removeSuffix(fileTemplateName, ".btl"); - if(fileTemplateName.equalsIgnoreCase("Api.js.btl")) { + if("Api.js.btl".equalsIgnoreCase(fileTemplateName)) { resultName = StrUtil.lowerFirst(genBasic.getClassName()) + resultName; genBasicCodeMobileResult.setCodeFileName(resultName); genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + fileTemplatePath + File.separator + resultName); diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java index 2b7902bd..c14a845c 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java @@ -88,7 +88,7 @@ public class MobileMenuServiceImpl extends ServiceImpl originDataList = this.list(new LambdaQueryWrapper().eq(MobileMenu::getCategory, MobileResourceCategoryEnum.MENU.getValue())); - if(!mobileMenuAddParam.getParentId().equals("0")) { + if(!"0".equals(mobileMenuAddParam.getParentId())) { MobileMenu parentMenu = this.getById(originDataList, mobileMenuAddParam.getParentId()); if(ObjectUtil.isEmpty(parentMenu)) { throw new CommonException("上级菜单不存在，id值为：{}", mobileMenuAddParam.getParentId()); @@ -118,7 +118,7 @@ public class MobileMenuServiceImpl extends ServiceImpl mobileMenuList = this.list(new LambdaQueryWrapper().eq(MobileMenu::getCategory, @@ -215,9 +215,15 @@ public class MobileMenuServiceImpl extends ServiceImpl { - if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MODULE.getValue())) mobileModuleList.add(mobileMenu); - if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MENU.getValue())) mobileMenuList.add(mobileMenu); - if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.BUTTON.getValue())) mobileButtonList.add(mobileMenu); + if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MODULE.getValue())) { + mobileModuleList.add(mobileMenu); + } + if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MENU.getValue())) { + mobileMenuList.add(mobileMenu); + } + if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.BUTTON.getValue())) { + mobileButtonList.add(mobileMenu); + } }); List leafMenuList = CollectionUtil.newArrayList(); List> treeNodeList = mobileMenuList.stream().map(mobileMenu -> @@ -323,7 +329,7 @@ public class MobileMenuServiceImpl extends ServiceImpl currentNode = resultList.get(0); - if(currentNode.getId().equals("0") || currentNode.getParentId().equals("0")) { + if("0".equals(currentNode.getId()) || "0".equals(currentNode.getParentId())) { jsonObject.set("parentId", mobileMenu.getId()); jsonObject.set("parentName", mobileMenu.getTitle()); } else { diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java index b2ace19e..6eb3c444 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java @@ -264,7 +264,7 @@ public class SysOrgServiceImpl extends ServiceImpl impleme sysOrg.setName(orgName); sysOrg.setCode(RandomUtil.randomString(10)); sysOrg.setParentId(parentId); - sysOrg.setCategory(parentId.equals("0")?SysOrgCategoryEnum.COMPANY.getValue():SysOrgCategoryEnum.DEPT.getValue()); + sysOrg.setCategory("0".equals(parentId)?SysOrgCategoryEnum.COMPANY.getValue():SysOrgCategoryEnum.DEPT.getValue()); sysOrg.setSortCode(99); this.save(sysOrg); // 发布增加事件 diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java index ece25ab6..87f3d292 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java @@ -155,7 +155,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } List originDataList = this.list(new LambdaQueryWrapper().eq(SysMenu::getCategory, SysResourceCategoryEnum.MENU.getValue())); - if(!sysMenuAddParam.getParentId().equals("0")) { + if(!"0".equals(sysMenuAddParam.getParentId())) { SysMenu parentMenu = this.getById(originDataList, sysMenuAddParam.getParentId()); if(ObjectUtil.isEmpty(parentMenu)) { throw new CommonException("上级菜单不存在，id值为：{}", sysMenuAddParam.getParentId()); @@ -175,7 +175,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public String addForGenMenu(String parentId, String busName, String title, String module, String path) { // 参数校验 - if(!parentId.equals("0")) { + if(!"0".equals(parentId)) { SysMenu parentMenu = this.queryEntity(parentId); if(ObjectUtil.isEmpty(parentMenu)) { throw new CommonException("上级菜单不存在，id值为：{}", parentId); @@ -249,7 +249,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl if(errorLevel) { throw new CommonException("不可选择上级菜单：{}", this.getById(originDataList, sysMenu.getParentId()).getName()); } - if(!sysMenuEditParam.getParentId().equals("0")) { + if(!"0".equals(sysMenuEditParam.getParentId())) { SysMenu parentMenu = this.getById(originDataList, sysMenuEditParam.getParentId()); if(ObjectUtil.isEmpty(parentMenu)) { throw new CommonException("上级菜单不存在，id值为：{}", sysMenuEditParam.getParentId()); @@ -267,7 +267,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public void changeModule(SysMenuChangeModuleParam sysMenuChangeModuleParam) { SysMenu sysMenu = this.queryEntity(sysMenuChangeModuleParam.getId()); - if(!sysMenu.getParentId().equals("0")) { + if(!"0".equals(sysMenu.getParentId())) { throw new CommonException("非顶级菜单不可修改所属模块"); } List sysMenuList = this.list(new LambdaQueryWrapper().eq(SysMenu::getCategory, diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java index 8a63b521..434b1ca2 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -336,9 +336,15 @@ public class SysRoleServiceImpl extends ServiceImpl impl List sysMenuList = CollectionUtil.newArrayList(); List sysButtonList = CollectionUtil.newArrayList(); allMenuAndButtonAndFieldList.forEach(sysMenu -> { - if (sysMenu.getCategory().equals(SysResourceCategoryEnum.MODULE.getValue())) sysModuleList.add(sysMenu); - if (sysMenu.getCategory().equals(SysResourceCategoryEnum.MENU.getValue())) sysMenuList.add(sysMenu); - if (sysMenu.getCategory().equals(SysResourceCategoryEnum.BUTTON.getValue())) sysButtonList.add(sysMenu); + if (sysMenu.getCategory().equals(SysResourceCategoryEnum.MODULE.getValue())) { + sysModuleList.add(sysMenu); + } + if (sysMenu.getCategory().equals(SysResourceCategoryEnum.MENU.getValue())) { + sysMenuList.add(sysMenu); + } + if (sysMenu.getCategory().equals(SysResourceCategoryEnum.BUTTON.getValue())) { + sysButtonList.add(sysMenu); + } }); List leafMenuList = CollectionUtil.newArrayList(); SysMenu rootSysMenu = new SysMenu(); @@ -485,7 +491,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl JSONObject jsonObject = JSONUtil.createObj(); if(ObjectUtil.isNotEmpty(resultList)) { Tree currentNode = resultList.get(0); - if(currentNode.getId().equals("0") || currentNode.getParentId().equals("0")) { + if("0".equals(currentNode.getId()) || "0".equals(currentNode.getParentId())) { jsonObject.set("parentId", sysMenu.getId()); jsonObject.set("parentName", sysMenu.getTitle()); } else { diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index ede375a1..f9dafc13 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -689,7 +689,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } // 将根菜单的父id设置为模块的id if (sysMenu.getCategory().equals(SysResourceCategoryEnum.MENU.getValue())) { - if (sysMenu.getParentId().equals("0")) { + if ("0".equals(sysMenu.getParentId())) { sysMenu.setParentId(sysMenu.getModule()); } }