Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-09-27 b082da73a1e0259738ccb33ebf7d80cad3dc3a10

 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 = "主键不能为空")
@@ -100,7 +100,7 @@
   /**
    * 状态修改
    */
   @PreAuthorize("@ss.hasPermi('system:oss:edit')")
   @SaCheckPermission("system:oss:edit")
   @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
   @PutMapping("/changeStatus")
   public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {