From b082da73a1e0259738ccb33ebf7d80cad3dc3a10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 九月 2021 17:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 55f25df..22c0531 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.*;
@@ -25,14 +25,14 @@
import java.util.Arrays;
/**
- * 浜戝瓨鍌ㄩ厤缃瓹ontroller
+ * 瀵硅薄瀛樺偍閰嶇疆Controller
*
* @author Lion Li
* @author 瀛よ垷鐑熼洦
* @date 2021-08-13
*/
@Validated
-@Api(value = "浜戝瓨鍌ㄩ厤缃帶鍒跺櫒", tags = {"浜戝瓨鍌ㄩ厤缃鐞�"})
+@Api(value = "瀵硅薄瀛樺偍閰嶇疆鎺у埗鍣�", tags = {"瀵硅薄瀛樺偍閰嶇疆绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/oss/config")
@@ -41,20 +41,20 @@
private final ISysOssConfigService iSysOssConfigService;
/**
- * 鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛�
+ * 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
*/
- @ApiOperation("鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛�")
- @PreAuthorize("@ss.hasPermi('system:oss:list')")
+ @ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
+ @SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
return iSysOssConfigService.queryPageList(bo);
}
/**
- * 鑾峰彇浜戝瓨鍌ㄩ厤缃缁嗕俊鎭�
+ * 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇浜戝瓨鍌ㄩ厤缃缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:oss:query')")
+ @ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
+ @SaCheckPermission("system:oss:query")
@GetMapping("/{ossConfigId}")
public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable("ossConfigId") Integer ossConfigId) {
@@ -62,11 +62,11 @@
}
/**
- * 鏂板浜戝瓨鍌ㄩ厤缃�
+ * 鏂板瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("鏂板浜戝瓨鍌ㄩ厤缃�")
- @PreAuthorize("@ss.hasPermi('system:oss:add')")
- @Log(title = "浜戝瓨鍌ㄩ厤缃�", businessType = BusinessType.INSERT)
+ @ApiOperation("鏂板瀵硅薄瀛樺偍閰嶇疆")
+ @SaCheckPermission("system:oss:add")
+ @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
@@ -74,11 +74,11 @@
}
/**
- * 淇敼浜戝瓨鍌ㄩ厤缃�
+ * 淇敼瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("淇敼浜戝瓨鍌ㄩ厤缃�")
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
- @Log(title = "浜戝瓨鍌ㄩ厤缃�", businessType = BusinessType.UPDATE)
+ @ApiOperation("淇敼瀵硅薄瀛樺偍閰嶇疆")
+ @SaCheckPermission("system:oss:edit")
+ @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
@@ -86,11 +86,11 @@
}
/**
- * 鍒犻櫎浜戝瓨鍌ㄩ厤缃�
+ * 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("鍒犻櫎浜戝瓨鍌ㄩ厤缃�")
- @PreAuthorize("@ss.hasPermi('system:oss:remove')")
- @Log(title = "浜戝瓨鍌ㄩ厤缃�", businessType = BusinessType.DELETE)
+ @ApiOperation("鍒犻櫎瀵硅薄瀛樺偍閰嶇疆")
+ @SaCheckPermission("system:oss:remove")
+ @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossConfigIds) {
@@ -100,8 +100,8 @@
/**
* 鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
- @Log(title = "浜戝瓨鍌ㄧ姸鎬佷慨鏀�", businessType = BusinessType.UPDATE)
+ @SaCheckPermission("system:oss:edit")
+ @Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
--
Gitblit v1.9.3