From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 19:13:58 +0800
Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
index 63b1743..f1d3b3c 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
@@ -1,11 +1,13 @@
 package com.ruoyi.demo.controller;
 
+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;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.demo.domain.bo.TestTreeBo;
@@ -15,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,9 +45,9 @@
      * 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃
      */
     @ApiOperation("鏌ヨ娴嬭瘯鏍戣〃鍒楄〃")
-    @PreAuthorize("@ss.hasPermi('demo:tree:list')")
+    @SaCheckPermission("demo:tree:list")
     @GetMapping("/list")
-    public AjaxResult<List<TestTreeVo>> list(@Validated TestTreeBo bo) {
+    public AjaxResult<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
         List<TestTreeVo> list = iTestTreeService.queryList(bo);
         return AjaxResult.success(list);
     }
@@ -55,7 +56,7 @@
      * 瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃
      */
     @ApiOperation("瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃")
-    @PreAuthorize("@ss.hasPermi('demo:tree:export')")
+    @SaCheckPermission("demo:tree:export")
     @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public void export(@Validated TestTreeBo bo, HttpServletResponse response) {
@@ -67,7 +68,7 @@
      * 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅
      */
     @ApiOperation("鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅")
-    @PreAuthorize("@ss.hasPermi('demo:tree:query')")
+    @SaCheckPermission("demo:tree:query")
     @GetMapping("/{id}")
     public AjaxResult<TestTreeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
                                                   @PathVariable("id") Long id) {
@@ -78,7 +79,7 @@
      * 鏂板娴嬭瘯鏍戣〃
      */
     @ApiOperation("鏂板娴嬭瘯鏍戣〃")
-    @PreAuthorize("@ss.hasPermi('demo:tree:add')")
+    @SaCheckPermission("demo:tree:add")
     @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT)
     @RepeatSubmit
     @PostMapping()
@@ -90,7 +91,7 @@
      * 淇敼娴嬭瘯鏍戣〃
      */
     @ApiOperation("淇敼娴嬭瘯鏍戣〃")
-    @PreAuthorize("@ss.hasPermi('demo:tree:edit')")
+    @SaCheckPermission("demo:tree:edit")
     @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.UPDATE)
     @RepeatSubmit
     @PutMapping()
@@ -102,7 +103,7 @@
      * 鍒犻櫎娴嬭瘯鏍戣〃
      */
     @ApiOperation("鍒犻櫎娴嬭瘯鏍戣〃")
-    @PreAuthorize("@ss.hasPermi('demo:tree:remove')")
+    @SaCheckPermission("demo:tree:remove")
     @Log(title = "娴嬭瘯鏍戣〃" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")

--
Gitblit v1.9.3