From 9c5c6c6be767feba9a8d92b7c8a85a32125854dd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 18 Oct 2021 10:59:56 +0800
Subject: [PATCH] 优化获取缓存信息方式
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index 3c75107..cb801a2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -14,14 +14,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.SecurityUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.PreAuthorize;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysUserRole;
@@ -43,7 +43,7 @@
@Autowired
private ISysUserService userService;
- @PreAuthorize(hasPermi = "system:role:list")
+ @RequiresPermissions("system:role:list")
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
@@ -53,7 +53,7 @@
}
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
- @PreAuthorize(hasPermi = "system:role:export")
+ @RequiresPermissions("system:role:export")
@PostMapping("/export")
public void export(HttpServletResponse response, SysRole role) throws IOException
{
@@ -65,7 +65,7 @@
/**
* 根据角色编号获取详细信息
*/
- @PreAuthorize(hasPermi = "system:role:query")
+ @RequiresPermissions("system:role:query")
@GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId)
{
@@ -76,7 +76,7 @@
/**
* 新增角色
*/
- @PreAuthorize(hasPermi = "system:role:add")
+ @RequiresPermissions("system:role:add")
@Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysRole role)
@@ -97,7 +97,7 @@
/**
* 修改保存角色
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysRole role)
@@ -118,7 +118,7 @@
/**
* 修改保存数据权限
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
public AjaxResult dataScope(@RequestBody SysRole role)
@@ -130,7 +130,7 @@
/**
* 状态修改
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role)
@@ -143,7 +143,7 @@
/**
* 删除角色
*/
- @PreAuthorize(hasPermi = "system:role:remove")
+ @RequiresPermissions("system:role:remove")
@Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds)
@@ -154,7 +154,7 @@
/**
* 获取角色选择框列表
*/
- @PreAuthorize(hasPermi = "system:role:query")
+ @RequiresPermissions("system:role:query")
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
@@ -163,7 +163,7 @@
/**
* 查询已分配用户角色列表
*/
- @PreAuthorize(hasPermi = "system:role:list")
+ @RequiresPermissions("system:role:list")
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
@@ -175,7 +175,7 @@
/**
* 查询未分配用户角色列表
*/
- @PreAuthorize(hasPermi = "system:role:list")
+ @RequiresPermissions("system:role:list")
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
@@ -187,7 +187,7 @@
/**
* 取消授权用户
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
@@ -198,7 +198,7 @@
/**
* 批量取消授权用户
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
@@ -209,7 +209,7 @@
/**
* 批量选择用户授权
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
--
Gitblit v1.9.3