[Improve] shiro permission improvement

apache · Apr 10, 2024 · ab93ed1 · ab93ed1
1 parent 9a02951
commit ab93ed1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/streampark-console/streampark-console-service/src/main/assembly/plugins/.gitkeep b/streampark-console/streampark-console-service/src/main/assembly/plugins/.gitkeep
diff --git a/...rvice/src/main/java/org/apache/streampark/console/system/controller/MemberController.java b/...rvice/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
@@ -56,13 +56,15 @@ public class MemberController {
 
   @Operation(summary = "List members")
   @PostMapping("list")
+  @RequiresPermissions("member:view")
   public RestResponse memberList(RestRequest restRequest, Member member) {
     IPage<Member> userList = memberService.page(member, restRequest);
     return RestResponse.success(userList);
   }
 
   @Operation(summary = "List candidate users")
   @PostMapping("candidateUsers")
+  @RequiresPermissions("member:add")
   public RestResponse candidateUsers(Long teamId) {
     List<User> userList = memberService.findCandidateUsers(teamId);
     return RestResponse.success(userList);

diff --git a/...service/src/main/java/org/apache/streampark/console/system/controller/UserController.java b/...service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -30,7 +30,6 @@
 import org.apache.streampark.console.system.service.TeamService;
 import org.apache.streampark.console.system.service.UserService;
 
-import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -66,9 +65,7 @@ public class UserController {
 
   @Operation(summary = "List users")
   @PostMapping("list")
-  @RequiresPermissions(
-      value = {"user:view", "app:view"},
-      logical = Logical.OR)
+  @RequiresPermissions("user:view")
   public RestResponse userList(RestRequest restRequest, User user) {
     IPage<User> userList = userService.page(user, restRequest);
     return RestResponse.success(userList);
@@ -101,6 +98,7 @@ public RestResponse deleteUser(Long userId) throws Exception {
 
   @Operation(summary = "List without token users")
   @PostMapping("getNoTokenUser")
+  @RequiresPermissions("token:add")
   public RestResponse getNoTokenUser() {
     List<User> userList = this.userService.getNoTokenUser();
     return RestResponse.success(userList);