From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
index 1756ce7..6fa75be 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.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.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -16,7 +17,6 @@
import io.swagger.annotations.ApiOperation;
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.*;
@@ -44,7 +44,7 @@
* 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
*/
@ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:oss:list')")
+ @SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
return iSysOssConfigService.queryPageList(bo);
@@ -54,7 +54,7 @@
* 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:oss:query')")
+ @SaCheckPermission("system:oss:query")
@GetMapping("/{ossConfigId}")
public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable("ossConfigId") Integer ossConfigId) {
@@ -65,7 +65,7 @@
* 鏂板瀵硅薄瀛樺偍閰嶇疆
*/
@ApiOperation("鏂板瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:add')")
+ @SaCheckPermission("system:oss:add")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -77,7 +77,7 @@
* 淇敼瀵硅薄瀛樺偍閰嶇疆
*/
@ApiOperation("淇敼瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+ @SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -89,7 +89,7 @@
* 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
*/
@ApiOperation("鍒犻櫎瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+ @SaCheckPermission("system:oss:remove")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@@ -101,7 +101,7 @@
* 鐘舵�佷慨鏀�
*/
@ApiOperation("鐘舵�佷慨鏀�")
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+ @SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
--
Gitblit v1.9.3