修改AdminSession验证权限方法名

src/main/java/com/qmth/ops/api/controller/admin/AppController.java

@@ -41,14 +41,14 @@ public class AppController {
 
     @PostMapping("/insert")
     public AppVersionVO insert(@RequestAttribute AdminSession adminSession, App app) {
-        adminSession.permissionCheck(Permission.APP_INSERT);
+        adminSession.hasPermission(Permission.APP_INSERT);
         appService.insert(app);
         return new AppVersionVO(appService.getById(app.getId()), versionService);
     }
 
     @PostMapping("/update")
     public AppVersionVO update(@RequestAttribute AdminSession adminSession, App app) {
-        adminSession.permissionCheck(Permission.APP_EDIT);
+        adminSession.hasPermission(Permission.APP_EDIT);
         appService.update(app);
         return new AppVersionVO(appService.getById(app.getId()), versionService);
     }

src/main/java/com/qmth/ops/api/controller/admin/DeployController.java

@@ -69,21 +69,21 @@ public class DeployController {
     @PostMapping("/insert")
     public DeployVO insert(@RequestAttribute AdminSession adminSession,
             @Validated(DeployForm.InsertGroup.class) @RequestBody DeployForm form) {
-        adminSession.permissionCheck(Permission.DEPLOY_INSERT);
+        adminSession.hasPermission(Permission.DEPLOY_INSERT);
         return new DeployVO(deployService.insert(form.build()), appService);
     }
 
     @PostMapping("/update")
     public DeployVO update(@RequestAttribute AdminSession adminSession,
             @Validated(DeployForm.UpdateGroup.class) @RequestBody DeployForm form) {
-        adminSession.permissionCheck(Permission.DEPLOY_EDIT, form.getId());
+        adminSession.hasPermission(Permission.DEPLOY_EDIT, form.getId());
         return new DeployVO(deployService.update(form.build()), appService);
     }
 
     @PostMapping("/device/save")
     public Object saveDevice(@RequestAttribute AdminSession adminSession, @RequestParam Long id,
             @RequestParam MultipartFile deviceInfo, @RequestParam(required = false) String remark) throws Exception {
-        adminSession.permissionCheck(Permission.DEPLOY_DEVICE_EDIT, id);
+        adminSession.hasPermission(Permission.DEPLOY_DEVICE_EDIT, id);
         Deploy deploy = deployService.findById(id);
         if (deploy != null) {
             DeviceInfo info = licenseService.parseDeviceInfo(deviceInfo);
@@ -102,7 +102,7 @@ public class DeployController {
     @PostMapping("/device/delete")
     public Object deleteDevice(@RequestAttribute AdminSession adminSession, @RequestParam Long id,
             @RequestParam String deviceId) throws Exception {
-        adminSession.permissionCheck(Permission.DEPLOY_DEVICE_EDIT, id);
+        adminSession.hasPermission(Permission.DEPLOY_DEVICE_EDIT, id);
         Deploy deploy = deployService.findById(id);
         if (deploy != null) {
             deployService.deleteDevice(deploy, deviceId);
@@ -126,7 +126,7 @@ public class DeployController {
     public void licenseDownload(@RequestAttribute AdminSession adminSession, HttpServletResponse response,
             @RequestParam Long id, @RequestParam(required = false) String deviceId,
             @RequestParam(required = false) String version) throws Exception {
-        adminSession.permissionCheck(Permission.DEPLOY_LICENSE_DOWNLOAD, id);
+        adminSession.hasPermission(Permission.DEPLOY_LICENSE_DOWNLOAD, id);
         response.setContentType("application/octet-stream; charset=utf-8");
         response.setHeader("Content-Disposition", "attachment; filename=app.lic");
         licenseService.buildLicense(deployService.findById(id), deviceId, version, response.getOutputStream());
@@ -145,7 +145,7 @@ public class DeployController {
     @PostMapping("/org/update")
     public Object updateOrg(@RequestAttribute AdminSession adminSession, @RequestParam Long id,
             @RequestParam Long[] orgId) {
-        adminSession.permissionCheck(Permission.DEPLOY_ORG_EDIT, id);
+        adminSession.hasPermission(Permission.DEPLOY_ORG_EDIT, id);
         Deploy deploy = deployService.findById(id);
         if (deploy != null) {
             deployService.updateOrg(deploy, orgId);

src/main/java/com/qmth/ops/api/controller/admin/EnvController.java

@@ -37,14 +37,14 @@ public class EnvController {
 
     @PostMapping("/insert")
     public EnvVO insert(@RequestAttribute AdminSession adminSession, Env env) {
-        adminSession.permissionCheck(Permission.ENV_INSERT);
+        adminSession.hasPermission(Permission.ENV_INSERT);
         env = envService.insert(env);
         return new EnvVO(env);
     }
 
     @PostMapping("/update")
     public EnvVO update(@RequestAttribute AdminSession adminSession, Env env) {
-        adminSession.permissionCheck(Permission.ENV_EDIT);
+        adminSession.hasPermission(Permission.ENV_EDIT);
         env = envService.update(env);
         return new EnvVO(env);
     }

src/main/java/com/qmth/ops/api/controller/admin/ModuleController.java

@@ -34,13 +34,13 @@ public class ModuleController {
 
     @PostMapping("/insert")
     public Module insert(@RequestAttribute AdminSession adminSession, Module module) {
-        adminSession.permissionCheck(Permission.MODULE_INSERT);
+        adminSession.hasPermission(Permission.MODULE_INSERT);
         return moduleService.insert(module);
     }
 
     @PostMapping("/update")
     public Module update(@RequestAttribute AdminSession adminSession, Module module) {
-        adminSession.permissionCheck(Permission.MODULE_EDIT);
+        adminSession.hasPermission(Permission.MODULE_EDIT);
         return moduleService.update(module);
     }
 

src/main/java/com/qmth/ops/api/controller/admin/NginxConfigController.java

@@ -45,9 +45,9 @@ public class NginxConfigController {
         Env env = null;
         if (envId != null) {
             env = envService.getById(envId);
-            adminSession.permissionCheck(Permission.NGINX_EDIT, env.getId());
+            adminSession.hasPermission(Permission.NGINX_EDIT, env.getId());
         } else {
-            adminSession.permissionCheck(Permission.NGINX_BASELINE_EDIT, app.getId());
+            adminSession.hasPermission(Permission.NGINX_BASELINE_EDIT, app.getId());
         }
         return nginxConfigService.update(app, env, moduleId != null ? moduleService.getById(moduleId) : null, content);
     }

src/main/java/com/qmth/ops/api/controller/admin/OrgController.java

@@ -45,7 +45,7 @@ public class OrgController {
     public OrgVO insert(@RequestAttribute AdminSession adminSession, Org org,
             @RequestParam(required = false) MultipartFile logoFile, @RequestParam(required = false) String logoMd5)
             throws Exception {
-        adminSession.permissionCheck(Permission.ORG_INSERT);
+        adminSession.hasPermission(Permission.ORG_INSERT);
         org = orgService.insert(org);
         if (logoFile != null && logoMd5 != null) {
             fileService.uploadOrgLogo(org, logoFile, logoMd5);
@@ -58,7 +58,7 @@ public class OrgController {
     public OrgVO update(@RequestAttribute AdminSession adminSession, Org org,
             @RequestParam(required = false) MultipartFile logoFile, @RequestParam(required = false) String logoMd5)
             throws Exception {
-        adminSession.permissionCheck(Permission.ORG_EDIT);
+        adminSession.hasPermission(Permission.ORG_EDIT);
         org = orgService.update(org);
         if (logoFile != null && logoMd5 != null) {
             fileService.uploadOrgLogo(org, logoFile, logoMd5);
@@ -70,7 +70,7 @@ public class OrgController {
     @PostMapping("/toggle")
     public Object toggle(@RequestAttribute AdminSession adminSession, @RequestParam Long id,
             @RequestParam Boolean enable) {
-        adminSession.permissionCheck(Permission.ORG_EDIT);
+        adminSession.hasPermission(Permission.ORG_EDIT);
         return new SuccessVO(orgService.toggle(id, enable));
     }
 }

src/main/java/com/qmth/ops/api/controller/admin/PropertyController.java

@@ -70,7 +70,7 @@ public class PropertyController {
             @RequestParam Long moduleId, @RequestParam MultipartFile file, @RequestParam FileFormat extension,
             @RequestParam(required = false) Long inheritVersionId) throws IOException {
         Version version = versionService.getById(versionId);
-        adminSession.permissionCheck(Permission.PROPERTY_BASELINE_EDIT, version.getAppId());
+        adminSession.hasPermission(Permission.PROPERTY_BASELINE_EDIT, version.getAppId());
         return propertyService
                 .updateBaseline(version, moduleService.getById(moduleId), file.getInputStream(), extension,
                         inheritVersionId != null ? versionService.getById(inheritVersionId) : null);
@@ -79,7 +79,7 @@ public class PropertyController {
     @PostMapping("/baseline/item/update")
     public PropertyItem updateBaselineItem(@RequestAttribute AdminSession adminSession, PropertyItem item) {
         Version version = versionService.getById(item.getVersionId());
-        adminSession.permissionCheck(Permission.PROPERTY_BASELINE_EDIT, version.getAppId());
+        adminSession.hasPermission(Permission.PROPERTY_BASELINE_EDIT, version.getAppId());
         return propertyService.updateBaselineItem(item);
     }
 
@@ -120,14 +120,14 @@ public class PropertyController {
     @PostMapping("/item/update")
     public PropertyItem updatePropertyItem(@RequestAttribute AdminSession adminSession, PropertyItem item) {
         Env env = envService.getById(item.getEnvId());
-        adminSession.permissionCheck(Permission.PROPERTY_EDIT, env.getId());
+        adminSession.hasPermission(Permission.PROPERTY_EDIT, env.getId());
         return propertyService.updatePropertyItem(item);
     }
 
     @PostMapping("/item/delete")
     public Object deletePropertyItem(@RequestAttribute AdminSession adminSession, PropertyItem item) {
         Env env = envService.getById(item.getEnvId());
-        adminSession.permissionCheck(Permission.PROPERTY_EDIT, env.getId());
+        adminSession.hasPermission(Permission.PROPERTY_EDIT, env.getId());
         propertyService.deletePropertyItem(item);
         return new SuccessVO(true);
     }

src/main/java/com/qmth/ops/api/controller/admin/UserController.java

@@ -76,14 +76,14 @@ public class UserController {
     @PostMapping("/insert")
     public User insert(@RequestAttribute AdminSession adminSession,
             @Validated(UserForm.InsertGroup.class) UserForm form) {
-        adminSession.permissionCheck(Permission.USER_INSERT);
+        adminSession.hasPermission(Permission.USER_INSERT);
         return userService.insert(form.build());
     }
 
     @PostMapping("/update")
     public User update(@RequestAttribute AdminSession adminSession,
             @Validated(UserForm.UpdateGroup.class) UserForm form) {
-        adminSession.permissionCheck(Permission.USER_EDIT);
+        adminSession.hasPermission(Permission.USER_EDIT);
         return userService.update(form.build());
     }
 
@@ -103,7 +103,7 @@ public class UserController {
     @PostMapping("/permission/save")
     public UpdateTimeVO permissionSave(@RequestAttribute AdminSession adminSession,
             @Validated @RequestBody UserPermissionDTO userPermission) {
-        adminSession.permissionCheck(Permission.USER_EDIT);
+        adminSession.hasPermission(Permission.USER_EDIT);
         User user = userService.getById(userPermission.getUserId());
         for (PermissionDTO dto : userPermission.getPermissions()) {
             userPermissionService.save(user, dto.getPermission(), dto.getScope());
@@ -114,7 +114,7 @@ public class UserController {
     @PostMapping("/permission/delete")
     public UpdateTimeVO permissionDelete(@RequestAttribute AdminSession adminSession,
             @Validated @RequestBody UserPermissionDTO userPermission) {
-        adminSession.permissionCheck(Permission.USER_EDIT);
+        adminSession.hasPermission(Permission.USER_EDIT);
         User user = userService.getById(userPermission.getUserId());
         for (PermissionDTO dto : userPermission.getPermissions()) {
             userPermissionService.delete(user, dto.getPermission());

src/main/java/com/qmth/ops/api/controller/admin/VersionController.java

@@ -33,13 +33,13 @@ public class VersionController {
     @PostMapping("/insert")
     public Version insert(@RequestAttribute AdminSession adminSession, @RequestParam Long appId,
             @RequestParam VersionNumber name) {
-        adminSession.permissionCheck(Permission.VERSION_INSERT);
+        adminSession.hasPermission(Permission.VERSION_INSERT);
         return versionService.insert(appService.getById(appId), name);
     }
 
     @PostMapping("/update")
     public Version list(@RequestAttribute AdminSession adminSession, Version version) {
-        adminSession.permissionCheck(Permission.VERSION_EDIT);
+        adminSession.hasPermission(Permission.VERSION_EDIT);
         return versionService.update(version);
     }
 

src/main/java/com/qmth/ops/api/controller/admin/WxappController.java

@@ -33,13 +33,13 @@ public class WxappController {
 
     @PostMapping("/insert")
     public Wxapp insert(@RequestAttribute AdminSession adminSession, Wxapp wxapp) {
-        adminSession.permissionCheck(Permission.WXAPP_INSERT);
+        adminSession.hasPermission(Permission.WXAPP_INSERT);
         return wxappService.insert(wxapp);
     }
 
     @PostMapping("/update")
     public Wxapp update(@RequestAttribute AdminSession adminSession, Wxapp wxapp) {
-        adminSession.permissionCheck(Permission.WXAPP_EDIT);
+        adminSession.hasPermission(Permission.WXAPP_EDIT);
         return wxappService.update(wxapp);
     }
 

src/main/java/com/qmth/ops/api/security/AdminSession.java

@@ -32,13 +32,13 @@ public class AdminSession implements AccessEntity {
         return user;
     }
 
-    public void permissionCheck(Permission permission) {
+    public void hasPermission(Permission permission) {
         if (!userPermissionService.hasPermission(user, permission, null)) {
             throw new UnauthorizedException("没有[" + permission.getName() + "]操作权限");
         }
     }
 
-    public void permissionCheck(Permission permission, Object data) {
+    public void hasPermission(Permission permission, Object data) {
         if (!userPermissionService.hasPermission(user, permission, data)) {
             throw new UnauthorizedException("没有[" + permission.getName() + "]操作权限");
         }