From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
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 e646b9a..0b8a928 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -15,7 +16,6 @@
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -40,7 +40,7 @@
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
*/
@ApiOperation("鑾峰彇鍙傛暟閰嶇疆鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:config:list')")
+ @SaCheckPermission("system:config:list")
@GetMapping("/list")
public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
return configService.selectPageConfigList(config, pageQuery);
@@ -48,7 +48,7 @@
@ApiOperation("瀵煎嚭鍙傛暟閰嶇疆鍒楄〃")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
+ @SaCheckPermission("system:config:export")
@PostMapping("/export")
public void export(SysConfig config, HttpServletResponse response) {
List<SysConfig> list = configService.selectConfigList(config);
@@ -59,7 +59,7 @@
* 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:config:query')")
+ @SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
public AjaxResult<SysConfig> getInfo(@ApiParam("鍙傛暟ID") @PathVariable Long configId) {
return AjaxResult.success(configService.selectConfigById(configId));
@@ -78,7 +78,7 @@
* 鏂板鍙傛暟閰嶇疆
*/
@ApiOperation("鏂板鍙傛暟閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:config:add')")
+ @SaCheckPermission("system:config:add")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) {
@@ -92,7 +92,7 @@
* 淇敼鍙傛暟閰嶇疆
*/
@ApiOperation("淇敼鍙傛暟閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:config:edit')")
+ @SaCheckPermission("system:config:edit")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) {
@@ -106,7 +106,7 @@
* 鍒犻櫎鍙傛暟閰嶇疆
*/
@ApiOperation("鍒犻櫎鍙傛暟閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
public AjaxResult<Void> remove(@ApiParam("鍙傛暟ID涓�") @PathVariable Long[] configIds) {
@@ -118,7 +118,7 @@
* 鍒锋柊鍙傛暟缂撳瓨
*/
@ApiOperation("鍒锋柊鍙傛暟缂撳瓨")
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
public AjaxResult<Void> refreshCache() {
--
Gitblit v1.9.3