From 800ee8e8d5750402ee2519ac214a06afe7398947 Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 5 Sep 2025 18:35:57 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ruoyi):=E8=B0=83=E6=95=B4=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=E6=B3=A8=E8=A7=A3-=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=BA=86=20IMMessageTemplateController=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20@SaCheckPermission=20=E6=B3=A8=E8=A7=A3=20-=20?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E4=BA=86=20SysMenuController=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=20@SaCheckRole=20=E6=B3=A8=E8=A7=A3=20-=20?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=BA=86=E5=BF=85=E8=A6=81=E7=9A=84=20@SaChe?= =?UTF-8?q?ckPermission=20=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IMMessageTemplateController.java | 12 ++++++------ .../system/controller/SysMenuController.java | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageTemplateController.java b/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageTemplateController.java index 457d4035a..09e01e637 100644 --- a/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageTemplateController.java +++ b/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageTemplateController.java @@ -43,7 +43,7 @@ public class IMMessageTemplateController extends BaseController { /** * 查询消息模板列表 */ - @SaCheckPermission("system:message:template:list") +// @SaCheckPermission("message:template:list") @Tag(name = "查询消息模板列表") @PostMapping("/page") public R> list(@RequestBody SysMessageTemplateBo bo, @RequestBody Page page) { @@ -56,7 +56,7 @@ public class IMMessageTemplateController extends BaseController { * * @param id 消息模板ID */ - @SaCheckPermission("system:message:template:query") +// @SaCheckPermission("message:template:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "消息模板ID不能为空") @PathVariable Long id) { SysMessageTemplate template = templateService.getById(id); @@ -68,7 +68,7 @@ public class IMMessageTemplateController extends BaseController { * * @param name 模板名称（可选，支持模糊查询） */ - @SaCheckPermission("system:message:template:query") +// @SaCheckPermission("message:template:query") @Operation(summary = "根据名称查询消息模板列表（不分页）") @GetMapping("/listByName") public R> listByName(@RequestParam(value = "name", required = false) String[] name) { @@ -82,7 +82,7 @@ public class IMMessageTemplateController extends BaseController { /** * 新增消息模板 */ - @SaCheckPermission("system:message:template:add") +// @SaCheckPermission("message:template:add") @Log(title = "消息模板管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/add") @@ -93,7 +93,7 @@ public class IMMessageTemplateController extends BaseController { /** * 修改消息模板 */ - @SaCheckPermission("system:message:template:edit") +// @SaCheckPermission("message:template:edit") @Log(title = "消息模板管理", businessType = BusinessType.UPDATE) @PostMapping(("/update")) public R edit(@Validated(EditGroup.class) @RequestBody SysMessageTemplateBo bo) { @@ -105,7 +105,7 @@ public class IMMessageTemplateController extends BaseController { * * @param id 消息模板ID */ - @SaCheckPermission("system:message:template:remove") +// @SaCheckPermission("message:template:remove") @Log(title = "消息模板管理", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") public R remove(@NotEmpty(message = "消息模板ID不能为空") @PathVariable Long id) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysMenuController.java index 92e65333e..790625515 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysMenuController.java @@ -51,10 +51,10 @@ public class SysMenuController extends BaseController { /** * 获取菜单列表 */ - @SaCheckRole(value = { - TenantConstants.SUPER_ADMIN_ROLE_KEY, - TenantConstants.TENANT_ADMIN_ROLE_KEY - }, mode = SaMode.OR) +// @SaCheckRole(value = { +// TenantConstants.SUPER_ADMIN_ROLE_KEY, +// TenantConstants.TENANT_ADMIN_ROLE_KEY +// }, mode = SaMode.OR) @SaCheckPermission("system:menu:list") @GetMapping("/list") public R> list(SysMenuBo menu) { @@ -67,10 +67,10 @@ public class SysMenuController extends BaseController { * * @param menuId 菜单ID */ - @SaCheckRole(value = { - TenantConstants.SUPER_ADMIN_ROLE_KEY, - TenantConstants.TENANT_ADMIN_ROLE_KEY - }, mode = SaMode.OR) +// @SaCheckRole(value = { +// TenantConstants.SUPER_ADMIN_ROLE_KEY, +// TenantConstants.TENANT_ADMIN_ROLE_KEY +// }, mode = SaMode.OR) @SaCheckPermission("system:menu:query") @GetMapping(value = "/{menuId}") public R getInfo(@PathVariable Long menuId) { @@ -107,7 +107,7 @@ public class SysMenuController extends BaseController { * * @param packageId 租户套餐ID */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:menu:query") @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}") public R tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) {