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/monitor/SysOperlogController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 8af5832..e510429 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.monitor; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -13,7 +14,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.*; @@ -35,7 +35,7 @@ private final ISysOperLogService operLogService; @ApiOperation("鏌ヨ鎿嶄綔鏃ュ織璁板綍鍒楄〃") - @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") + @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) { return operLogService.selectPageOperLogList(operLog, pageQuery); @@ -43,7 +43,7 @@ @ApiOperation("瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃") @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('monitor:operlog:export')") + @SaCheckPermission("monitor:operlog:export") @PostMapping("/export") public void export(SysOperLog operLog, HttpServletResponse response) { List<SysOperLog> list = operLogService.selectOperLogList(operLog); @@ -52,7 +52,7 @@ @ApiOperation("鍒犻櫎鎿嶄綔鏃ュ織璁板綍") @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE) - @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") + @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") public AjaxResult<Void> remove(@PathVariable Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); @@ -60,7 +60,7 @@ @ApiOperation("娓呯┖鎿嶄綔鏃ュ織璁板綍") @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN) - @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") + @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/clean") public AjaxResult<Void> clean() { operLogService.cleanOperLog(); -- Gitblit v1.9.3