From 8c029a3dc39e8df18a693b6c1eefb33ace80d8f4 Mon Sep 17 00:00:00 2001 From: KonBAI <1527468660@qq.com> Date: Tue, 15 Feb 2022 14:20:20 +0000 Subject: [PATCH] =?UTF-8?q?!10=20sync=20=E5=90=8C=E6=AD=A5ruoyi-vue-plus?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20update=20sa-token=201.28.0=20=3D>=201.29.0?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8DXss=E6=B3=A8=E8=A7=A3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=80=BC=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=97=A0=E8=BF=94=E5=9B=9E=E5=80=BC=E6=97=B6=EF=BC=8C=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=B3=A8=E9=87=8A=E4=B8=8A=E7=9A=84@HTTP4O4=20update?= =?UTF-8?q?=20=E4=BD=BF=E7=94=A8=20satoken=20=E8=87=AA=E5=B8=A6=E7=9A=84?= =?UTF-8?q?=20BCrypt=20=E5=B7=A5=E5=85=B7=20=E6=9B=BF=E6=8D=A2=20Security?= =?UTF-8?q?=20=E5=8A=A0=E5=AF=86=E5=B7=A5=E5=85=B7=20=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=20=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=96=B9=E6=B3=95=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E6=A0=BC=E5=BC=8F=20fix=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20R=20=E5=8F=82=E6=95=B0=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20fix=20=E4=BF=AE=E5=A4=8D=20=E9=AA=8C=E8=AF=81=E7=A0=81=20?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98=20update?= =?UTF-8?q?=20=E8=BF=94=E5=9B=9E=E4=BD=93=20=E7=BB=9F=E4=B8=80=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6file-uplo?= =?UTF-8?q?ad=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6=EF=BC=8C=E5=88=97=E8=A1=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E6=96=87=E4=BB=B6=E6=AF=94=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=B0=91=E4=B8=80=E4=B8=AA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20update=20=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E6=A0=A1=E9=AA=8C=20=E5=A2=9E=E5=8A=A0=20uuid=20?= =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD=20update=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20fix=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9B=A0=E5=8D=87=E7=BA=A7=20sa-token=20=E5=AF=BC=E8=87=B4=20d?= =?UTF-8?q?oLogin=20=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=20token=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20update=20=E6=9B=B4=E6=96=B0=20swagger=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=E9=94=99=E8=AF=AF=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=20update=20=E4=BC=98=E5=8C=96=20TreeBuildUtils=20=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=20=E4=BD=BF=E7=94=A8=E5=8F=8D=E5=B0=84=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96=E9=A1=B6=E7=BA=A7=E7=88=B6id=20fix?= =?UTF-8?q?=20=E5=9B=9E=E6=BB=9A=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20update=20=E4=BD=BF=E7=94=A8=20hutool=20Dict=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20JsonUtils=20=E9=98=B2=E6=AD=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8=20update=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=96=B0=20JsonUtils.parseMap=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 13 +++++ .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 7 +++ .gitignore | 3 ++ pom.xml | 2 +- .../system/SysConfigController.java | 2 +- .../system/SysDictDataController.java | 2 +- .../system/SysDictTypeController.java | 2 +- .../controller/system/SysOssController.java | 25 ++-------- .../system/SysProfileController.java | 9 ++-- .../system/SysRegisterController.java | 4 +- .../controller/system/SysUserController.java | 12 ++--- .../workflow/FlowDefinitionController.java | 16 +++---- .../main/resources/i18n/messages.properties | 1 - ruoyi-common/pom.xml | 5 -- .../ruoyi/common/constant/GenConstants.java | 5 ++ .../core/controller/BaseController.java | 32 +------------ .../java/com/ruoyi/common/core/domain/R.java | 4 +- .../common/core/domain/model/LoginBody.java | 3 +- .../com/ruoyi/common/helper/LoginHelper.java | 15 ++++++ .../com/ruoyi/common/utils/JsonUtils.java | 18 +++++-- .../com/ruoyi/common/utils/SecurityUtils.java | 47 ------------------- .../com/ruoyi/common/utils/ServletUtils.java | 13 ++--- .../ruoyi/common/utils/TreeBuildUtils.java | 10 +++- .../ruoyi/common/utils/ip/AddressUtils.java | 11 ++--- .../config/properties/SwaggerProperties.java | 12 +++-- .../handler/PlusDataPermissionHandler.java | 3 +- .../listener/UserActionListener.java | 2 +- .../service/GenTableServiceImpl.java | 25 ++++++---- .../com/ruoyi/generator/util/GenUtils.java | 4 +- .../ruoyi/generator/util/VelocityUtils.java | 26 +++++----- .../main/resources/vm/java/service.java.vm | 38 ++++++++++----- .../resources/vm/java/serviceImpl.java.vm | 42 +++++++++++++++-- .../listener/SysUserImportListener.java | 4 +- .../ruoyi/system/mapper/SysUserMapper.java | 2 +- .../system/service/ISysConfigService.java | 1 - .../system/service/ISysDictDataService.java | 1 - .../system/service/ISysDictTypeService.java | 1 - .../system/service/ISysLogininforService.java | 2 +- .../ruoyi/system/service/ISysPostService.java | 1 - .../ruoyi/system/service/SysLoginService.java | 7 +-- .../system/service/SysRegisterService.java | 7 +-- .../service/impl/SysConfigServiceImpl.java | 1 - .../service/impl/SysDeptServiceImpl.java | 3 +- .../service/impl/SysDictDataServiceImpl.java | 1 - .../service/impl/SysDictTypeServiceImpl.java | 1 - .../impl/SysLogininforServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 7 ++- .../service/impl/SysPostServiceImpl.java | 1 - .../service/impl/SysRoleServiceImpl.java | 2 +- .../service/impl/SysSensitiveServiceImpl.java | 3 +- ruoyi-ui/src/components/FileUpload/index.vue | 2 +- ruoyi-ui/src/router/index.js | 2 +- .../{drawingDefalut.js => drawingDefault.js} | 0 .../src/views/tool/build/CodeTypeDialog.vue | 16 +++---- .../src/views/tool/build/TreeNodeDialog.vue | 15 ++---- ruoyi-ui/src/views/tool/build/index.vue | 2 +- ruoyi-ui/src/views/tool/gen/editTable.vue | 2 +- ruoyi-ui/src/views/tool/gen/index.vue | 2 +- 58 files changed, 246 insertions(+), 255 deletions(-) create mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md create mode 100644 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md delete mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename ruoyi-ui/src/utils/generator/{drawingDefalut.js => drawingDefault.js} (100%) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md new file mode 100644 index 00000000..22cb51d5 --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -0,0 +1,13 @@ +### 使用版本 + + +### 问题描述 + + +### 希望结果 + + +### 重现步骤 + + +### 报错信息(截图为主 请勿发混乱格式) \ No newline at end of file diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md new file mode 100644 index 00000000..9429a8e8 --- /dev/null +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -0,0 +1,7 @@ +### 更改目的 解决了什么问题 + + +### 描述 做了哪些改动 + + +### 测试 都做了哪些测试(未经过测试不采纳) \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4fbb2fe7..9e339689 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,9 @@ target/ *.iml *.ipr +### JRebel ### +rebel.xml + ### NetBeans ### nbproject/private/ build/* diff --git a/pom.xml b/pom.xml index 5f8949ac..5015baa7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 3.0.5 3.3.0 2.3 - 1.28.0 + 1.29.0 3.5.1 3.9.1 5.7.20 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 8cbea8eb..2dcb8437 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -121,7 +121,7 @@ public class SysConfigController extends BaseController { @DeleteMapping("/{configIds}") public R remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) { configService.deleteConfigByIds(configIds); - return success(); + return R.ok(); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index cf23f861..060e980e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -108,6 +108,6 @@ public class SysDictDataController extends BaseController { @DeleteMapping("/{dictCodes}") public R remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); - return success(); + return R.ok(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 54e31e47..c8ebd49b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -98,7 +98,7 @@ public class SysDictTypeController extends BaseController { @DeleteMapping("/{dictIds}") public R remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); - return success(); + return R.ok(); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index 15b30750..55fb73b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -9,16 +9,13 @@ import cn.hutool.http.HttpUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; @@ -45,7 +42,7 @@ import java.util.Map; * @author Lion Li */ @Validated -@Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"}) +@Api(value = "对象存储控制器", tags = {"对象存储管理"}) @RequiredArgsConstructor @RestController @RequestMapping("/system/oss") @@ -69,7 +66,7 @@ public class SysOssController extends BaseController { */ @ApiOperation("上传OSS对象存储") @ApiImplicitParams({ - @ApiImplicitParam(name = "file", value = "文件", dataTypeClass = File.class, required = true), + @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true) }) @SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @@ -123,20 +120,4 @@ public class SysOssController extends BaseController { return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0); } - /** - * 变更图片列表预览状态 - */ - @ApiOperation("变更图片列表预览状态") - @SaCheckPermission("system:oss:edit") - @Log(title = "OSS对象存储", businessType = BusinessType.UPDATE) - @PutMapping("/changePreviewListResource") - public R changePreviewListResource(@RequestBody String body) { - Map map = JsonUtils.parseMap(body); - SysConfig sysConfig = new SysConfig(); - sysConfig.setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY); - SysConfig config = iSysConfigService.getOne(sysConfig); - config.setConfigValue(map.get("previewListResource").toString()); - return toAjax(iSysConfigService.updateConfig(config)); - } - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index c69f0615..84d4c0b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.system; +import cn.dev33.satoken.secure.BCrypt; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -7,7 +8,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.service.ISysOssService; @@ -92,13 +92,14 @@ public class SysProfileController extends BaseController { SysUser user = userService.selectUserById(LoginHelper.getUserId()); String userName = user.getUserName(); String password = user.getPassword(); - if (!SecurityUtils.matchesPassword(oldPassword, password)) { + if (!BCrypt.checkpw(oldPassword, password)) { return R.fail("修改密码失败，旧密码错误"); } - if (SecurityUtils.matchesPassword(newPassword, password)) { + if (BCrypt.checkpw(newPassword, password)) { return R.fail("新密码不能与旧密码相同"); } - if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) { + + if (userService.resetUserPwd(userName, BCrypt.hashpw(newPassword)) > 0) { return R.ok(); } return R.fail("修改密码异常，请联系管理员"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index c1c79503..6595f06d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -31,9 +31,9 @@ public class SysRegisterController extends BaseController { @PostMapping("/register") public R register(@Validated @RequestBody RegisterBody user) { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { - return error("当前系统没有开启注册功能！"); + return R.fail("当前系统没有开启注册功能！"); } registerService.register(user); - return success(); + return R.ok(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index ac81600e..0c2e9e02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -1,21 +1,21 @@ package com.ruoyi.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.vo.SysUserExportVo; @@ -137,7 +137,7 @@ public class SysUserController extends BaseController { && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + user.setPassword(BCrypt.hashpw(user.getPassword())); return toAjax(userService.insertUser(user)); } @@ -170,7 +170,7 @@ public class SysUserController extends BaseController { @DeleteMapping("/{userIds}") public R remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) { if (ArrayUtil.contains(userIds, getUserId())) { - return error("当前用户不能删除"); + return R.fail("当前用户不能删除"); } return toAjax(userService.deleteUserByIds(userIds)); } @@ -185,7 +185,7 @@ public class SysUserController extends BaseController { public R resetPwd(@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + user.setPassword(BCrypt.hashpw(user.getPassword())); return toAjax(userService.resetPwd(user)); } @@ -231,6 +231,6 @@ public class SysUserController extends BaseController { public R insertAuthRole(Long userId, Long[] roleIds) { userService.checkUserDataScope(userId); userService.insertUserAuth(userId, roleIds); - return success(); + return R.ok(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java index 34e5fdcc..bb9ecfd0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java @@ -83,10 +83,10 @@ public class FlowDefinitionController extends BaseController { flowDefinitionService.importFile(name, category, in); } catch (Exception e) { log.error("导入失败:", e); - return error(e.getMessage()); + return R.fail(e.getMessage()); } - return success("导入成功"); + return R.ok("导入成功"); } @@ -94,7 +94,7 @@ public class FlowDefinitionController extends BaseController { @GetMapping("/readXml/{definitionId}") public R readXml(@ApiParam(value = "流程定义ID") @PathVariable(value = "definitionId") String definitionId) { try { - return R.ok(flowDefinitionService.readXml(definitionId), null); + return R.ok(null, flowDefinitionService.readXml(definitionId)); } catch (Exception e) { return R.fail("加载xml文件异常"); } @@ -124,10 +124,10 @@ public class FlowDefinitionController extends BaseController { flowDefinitionService.importFile(vo.getName(), vo.getCategory(), in); } catch (Exception e) { log.error("导入失败:", e); - return success(e.getMessage()); + return R.ok(e.getMessage()); } - return success("导入成功"); + return R.ok("导入成功"); } @@ -136,7 +136,7 @@ public class FlowDefinitionController extends BaseController { public R start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { flowDefinitionService.startProcessInstanceById(procDefId, variables); - return success("流程启动成功"); + return R.ok("流程启动成功"); } @@ -145,14 +145,14 @@ public class FlowDefinitionController extends BaseController { public R updateState(@ApiParam(value = "ture:挂起,false:激活", required = true) @RequestParam Boolean suspended, @ApiParam(value = "流程定义ID", required = true) @RequestParam String definitionId) { flowDefinitionService.updateState(suspended, definitionId); - return success(); + return R.ok(); } @ApiOperation(value = "删除流程") @DeleteMapping(value = "/delete") public R delete(@ApiParam(value = "流程部署ID", required = true) @RequestParam String deployId) { flowDefinitionService.delete(deployId); - return success(); + return R.ok(); } @ApiOperation(value = "指定流程办理人员列表") diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin/src/main/resources/i18n/messages.properties index 06e85c1e..ee68c98c 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages.properties @@ -1,6 +1,5 @@ #错误消息 not.null=* 必须填写 -user.jcaptcha.blank=验证码不能为空 user.jcaptcha.error=验证码错误 user.jcaptcha.expire=验证码已失效 user.not.exists=对不起, 您的账号：{0} 不存在. diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 9b265ee5..71c74762 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -40,11 +40,6 @@ sa-token-jwt - - org.springframework.security - spring-security-crypto - - org.springframework.boot diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java index 60bf8813..bb08d50a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java @@ -181,6 +181,11 @@ public interface GenConstants { */ String QUERY_LIKE = "LIKE"; + /** + * 相等查询 + */ + String QUERY_EQ = "EQ"; + /** * 需要 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 611cb156..1e0a5d52 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -8,38 +8,10 @@ import com.ruoyi.common.utils.StringUtils; /** * web层通用数据处理 * - * @author ruoyi + * @author Lion Li */ public class BaseController { - /** - * 返回成功 - */ - public R success() { - return R.ok(); - } - - /** - * 返回失败消息 - */ - public R error() { - return R.fail(); - } - - /** - * 返回成功消息 - */ - public R success(String message) { - return R.ok(message); - } - - /** - * 返回失败消息 - */ - public R error(String message) { - return R.fail(message); - } - /** * 响应返回结果 * @@ -57,7 +29,7 @@ public class BaseController { * @return 操作结果 */ protected R toAjax(boolean result) { - return result ? success() : error(); + return result ? R.ok() : R.fail(); } /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java index 8fa4a649..f868e8e7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java @@ -49,7 +49,7 @@ public class R implements Serializable { return restResult(null, SUCCESS, msg); } - public static R ok(T data, String msg) { + public static R ok(String msg, T data) { return restResult(data, SUCCESS, msg); } @@ -65,7 +65,7 @@ public class R implements Serializable { return restResult(data, FAIL, null); } - public static R fail(T data, String msg) { + public static R fail(String msg, T data) { return restResult(data, FAIL, msg); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java index 289727a2..f13de971 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java @@ -37,7 +37,6 @@ public class LoginBody { /** * 验证码 */ - @NotBlank(message = "{user.jcaptcha.blank}") @ApiModelProperty(value = "验证码") private String code; @@ -45,6 +44,6 @@ public class LoginBody { * 唯一标识 */ @ApiModelProperty(value = "唯一标识") - private String uuid = ""; + private String uuid; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java index 1239f55b..4b1f83f4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java @@ -125,4 +125,19 @@ public class LoginHelper { return UserType.getUserType(loginId); } + /** + * 是否为管理员 + * + * @param userId 用户ID + * @return 结果 + */ + public static boolean isAdmin(Long userId) { + return userId != null && 1L == userId; + } + + public static boolean isAdmin() { + Long userId = getUserId(); + return userId != null && 1L == userId; + } + } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java index 11004be8..446bf1b0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java @@ -1,5 +1,6 @@ package com.ruoyi.common.utils; +import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonProcessingException; @@ -12,7 +13,6 @@ import lombok.NoArgsConstructor; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * JSON 工具类 @@ -72,13 +72,23 @@ public class JsonUtils { } } - public static Map parseMap(String text) { + public static Dict parseMap(String text) { if (StringUtils.isBlank(text)) { return null; } try { - return OBJECT_MAPPER.readValue(text, new TypeReference>() { - }); + return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructType(Dict.class)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public static List parseArrayMap(String text) { + if (StringUtils.isBlank(text)) { + return null; + } + try { + return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, Dict.class)); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java deleted file mode 100644 index 72c9453c..00000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ruoyi.common.utils; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; - -/** - * 安全服务工具类 - * - * @author Long Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class SecurityUtils { - - /** - * 生成BCryptPasswordEncoder密码 - * - * @param password 密码 - * @return 加密字符串 - */ - public static String encryptPassword(String password) { - BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); - return passwordEncoder.encode(password); - } - - /** - * 判断密码是否相同 - * - * @param rawPassword 真实密码 - * @param encodedPassword 加密后字符 - * @return 结果 - */ - public static boolean matchesPassword(String rawPassword, String encodedPassword) { - BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); - return passwordEncoder.matches(rawPassword, encodedPassword); - } - - /** - * 是否为管理员 - * - * @param userId 用户ID - * @return 结果 - */ - public static boolean isAdmin(Long userId) { - return userId != null && 1L == userId; - } -} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java index 5babaeb3..6408c894 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java @@ -97,9 +97,8 @@ public class ServletUtils extends ServletUtil { * * @param response 渲染对象 * @param string 待渲染的字符串 - * @return null */ - public static String renderString(HttpServletResponse response, String string) { + public static void renderString(HttpServletResponse response, String string) { try { response.setStatus(HttpStatus.HTTP_OK); response.setContentType(MediaType.APPLICATION_JSON_VALUE); @@ -108,7 +107,6 @@ public class ServletUtils extends ServletUtil { } catch (IOException e) { e.printStackTrace(); } - return null; } /** @@ -119,12 +117,12 @@ public class ServletUtils extends ServletUtil { public static boolean isAjaxRequest(HttpServletRequest request) { String accept = request.getHeader("accept"); - if (accept != null && accept.indexOf("application/json") != -1) { + if (accept != null && accept.contains("application/json")) { return true; } String xRequestedWith = request.getHeader("X-Requested-With"); - if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) { + if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) { return true; } @@ -134,10 +132,7 @@ public class ServletUtils extends ServletUtil { } String ajax = request.getParameter("__ajax"); - if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) { - return true; - } - return false; + return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml"); } public static String getClientIP() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java index 76bf864f..f9f8fa14 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java @@ -1,9 +1,11 @@ package com.ruoyi.common.utils; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; +import com.ruoyi.common.utils.reflect.ReflectUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -22,8 +24,12 @@ public class TreeBuildUtils extends TreeUtil { */ public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label"); - public static List> build(List list, Long parentId, NodeParser nodeParser) { - return TreeUtil.build(list, parentId, DEFAULT_CONFIG, nodeParser); + public static List> build(List list, NodeParser nodeParser) { + if (CollUtil.isEmpty(list)) { + return null; + } + K k = ReflectUtils.invokeGetter(list.get(0), "parentId"); + return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java index 1d612305..8d3515e7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java @@ -1,5 +1,6 @@ package com.ruoyi.common.utils.ip; +import cn.hutool.core.lang.Dict; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; import cn.hutool.http.HttpUtil; @@ -11,8 +12,6 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.util.Map; - /** * 获取地址类 * @@ -48,14 +47,14 @@ public class AddressUtils { log.error("获取地理位置异常 {}", ip); return UNKNOWN; } - Map obj = JsonUtils.parseMap(rspStr); - String region = obj.get("pro"); - String city = obj.get("city"); + Dict obj = JsonUtils.parseMap(rspStr); + String region = obj.getStr("pro"); + String city = obj.getStr("city"); return String.format("%s %s", region, city); } catch (Exception e) { log.error("获取地理位置异常 {}", ip); } } - return address; + return UNKNOWN; } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java index c2b3f97b..7293e1e9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java @@ -18,23 +18,27 @@ import java.util.List; public class SwaggerProperties { /** - * 验证码类型 + * 文档开关 */ private Boolean enabled; + /** * 设置请求的统一前缀 */ private String pathMapping; + /** - * 验证码类别 + * 标头 */ private String title; + /** - * 数字验证码位数 + * 描述 */ private String description; + /** - * 字符验证码长度 + * 项目版本 */ private String version; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java index 5e762424..f2a60a41 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java @@ -13,7 +13,6 @@ import com.ruoyi.common.enums.DataScopeType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.DataPermissionHelper; import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; @@ -80,7 +79,7 @@ public class PlusDataPermissionHandler { DataPermissionHelper.setVariable("user", currentUser); } // 如果是超级管理员，则不过滤数据 - if (ObjectUtil.isNull(currentUser) || SecurityUtils.isAdmin(currentUser.getUserId())) { + if (ObjectUtil.isNull(currentUser) || LoginHelper.isAdmin(currentUser.getUserId())) { return where; } String dataFilterSql = buildDataFilter(dataColumns, isSelect); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java index bbd92141..c4252b44 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java @@ -42,7 +42,7 @@ public class UserActionListener implements SaTokenListener { UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); String ip = ServletUtils.getClientIP(); LoginUser user = LoginHelper.getLoginUser(); - String tokenValue = StpUtil.getTokenValue(); + String tokenValue = StpUtil.getTokenValueByLoginId(loginId); UserOnlineDTO dto = new UserOnlineDTO(); dto.setIpaddr(ip); dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip)); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index 8f6a40fe..787c80ce 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -1,8 +1,8 @@ package com.ruoyi.generator.service; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; +import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -294,8 +294,17 @@ public class GenTableServiceImpl implements IGenTableService { GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); column.setColumnId(prevColumn.getColumnId()); if (column.isList()) { - // 如果是列表，继续保留字典类型 + // 如果是列表，继续保留查询方式/字典类型选项 column.setDictType(prevColumn.getDictType()); + column.setQueryType(prevColumn.getQueryType()); + } + if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() + && (column.isInsert() || column.isEdit()) + && ((column.isUsableColumn()) || (!column.isSuperColumn()))) + { + // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项 + column.setIsRequired(prevColumn.getIsRequired()); + column.setHtmlType(prevColumn.getHtmlType()); } genTableColumnMapper.updateById(column); } else { @@ -436,13 +445,13 @@ public class GenTableServiceImpl implements IGenTableService { * @param genTable 设置后的生成对象 */ public void setTableFromOptions(GenTable genTable) { - Map paramsObj = JsonUtils.parseMap(genTable.getOptions()); + Dict paramsObj = JsonUtils.parseMap(genTable.getOptions()); if (ObjectUtil.isNotNull(paramsObj)) { - String treeCode = Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)); - String treeParentCode = Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)); - String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)); - String parentMenuId = Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)); - String parentMenuName = Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_NAME)); + String treeCode = paramsObj.getStr(GenConstants.TREE_CODE); + String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE); + String treeName = paramsObj.getStr(GenConstants.TREE_NAME); + String parentMenuId = paramsObj.getStr(GenConstants.PARENT_MENU_ID); + String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME); genTable.setTreeCode(treeCode); genTable.setTreeParentCode(treeParentCode); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java index cb977d94..1a1d04ac 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -41,6 +41,7 @@ public class GenUtils { column.setJavaField(StringUtils.toCamelCase(columnName)); // 设置默认类型 column.setJavaType(GenConstants.TYPE_STRING); + column.setQueryType(GenConstants.QUERY_EQ); if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) { // 字符串长度超过500设置为文本域 @@ -136,8 +137,7 @@ public class GenUtils { public static String getModuleName(String packageName) { int lastIndex = packageName.lastIndexOf("."); int nameLength = packageName.length(); - String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength); - return moduleName; + return StringUtils.substring(packageName, lastIndex + 1, nameLength); } /** diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 67296b70..9a07ec45 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -2,6 +2,7 @@ package com.ruoyi.generator.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.utils.DateUtils; @@ -78,14 +79,14 @@ public class VelocityUtils { public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); - Map paramsObj = JsonUtils.parseMap(options); + Dict paramsObj = JsonUtils.parseMap(options); String parentMenuId = getParentMenuId(paramsObj); context.put("parentMenuId", parentMenuId); } public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); - Map paramsObj = JsonUtils.parseMap(options); + Dict paramsObj = JsonUtils.parseMap(options); String treeCode = getTreecode(paramsObj); String treeParentCode = getTreeParentCode(paramsObj); String treeName = getTreeName(paramsObj); @@ -207,8 +208,7 @@ public class VelocityUtils { */ public static String getPackagePrefix(String packageName) { int lastIndex = packageName.lastIndexOf("."); - String basePackage = StringUtils.substring(packageName, 0, lastIndex); - return basePackage; + return StringUtils.substring(packageName, 0, lastIndex); } /** @@ -271,10 +271,10 @@ public class VelocityUtils { * @param paramsObj 生成其他选项 * @return 上级菜单ID字段 */ - public static String getParentMenuId(Map paramsObj) { + public static String getParentMenuId(Dict paramsObj) { if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) - && StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)))) { - return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)); + && StringUtils.isNotEmpty(paramsObj.getStr(GenConstants.PARENT_MENU_ID))) { + return paramsObj.getStr(GenConstants.PARENT_MENU_ID); } return DEFAULT_PARENT_MENU_ID; } @@ -298,9 +298,9 @@ public class VelocityUtils { * @param paramsObj 生成其他选项 * @return 树父编码 */ - public static String getTreeParentCode(Map paramsObj) { + public static String getTreeParentCode(Dict paramsObj) { if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { - return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE))); + return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_PARENT_CODE)); } return StringUtils.EMPTY; } @@ -311,9 +311,9 @@ public class VelocityUtils { * @param paramsObj 生成其他选项 * @return 树名称 */ - public static String getTreeName(Map paramsObj) { + public static String getTreeName(Dict paramsObj) { if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) { - return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME))); + return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_NAME)); } return StringUtils.EMPTY; } @@ -326,8 +326,8 @@ public class VelocityUtils { */ public static int getExpandColumn(GenTable genTable) { String options = genTable.getOptions(); - Map paramsObj = JsonUtils.parseMap(options); - String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)); + Dict paramsObj = JsonUtils.parseMap(options); + String treeName = paramsObj.getStr(GenConstants.TREE_NAME); int num = 0; for (GenTableColumn column : genTable.getColumns()) { if (column.isList()) { diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 4a3eb56b..309328ca 100644 --- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -18,43 +18,55 @@ import java.util.List; * @date ${datetime} */ public interface I${ClassName}Service { + /** - * 查询单个 - * @return + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} */ ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}); #if($table.crud || $table.sub) /** - * 查询列表 + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 */ TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery); #end /** - * 查询列表 + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 */ List<${ClassName}Vo> queryList(${ClassName}Bo bo); /** - * 根据新增业务对象插入${functionName} - * @param bo ${functionName}新增业务对象 - * @return + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 */ Boolean insertByBo(${ClassName}Bo bo); /** - * 根据编辑业务对象修改${functionName} - * @param bo ${functionName}编辑业务对象 - * @return + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 */ Boolean updateByBo(${ClassName}Bo bo); /** - * 校验并删除数据 - * @param ids 主键集合 + * 校验并批量删除${functionName}信息 + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 * @param isValid 是否校验,true-删除前校验,false-不校验 - * @return + * @return 结果 */ Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid); } diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index 2d491714..83a8f427 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -5,12 +5,12 @@ import com.ruoyi.common.utils.StringUtils; #if($table.crud || $table.sub) import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; -#end -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +#end import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.${ClassName}; @@ -33,12 +33,24 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { private final ${ClassName}Mapper baseMapper; + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ @Override public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ return baseMapper.selectVoById(${pkColumn.javaField}); } #if($table.crud || $table.sub) + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ @Override public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); @@ -47,6 +59,12 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { } #end + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ @Override public List<${ClassName}Vo> queryList(${ClassName}Bo bo) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); @@ -80,6 +98,12 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { return lqw; } + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ @Override public Boolean insertByBo(${ClassName}Bo bo) { ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class); @@ -92,6 +116,12 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { return flag; } + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ @Override public Boolean updateByBo(${ClassName}Bo bo) { ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class); @@ -108,6 +138,12 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { //TODO 做一些数据校验,如唯一约束 } + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 + * @return 结果 + */ @Override public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) { if(isValid){ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java index 20cb14d9..58f2f313 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java @@ -1,5 +1,6 @@ package com.ruoyi.system.listener; +import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.context.AnalysisContext; @@ -9,7 +10,6 @@ import com.ruoyi.common.excel.ExcelListener; import com.ruoyi.common.excel.ExcelResult; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ValidatorUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.vo.SysUserImportVo; @@ -43,7 +43,7 @@ public class SysUserImportListener extends AnalysisEventListener selectUserList(SysUser sysUser); /** - * 根据条件分页查询未已配用户角色列表 + * 根据条件分页查询已配用户角色列表 * * @param user 用户信息 * @return 用户信息集合信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index 90977078..10c4acdd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -67,7 +67,6 @@ public interface ISysConfigService { * 批量删除参数信息 * * @param configIds 需要删除的参数ID - * @return 结果 */ void deleteConfigByIds(Long[] configIds); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 35b0064b..504032ee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -45,7 +45,6 @@ public interface ISysDictDataService { * 批量删除字典数据信息 * * @param dictCodes 需要删除的字典数据ID - * @return 结果 */ void deleteDictDataByIds(Long[] dictCodes); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index 2c65b24d..5966e08c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -60,7 +60,6 @@ public interface ISysDictTypeService { * 批量删除字典信息 * * @param dictIds 需要删除的字典ID - * @return 结果 */ void deleteDictTypeByIds(Long[] dictIds); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index 88ddecc8..f63c7dd1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -35,7 +35,7 @@ public interface ISysLogininforService { * 批量删除系统登录日志 * * @param infoIds 需要删除的登录日志ID - * @return + * @return 结果 */ int deleteLogininforByIds(Long[] infoIds); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index 1bc9bbcb..9c3b78cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -84,7 +84,6 @@ public interface ISysPostService { * * @param postIds 需要删除的岗位ID * @return 结果 - * @throws Exception 异常 */ int deletePostByIds(Long[] postIds); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java index 744e13f8..5799f02d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service; +import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -16,8 +17,8 @@ import com.ruoyi.common.exception.user.UserException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -68,7 +69,7 @@ public class SysLoginService { SysUser user = loadUserByUsername(username); - if (!SecurityUtils.matchesPassword(password, user.getPassword())) { + if (!BCrypt.checkpw(password, user.getPassword())) { // 是否第一次 errorNumber = ObjectUtil.isNull(errorNumber) ? 1 : errorNumber + 1; // 达到规定错误次数 则锁定登录 @@ -104,7 +105,7 @@ public class SysLoginService { * @param uuid 唯一标识 */ public void validateCaptcha(String username, String code, String uuid, HttpServletRequest request) { - String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; + String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, ""); String captcha = RedisUtils.getCacheObject(verifyKey); RedisUtils.deleteObject(verifyKey); if (captcha == null) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java index 5f44991e..8c7274ef 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service; +import cn.dev33.satoken.secure.BCrypt; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysUser; @@ -10,8 +11,8 @@ import com.ruoyi.common.exception.user.CaptchaException; import com.ruoyi.common.exception.user.CaptchaExpireException; import com.ruoyi.common.exception.user.UserException; import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -53,7 +54,7 @@ public class SysRegisterService { SysUser sysUser = new SysUser(); sysUser.setUserName(username); sysUser.setNickName(username); - sysUser.setPassword(SecurityUtils.encryptPassword(password)); + sysUser.setPassword(BCrypt.hashpw(password)); sysUser.setUserType(userType); boolean regFlag = userService.registerUser(sysUser); if (!regFlag) { @@ -71,7 +72,7 @@ public class SysRegisterService { * @return 结果 */ public void validateCaptcha(String username, String code, String uuid, HttpServletRequest request) { - String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; + String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, ""); String captcha = RedisUtils.getCacheObject(verifyKey); RedisUtils.deleteObject(verifyKey); if (captcha == null) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 9e6e6c31..070d1dae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -153,7 +153,6 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { * 批量删除参数信息 * * @param configIds 需要删除的参数ID - * @return 结果 */ @Override public void deleteConfigByIds(Long[] configIds) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 0dd441ba..621dc078 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -60,8 +60,7 @@ public class SysDeptServiceImpl implements ISysDeptService { if (CollUtil.isEmpty(depts)) { return CollUtil.newArrayList(); } - Long parentId = depts.get(0).getParentId(); - return TreeBuildUtils.build(depts, parentId, (dept, tree) -> + return TreeBuildUtils.build(depts, (dept, tree) -> tree.setId(dept.getDeptId()) .setParentId(dept.getParentId()) .setName(dept.getDeptName()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 048bd10f..03de7c5e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -83,7 +83,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * 批量删除字典数据信息 * * @param dictCodes 需要删除的字典数据ID - * @return 结果 */ @Override public void deleteDictDataByIds(Long[] dictCodes) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 00a491c3..61d17886 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -123,7 +123,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * 批量删除字典类型信息 * * @param dictIds 需要删除的字典ID - * @return 结果 */ @Override public void deleteDictTypeByIds(Long[] dictIds) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 7c5018bb..159db624 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -140,7 +140,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService, Logininf * 批量删除系统登录日志 * * @param infoIds 需要删除的登录日志ID - * @return + * @return 结果 */ @Override public int deleteLogininforByIds(Long[] infoIds) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 431ec95f..0029ecd3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -9,7 +9,7 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.TreeBuildUtils; import com.ruoyi.system.domain.SysRoleMenu; @@ -99,7 +99,7 @@ public class SysMenuServiceImpl implements ISysMenuService { @Override public List selectMenuTreeByUserId(Long userId) { List menus = null; - if (SecurityUtils.isAdmin(userId)) { + if (LoginHelper.isAdmin(userId)) { menus = baseMapper.selectMenuTreeAll(); } else { menus = baseMapper.selectMenuTreeByUserId(userId); @@ -181,8 +181,7 @@ public class SysMenuServiceImpl implements ISysMenuService { if (CollUtil.isEmpty(menus)) { return CollUtil.newArrayList(); } - Long parentId = menus.get(0).getParentId(); - return TreeBuildUtils.build(menus, parentId, (menu, tree) -> + return TreeBuildUtils.build(menus, (menu, tree) -> tree.setId(menu.getMenuId()) .setParentId(menu.getParentId()) .setName(menu.getMenuName()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index 31071d16..7e2a56c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -148,7 +148,6 @@ public class SysPostServiceImpl implements ISysPostService { * * @param postIds 需要删除的岗位ID * @return 结果 - * @throws Exception 异常 */ @Override public int deletePostByIds(Long[] postIds) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index ff78f199..271dc975 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -374,7 +374,7 @@ public class SysRoleServiceImpl implements ISysRoleService { * 批量选择授权用户角色 * * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID + * @param userIds 需要授权的用户数据ID * @return 结果 */ @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java index 40cae236..08d4cc4f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java @@ -2,7 +2,6 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.core.service.SensitiveService; import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.SecurityUtils; import org.springframework.stereotype.Service; /** @@ -21,7 +20,7 @@ public class SysSensitiveServiceImpl implements SensitiveService { */ @Override public boolean isSensitive() { - return SecurityUtils.isAdmin(LoginHelper.getUserId()); + return LoginHelper.isAdmin(); } } diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue index a5971f23..46da967d 100644 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ b/ruoyi-ui/src/components/FileUpload/index.vue @@ -26,7 +26,7 @@ -
  • +
  • {{ getFileName(file.name) }} diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 8382b7c7..c7163b26 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -194,7 +194,7 @@ export const dynamicRoutes = [ permissions: ['tool:gen:edit'], children: [ { - path: 'index', + path: 'index/:tableId(\\d+)', component: () => import('@/views/tool/gen/editTable'), name: 'GenEdit', meta: { title: '修改生成配置', activeMenu: '/tool/gen' } diff --git a/ruoyi-ui/src/utils/generator/drawingDefalut.js b/ruoyi-ui/src/utils/generator/drawingDefault.js similarity index 100% rename from ruoyi-ui/src/utils/generator/drawingDefalut.js rename to ruoyi-ui/src/utils/generator/drawingDefault.js diff --git a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue b/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue index 97055bc7..b5c2e2e4 100644 --- a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue +++ b/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ 取消 - + 确定 @@ -79,10 +79,10 @@ export default { }] } }, - computed: {}, - watch: {}, - mounted() { + computed: { }, + watch: {}, + mounted() {}, methods: { onOpen() { if (this.showFileName) { @@ -94,7 +94,7 @@ export default { close(e) { this.$emit('update:visible', false) }, - handelConfirm() { + handleConfirm() { this.$refs.elForm.validate(valid => { if (!valid) return this.$emit('confirm', { ...this.formData }) @@ -104,7 +104,3 @@ export default { } } - - diff --git a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue b/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue index e089c0bc..fa7f0b28 100644 --- a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue +++ b/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue @@ -59,7 +59,7 @@
    确定 @@ -72,9 +72,6 @@ - - diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue index c23d39c2..01cac93f 100644 --- a/ruoyi-ui/src/views/tool/build/index.vue +++ b/ruoyi-ui/src/views/tool/build/index.vue @@ -149,7 +149,7 @@ import { beautifierConf, titleCase, deepClone, isObjectObject } from '@/utils/in import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html' import { makeUpJs } from '@/utils/generator/js' import { makeUpCss } from '@/utils/generator/css' -import drawingDefalut from '@/utils/generator/drawingDefalut' +import drawingDefalut from '@/utils/generator/drawingDefault' import logo from '@/assets/logo/logo.png' import CodeTypeDialog from './CodeTypeDialog' import DraggableItem from './DraggableItem' diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue index 8c67dc29..714e4e7c 100644 --- a/ruoyi-ui/src/views/tool/gen/editTable.vue +++ b/ruoyi-ui/src/views/tool/gen/editTable.vue @@ -159,7 +159,7 @@ export default { }; }, created() { - const tableId = this.$route.query && this.$route.query.tableId; + const tableId = this.$route.params && this.$route.params.tableId; if (tableId) { // 获取表详细信息 getGenTable(tableId).then(res => { diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue index 957ac39f..9cd57312 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -322,7 +322,7 @@ export default { /** 修改按钮操作 */ handleEditTable(row) { const tableId = row.tableId || this.ids[0]; - this.$router.push({ path: '/tool/gen-edit/index', query: { tableId: tableId, pageNum: this.queryParams.pageNum } }); + this.$router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: this.queryParams.pageNum } }); }, /** 删除按钮操作 */ handleDelete(row) {