更换权限注解

febs-auth/src/main/java/cc/mrbird/febs/auth/controller/OAuthClientDetailsController.java

@@ -36,7 +36,7 @@ public class OAuthClientDetailsController {
     }
 
     @GetMapping("secret/{clientId}")
-    @PreAuthorize("hasAnyAuthority('client:decrypt')")
+    @PreAuthorize("hasAuthority('client:decrypt')")
     public FebsResponse getOriginClientSecret(@NotBlank(message = "{required}") @PathVariable String clientId) {
         OAuthClientDetails client = this.oAuthClientDetailsService.findById(clientId);
         String origin = client != null ? client.getOriginSecret() : StringUtils.EMPTY;
@@ -44,7 +44,7 @@ public class OAuthClientDetailsController {
     }
 
     @GetMapping
-    @PreAuthorize("hasAnyAuthority('client:view')")
+    @PreAuthorize("hasAuthority('client:view')")
     public FebsResponse oauthCliendetailsList(QueryRequest request, OAuthClientDetails oAuthClientDetails) {
         Map<String, Object> dataTable = FebsUtil.getDataTable(this.oAuthClientDetailsService.findOAuthClientDetails(request, oAuthClientDetails));
         return new FebsResponse().data(dataTable);
@@ -52,7 +52,7 @@ public class OAuthClientDetailsController {
 
 
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('client:add')")
+    @PreAuthorize("hasAuthority('client:add')")
     public void addOauthCliendetails(@Valid OAuthClientDetails oAuthClientDetails) throws FebsException {
         try {
             this.oAuthClientDetailsService.createOAuthClientDetails(oAuthClientDetails);
@@ -64,7 +64,7 @@ public class OAuthClientDetailsController {
     }
 
     @DeleteMapping
-    @PreAuthorize("hasAnyAuthority('client:delete')")
+    @PreAuthorize("hasAuthority('client:delete')")
     public void deleteOauthCliendetails(@NotBlank(message = "{required}") String clientIds) throws FebsException {
         try {
             this.oAuthClientDetailsService.deleteOAuthClientDetails(clientIds);
@@ -76,7 +76,7 @@ public class OAuthClientDetailsController {
     }
 
     @PutMapping
-    @PreAuthorize("hasAnyAuthority('client:update')")
+    @PreAuthorize("hasAuthority('client:update')")
     public void updateOauthCliendetails(@Valid OAuthClientDetails oAuthClientDetails) throws FebsException {
         try {
             this.oAuthClientDetailsService.updateOAuthClientDetails(oAuthClientDetails);

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java

@@ -35,14 +35,14 @@ public class DeptController {
     }
 
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('dept:add')")
+    @PreAuthorize("hasAuthority('dept:add')")
     @ControllerEndpoint(operation = "新增部门", exceptionMessage = "新增部门失败")
     public void addDept(@Valid Dept dept) {
         this.deptService.createDept(dept);
     }
 
     @DeleteMapping("/{deptIds}")
-    @PreAuthorize("hasAnyAuthority('dept:delete')")
+    @PreAuthorize("hasAuthority('dept:delete')")
     @ControllerEndpoint(operation = "删除部门", exceptionMessage = "删除部门失败")
     public void deleteDepts(@NotBlank(message = "{required}") @PathVariable String deptIds) {
         String[] ids = deptIds.split(StringPool.COMMA);
@@ -50,14 +50,14 @@ public class DeptController {
     }
 
     @PutMapping
-    @PreAuthorize("hasAnyAuthority('dept:update')")
+    @PreAuthorize("hasAuthority('dept:update')")
     @ControllerEndpoint(operation = "修改部门", exceptionMessage = "修改部门失败")
     public void updateDept(@Valid Dept dept) {
         this.deptService.updateDept(dept);
     }
 
     @PostMapping("excel")
-    @PreAuthorize("hasAnyAuthority('dept:export')")
+    @PreAuthorize("hasAuthority('dept:export')")
     @ControllerEndpoint(operation = "导出部门数据", exceptionMessage = "导出Excel失败")
     public void export(Dept dept, QueryRequest request, HttpServletResponse response) {
         List<Dept> depts = this.deptService.findDepts(dept, request);

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/GeneratorConfigController.java

@@ -28,13 +28,13 @@ public class GeneratorConfigController {
     private IGeneratorConfigService generatorConfigService;
 
     @GetMapping
-    @PreAuthorize("hasAnyAuthority('gen:config')")
+    @PreAuthorize("hasAuthority('gen:config')")
     public FebsResponse getGeneratorConfig() {
         return new FebsResponse().data(generatorConfigService.findGeneratorConfig());
     }
 
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('gen:config:update')")
+    @PreAuthorize("hasAuthority('gen:config:update')")
     @ControllerEndpoint(operation = "修改生成代码配置", exceptionMessage = "修改GeneratorConfig失败")
     public void updateGeneratorConfig(@Valid GeneratorConfig generatorConfig) throws FebsException {
         if (StringUtils.isBlank(generatorConfig.getId()))

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/GeneratorController.java

@@ -45,14 +45,14 @@ public class GeneratorController {
     private GeneratorHelper generatorHelper;
 
     @GetMapping("tables")
-    @PreAuthorize("hasAnyAuthority('gen:generate')")
+    @PreAuthorize("hasAuthority('gen:generate')")
     public FebsResponse tablesInfo(String tableName, QueryRequest request) {
         Map<String, Object> dataTable = FebsUtil.getDataTable(generatorService.getTables(tableName, request, GeneratorConstant.DATABASE_TYPE, GeneratorConstant.DATABASE_NAME));
         return new FebsResponse().data(dataTable);
     }
 
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('gen:generate:gen')")
+    @PreAuthorize("hasAuthority('gen:generate:gen')")
     @ControllerEndpoint(operation = "生成代码", exceptionMessage = "代码生成失败")
     public void generate(@NotBlank(message = "{required}") String name, String remark, HttpServletResponse response) throws Exception {
         GeneratorConfig generatorConfig = generatorConfigService.findGeneratorConfig();

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/LogController.java

@@ -37,7 +37,7 @@ public class LogController {
     }
 
     @DeleteMapping("{ids}")
-    @PreAuthorize("hasAnyAuthority('log:delete')")
+    @PreAuthorize("hasAuthority('log:delete')")
     @ControllerEndpoint(exceptionMessage = "删除日志失败")
     public void deleteLogss(@NotBlank(message = "{required}") @PathVariable String ids) {
         String[] logIds = ids.split(StringPool.COMMA);
@@ -46,7 +46,7 @@ public class LogController {
 
 
     @PostMapping("excel")
-    @PreAuthorize("hasAnyAuthority('log:export')")
+    @PreAuthorize("hasAuthority('log:export')")
     @ControllerEndpoint(exceptionMessage = "导出Excel失败")
     public void export(QueryRequest request, Log lg, HttpServletResponse response) {
         List<Log> logs = this.logService.findLogs(lg, request).getRecords();

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/LoginLogController.java

@@ -42,7 +42,7 @@ public class LoginLogController {
     }
 
     @DeleteMapping("{ids}")
-    @PreAuthorize("hasAnyAuthority('loginlog:delete')")
+    @PreAuthorize("hasAuthority('loginlog:delete')")
     @ControllerEndpoint(operation = "删除登录日志", exceptionMessage = "删除登录日志失败")
     public void deleteLogss(@NotBlank(message = "{required}") @PathVariable String ids) {
         String[] loginLogIds = ids.split(StringPool.COMMA);
@@ -50,7 +50,7 @@ public class LoginLogController {
     }
 
     @PostMapping("excel")
-    @PreAuthorize("hasAnyAuthority('loginlog:export')")
+    @PreAuthorize("hasAuthority('loginlog:export')")
     @ControllerEndpoint(operation = "导出登录日志数据", exceptionMessage = "导出Excel失败")
     public void export(QueryRequest request, LoginLog loginLog, HttpServletResponse response) {
         List<LoginLog> loginLogs = this.loginLogService.findLoginLogs(loginLog, request).getRecords();

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/MenuController.java

@@ -59,14 +59,14 @@ public class MenuController {
     }
 
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('menu:add')")
+    @PreAuthorize("hasAuthority('menu:add')")
     @ControllerEndpoint(operation = "新增菜单/按钮", exceptionMessage = "新增菜单/按钮失败")
     public void addMenu(@Valid Menu menu) {
         this.menuService.createMenu(menu);
     }
 
     @DeleteMapping("/{menuIds}")
-    @PreAuthorize("hasAnyAuthority('menu:delete')")
+    @PreAuthorize("hasAuthority('menu:delete')")
     @ControllerEndpoint(operation = "删除菜单/按钮", exceptionMessage = "删除菜单/按钮失败")
     public void deleteMenus(@NotBlank(message = "{required}") @PathVariable String menuIds) {
         String[] ids = menuIds.split(StringPool.COMMA);
@@ -74,14 +74,14 @@ public class MenuController {
     }
 
     @PutMapping
-    @PreAuthorize("hasAnyAuthority('menu:update')")
+    @PreAuthorize("hasAuthority('menu:update')")
     @ControllerEndpoint(operation = "修改菜单/按钮", exceptionMessage = "修改菜单/按钮失败")
     public void updateMenu(@Valid Menu menu) {
         this.menuService.updateMenu(menu);
     }
 
     @PostMapping("excel")
-    @PreAuthorize("hasAnyAuthority('menu:export')")
+    @PreAuthorize("hasAuthority('menu:export')")
     @ControllerEndpoint(operation = "导出菜单数据", exceptionMessage = "导出Excel失败")
     public void export(Menu menu, HttpServletResponse response) {
         List<Menu> menus = this.menuService.findMenuList(menu);

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/RoleController.java

@@ -50,14 +50,14 @@ public class RoleController {
     }
 
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('role:add')")
+    @PreAuthorize("hasAuthority('role:add')")
     @ControllerEndpoint(operation = "新增角色", exceptionMessage = "新增角色失败")
     public void addRole(@Valid Role role) {
         this.roleService.createRole(role);
     }
 
     @DeleteMapping("/{roleIds}")
-    @PreAuthorize("hasAnyAuthority('role:delete')")
+    @PreAuthorize("hasAuthority('role:delete')")
     @ControllerEndpoint(operation = "删除角色", exceptionMessage = "删除角色失败")
     public void deleteRoles(@NotBlank(message = "{required}") @PathVariable String roleIds) {
         String[] ids = roleIds.split(StringPool.COMMA);
@@ -65,14 +65,14 @@ public class RoleController {
     }
 
     @PutMapping
-    @PreAuthorize("hasAnyAuthority('role:update')")
+    @PreAuthorize("hasAuthority('role:update')")
     @ControllerEndpoint(operation = "修改角色", exceptionMessage = "修改角色失败")
     public void updateRole(@Valid Role role) {
         this.roleService.updateRole(role);
     }
 
     @PostMapping("excel")
-    @PreAuthorize("hasAnyAuthority('role:export')")
+    @PreAuthorize("hasAuthority('role:export')")
     @ControllerEndpoint(operation = "导出角色数据", exceptionMessage = "导出Excel失败")
     public void export(QueryRequest queryRequest, Role role, HttpServletResponse response) {
         List<Role> roles = this.roleService.findRoles(role, queryRequest).getRecords();

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java

@@ -74,7 +74,7 @@ public class UserController {
 
 
     @GetMapping
-    @PreAuthorize("hasAnyAuthority('user:view')")
+    @PreAuthorize("hasAuthority('user:view')")
     public FebsResponse userList(QueryRequest queryRequest, SystemUser user) {
         Map<String, Object> dataTable = FebsUtil.getDataTable(userService.findUserDetail(user, queryRequest));
         return new FebsResponse().data(dataTable);
@@ -86,21 +86,21 @@ public class UserController {
     }
 
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('user:add')")
+    @PreAuthorize("hasAuthority('user:add')")
     @ControllerEndpoint(operation = "新增用户", exceptionMessage = "新增用户失败")
     public void addUser(@Valid SystemUser user) {
         this.userService.createUser(user);
     }
 
     @PutMapping
-    @PreAuthorize("hasAnyAuthority('user:update')")
+    @PreAuthorize("hasAuthority('user:update')")
     @ControllerEndpoint(operation = "修改用户", exceptionMessage = "修改用户失败")
     public void updateUser(@Valid SystemUser user) {
         this.userService.updateUser(user);
     }
 
     @DeleteMapping("/{userIds}")
-    @PreAuthorize("hasAnyAuthority('user:delete')")
+    @PreAuthorize("hasAuthority('user:delete')")
     @ControllerEndpoint(operation = "删除用户", exceptionMessage = "删除用户失败")
     public void deleteUsers(@NotBlank(message = "{required}") @PathVariable String userIds) {
         String[] ids = userIds.split(StringPool.COMMA);
@@ -138,7 +138,7 @@ public class UserController {
     }
 
     @PutMapping("password/reset")
-    @PreAuthorize("hasAnyAuthority('user:reset')")
+    @PreAuthorize("hasAuthority('user:reset')")
     @ControllerEndpoint(exceptionMessage = "重置用户密码失败")
     public void resetPassword(@NotBlank(message = "{required}") String usernames) {
         String[] usernameArr = usernames.split(StringPool.COMMA);
@@ -146,7 +146,7 @@ public class UserController {
     }
 
     @PostMapping("excel")
-    @PreAuthorize("hasAnyAuthority('user:export')")
+    @PreAuthorize("hasAuthority('user:export')")
     @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
     public void export(QueryRequest queryRequest, SystemUser user, HttpServletResponse response) {
         List<SystemUser> users = this.userService.findUserDetail(user, queryRequest).getRecords();

febs-server/febs-server-system/src/main/resources/generator/templates/controller.ftl

@@ -32,13 +32,13 @@ public class ${className}Controller extends BaseController {
     private I${className}Service ${className?uncap_first}Service;
 
     @GetMapping
-    @PreAuthorize("hasAnyAuthority('${className?uncap_first}:list')")
+    @PreAuthorize("hasAuthority('${className?uncap_first}:list')")
     public FebsResponse getAll${className}s(${className} ${className?uncap_first}) {
         return new FebsResponse().data(${className?uncap_first}Service.find${className}s(${className?uncap_first}));
     }
 
     @GetMapping("list")
-    @PreAuthorize("hasAnyAuthority('${className?uncap_first}:list')")
+    @PreAuthorize("hasAuthority('${className?uncap_first}:list')")
     public FebsResponse ${className?uncap_first}List(QueryRequest request, ${className} ${className?uncap_first}) {
         Map<String, Object> dataTable = getDataTable(this.${className?uncap_first}Service.find${className}s(request, ${className?uncap_first}));
         return new FebsResponse().data(dataTable);
@@ -46,7 +46,7 @@ public class ${className}Controller extends BaseController {
 
     @Log("新增${className}")
     @PostMapping
-    @PreAuthorize("hasAnyAuthority('${className?uncap_first}:add')")
+    @PreAuthorize("hasAuthority('${className?uncap_first}:add')")
     public void add${className}(@Valid ${className} ${className?uncap_first}) throws FebsException {
         try {
             this.${className?uncap_first}Service.create${className}(${className?uncap_first});
@@ -59,7 +59,7 @@ public class ${className}Controller extends BaseController {
 
     @Log("删除${className}")
     @DeleteMapping
-    @PreAuthorize("hasAnyAuthority('${className?uncap_first}:delete')")
+    @PreAuthorize("hasAuthority('${className?uncap_first}:delete')")
     public void delete${className}(${className} ${className?uncap_first}) throws FebsException {
         try {
             this.${className?uncap_first}Service.delete${className}(${className?uncap_first});
@@ -72,7 +72,7 @@ public class ${className}Controller extends BaseController {
 
     @Log("修改${className}")
     @PutMapping
-    @PreAuthorize("hasAnyAuthority('${className?uncap_first}:update')")
+    @PreAuthorize("hasAuthority('${className?uncap_first}:update')")
     public void update${className}(${className} ${className?uncap_first}) throws FebsException {
         try {
             this.${className?uncap_first}Service.update${className}(${className?uncap_first});