完全权限模块的权限注册的添加

management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/AdminController.java

@@ -33,21 +33,21 @@ public class AdminController {
 
     @ApiOperation(value = "管理员分页")
     @GetMapping("/page")
-    @RequiresPermissions("system:page")
+    @RequiresPermissions("system:admin:page")
     public CommonResult<PageResult<AdminPageItemVO>> page(AdminPageDTO adminPageDTO) {
         return success(adminManager.pageAdmin(adminPageDTO));
     }
 
     @ApiOperation(value = "创建管理员")
     @PostMapping("/create")
-    @RequiresPermissions("admin:create")
+    @RequiresPermissions("system:admin:create")
     public CommonResult<Integer> createAdmin(AdminCreateDTO createDTO, HttpServletRequest request) {
         return success(adminManager.createAdmin(createDTO, AdminSecurityContextHolder.getAdminId(), HttpUtil.getIp(request)));
     }
 
     @PostMapping("/update")
     @ApiOperation(value = "更新管理员")
-    @RequiresPermissions("admin:update")
+    @RequiresPermissions("system:admin:update")
     public CommonResult<Boolean> updateAdmin(AdminUpdateInfoDTO updateInfoDTO) {
         adminManager.updateAdmin(updateInfoDTO);
         return success(true);
@@ -55,7 +55,7 @@ public class AdminController {
 
     @PostMapping("/update-status")
     @ApiOperation(value = "更新管理员状态")
-    @RequiresPermissions("admin:update-status")
+    @RequiresPermissions("system:admin:update-status")
     public CommonResult<Boolean> updateUserStatus(AdminUpdateStatusDTO updateStatusDTO) {
         adminManager.updateAdminStatus(updateStatusDTO);
         return success(true);

management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/PermissionController.java

@@ -4,6 +4,7 @@ import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.managementweb.controller.permission.dto.PermissionAssignAdminRoleDTO;
 import cn.iocoder.mall.managementweb.controller.permission.dto.PermissionAssignRoleResourceDTO;
 import cn.iocoder.mall.managementweb.manager.permission.PermissionManager;
+import cn.iocoder.security.annotations.RequiresPermissions;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -33,12 +34,14 @@ public class PermissionController {
     @GetMapping("/list-role-resources")
     @ApiOperation("获得角色拥有的资源编号")
     @ApiImplicitParam(name = "roleId", value = "角色编号", required = true)
+    @RequiresPermissions("system:permission:assign-role-resource")
     public CommonResult<Set<Integer>> listRoleResources(Integer roleId) {
         return success(permissionManager.listRoleResources(roleId));
     }
 
     @PostMapping("/assign-role-resource")
     @ApiOperation("赋予角色资源")
+    @RequiresPermissions("system:permission:assign-role-resource")
     public CommonResult<Boolean> assignRoleResource(PermissionAssignRoleResourceDTO assignRoleResourceDTO) {
         permissionManager.assignRoleResource(assignRoleResourceDTO);
         return success(true);
@@ -46,6 +49,7 @@ public class PermissionController {
 
     @GetMapping("/list-admin-roles")
     @ApiOperation("获得管理员拥有的角色编号列表")
+    @RequiresPermissions("system:permission:assign-admin-role")
     @ApiImplicitParam(name = "adminId", value = "管理员编号", required = true)
     public CommonResult<Set<Integer>> listAdminRoles(Integer adminId) {
         return success(permissionManager.listAdminRoles(adminId));
@@ -53,6 +57,7 @@ public class PermissionController {
 
     @PostMapping("/assign-admin-role")
     @ApiOperation("赋予用户角色")
+    @RequiresPermissions("system:permission:assign-admin-role")
     public CommonResult<Boolean> assignAdminRole(PermissionAssignAdminRoleDTO assignAdminRoleDTO) {
         permissionManager.assignAdminRole(assignAdminRoleDTO);
         return success(true);

management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.java

@@ -7,6 +7,7 @@ import cn.iocoder.mall.managementweb.controller.permission.vo.ResourceTreeNodeVO
 import cn.iocoder.mall.managementweb.controller.permission.vo.ResourceVO;
 import cn.iocoder.mall.managementweb.manager.permission.ResourceManager;
 import cn.iocoder.mall.security.admin.core.context.AdminSecurityContextHolder;
+import cn.iocoder.security.annotations.RequiresPermissions;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -33,12 +34,14 @@ public class ResourceController {
 
     @PostMapping("/create")
     @ApiOperation("创建资源")
+    @RequiresPermissions("system:resource:create")
     public CommonResult<Integer> createResource(@Valid ResourceCreateDTO createDTO) {
         return success(resourceManager.createResource(createDTO, AdminSecurityContextHolder.getAdminId()));
     }
 
     @PostMapping("/update")
     @ApiOperation("更新资源")
+    @RequiresPermissions("system:resource:update")
     public CommonResult<Boolean> updateResource(@Valid ResourceUpdateDTO updateDTO) {
         resourceManager.updateResource(updateDTO);
         return success(true);
@@ -47,6 +50,7 @@ public class ResourceController {
     @PostMapping("/delete")
     @ApiOperation("删除资源")
     @ApiImplicitParam(name = "resourceId", value = "资源编号", required = true)
+    @RequiresPermissions("system:resource:delete")
     public CommonResult<Boolean> deleteResource(@RequestParam("resourceId") Integer resourceId) {
         resourceManager.deleteResource(resourceId);
         return success(true);
@@ -54,19 +58,22 @@ public class ResourceController {
 
     @GetMapping("/get")
     @ApiOperation("获得资源")
+    @RequiresPermissions("system:resource:tree")
     public CommonResult<ResourceVO> getResource(@RequestParam("resourceId") Integer resourceId) {
         return success(resourceManager.getResource(resourceId));
     }
 
     @GetMapping("/list")
     @ApiOperation("获得资源列表")
-    @ApiImplicitParam(name = "resourceId", value = "资源编号列表", required = true)
+    @ApiImplicitParam(name = "resourceIds", value = "资源编号列表", required = true)
+    @RequiresPermissions("system:resource:tree")
     public CommonResult<List<ResourceVO>> listResources(@RequestParam("resourceIds") List<Integer> resourceIds) {
         return success(resourceManager.listResources(resourceIds));
     }
 
     @GetMapping("/tree")
     @ApiOperation("获得资源树")
+    @RequiresPermissions("system:resource:tree")
     public CommonResult<List<ResourceTreeNodeVO>> treeResource() {
         return success(resourceManager.treeResource());
     }

management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/RoleController.java

@@ -8,6 +8,7 @@ import cn.iocoder.mall.managementweb.controller.permission.dto.RoleUpdateDTO;
 import cn.iocoder.mall.managementweb.controller.permission.vo.RoleVO;
 import cn.iocoder.mall.managementweb.manager.permission.RoleManager;
 import cn.iocoder.mall.security.admin.core.context.AdminSecurityContextHolder;
+import cn.iocoder.security.annotations.RequiresPermissions;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -34,12 +35,14 @@ public class RoleController {
 
     @PostMapping("/create")
     @ApiOperation("创建角色")
+    @RequiresPermissions("system:role:create")
     public CommonResult<Integer> createRole(@Valid RoleCreateDTO createDTO) {
         return success(roleManager.createRole(createDTO, AdminSecurityContextHolder.getAdminId()));
     }
 
     @PostMapping("/update")
     @ApiOperation("更新角色")
+    @RequiresPermissions("system:role:update")
     public CommonResult<Boolean> updateRole(@Valid RoleUpdateDTO updateDTO) {
         roleManager.updateRole(updateDTO);
         return success(true);
@@ -48,6 +51,7 @@ public class RoleController {
     @PostMapping("/delete")
     @ApiOperation("删除角色")
     @ApiImplicitParam(name = "roleId", value = "角色编号", required = true)
+    @RequiresPermissions("system:role:delete")
     public CommonResult<Boolean> deleteRole(@RequestParam("roleId") Integer roleId) {
         roleManager.deleteRole(roleId);
         return success(true);
@@ -56,12 +60,14 @@ public class RoleController {
     @GetMapping("/get")
     @ApiOperation("获得角色")
     @ApiImplicitParam(name = "roleId", value = "角色编号", required = true)
-    public CommonResult<RoleVO> getRole(@RequestParam("roleId") Integer roleId) {
+    @RequiresPermissions("system:admin:page")
+    public CommonResult<RoleVO> role(@RequestParam("roleId") Integer roleId) {
         return success(roleManager.getRole(roleId));
     }
 
     @GetMapping("/list-all")
     @ApiOperation("获得所有角色列表")
+    @RequiresPermissions("system:role:page")
     public CommonResult<List<RoleVO>> listAllRoles() {
         return success(roleManager.listAllRoles());
     }
@@ -69,12 +75,14 @@ public class RoleController {
     @GetMapping("/list")
     @ApiOperation("获得角色列表")
     @ApiImplicitParam(name = "roleIds", value = "角色编号列表", required = true)
+    @RequiresPermissions("system:role:page")
     public CommonResult<List<RoleVO>> listRoles(@RequestParam("roleIds") List<Integer> roleIds) {
         return success(roleManager.listRoles(roleIds));
     }
 
     @GetMapping("/page")
     @ApiOperation("获得角色分页")
+    @RequiresPermissions("system:role:page")
     public CommonResult<PageResult<RoleVO>> pageRole(RolePageDTO pageDTO) {
         return success(roleManager.pageRole(pageDTO));
     }