修改accessEntity变量名，适配框架要求

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

@@ -34,50 +34,50 @@ public class AppController {
     private UserService userService;
 
     @PostMapping("/query")
-    public IPage<AppDTO> query(@RequestAttribute AdminSession accessEntity, AppQuery query) {
-        query.setUser(accessEntity.getUser());
+    public IPage<AppDTO> query(@RequestAttribute AdminSession adminSession, AppQuery query) {
+        query.setUser(adminSession.getUser());
         return appService.query(query);
     }
 
     @PostMapping("/list")
-    public List<AppDTO> list(@RequestAttribute AdminSession accessEntity, AppQuery query) {
-        query.setUser(accessEntity.getUser());
+    public List<AppDTO> list(@RequestAttribute AdminSession adminSession, AppQuery query) {
+        query.setUser(adminSession.getUser());
         return appService.list(query);
     }
 
     @PostMapping("/insert")
-    public AppDTO insert(@RequestAttribute AdminSession accessEntity, App app) {
-        accessEntity.validateRole(Role.ADMIN, Role.OPS);
+    public AppDTO insert(@RequestAttribute AdminSession adminSession, App app) {
+        adminSession.validateRole(Role.ADMIN, Role.OPS);
         appService.insert(app);
         return appService.findDTO(app.getId());
     }
 
     @PostMapping("/update")
-    public AppDTO update(@RequestAttribute AdminSession accessEntity, App app) {
-        accessEntity.validateRole(Role.ADMIN, Role.OPS);
+    public AppDTO update(@RequestAttribute AdminSession adminSession, App app) {
+        adminSession.validateRole(Role.ADMIN, Role.OPS);
         appService.update(app);
         return appService.findDTO(app.getId());
     }
 
     @PostMapping("/master_version")
-    public AppDTO updateMasterVersion(@RequestAttribute AdminSession accessEntity, @RequestParam Long id,
+    public AppDTO updateMasterVersion(@RequestAttribute AdminSession adminSession, @RequestParam Long id,
             @RequestParam Long versionId) {
-        accessEntity.validateRole(Role.ADMIN, Role.OPS);
+        adminSession.validateRole(Role.ADMIN, Role.OPS);
         appService.setMasterVersion(appService.getById(id), versionService.getById(versionId));
         return appService.findDTO(id);
     }
 
     @PostMapping("/user/bind")
-    public AppUser bindUser(@RequestAttribute AdminSession accessEntity, @RequestParam Long id,
+    public AppUser bindUser(@RequestAttribute AdminSession adminSession, @RequestParam Long id,
             @RequestParam Long userId) {
-        accessEntity.validateRole(Role.ADMIN);
+        adminSession.validateRole(Role.ADMIN);
         return appUserService.insert(appService.getById(id), userService.getById(userId));
     }
 
     @PostMapping("/user/unbind")
-    public AppUser unbindUser(@RequestAttribute AdminSession accessEntity, @RequestParam Long id,
+    public AppUser unbindUser(@RequestAttribute AdminSession adminSession, @RequestParam Long id,
             @RequestParam Long userId) {
-        accessEntity.validateRole(Role.ADMIN);
+        adminSession.validateRole(Role.ADMIN);
         appUserService.delete(appService.getById(id), userService.getById(userId));
         return new AppUser(id, userId);
     }

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

@@ -58,39 +58,39 @@ public class ConfigController {
     }
 
     @PostMapping("/baseline")
-    public List<ConfigItem> listBaseline(@RequestAttribute AdminSession accessEntity, @RequestParam Long appId,
+    public List<ConfigItem> listBaseline(@RequestAttribute AdminSession adminSession, @RequestParam Long appId,
             @RequestParam Long versionId, @RequestParam Long moduleId) {
-        accessEntity.validateApp(appService.getById(appId));
+        adminSession.validateApp(appService.getById(appId));
         return configService.listBaseline(appId, versionId, moduleId);
     }
 
     @PostMapping("/baseline/update")
-    public Object updateBaseline(@RequestAttribute AdminSession accessEntity, @RequestParam Long appId,
+    public Object updateBaseline(@RequestAttribute AdminSession adminSession, @RequestParam Long appId,
             @RequestParam Long versionId, @RequestParam Long moduleId, @RequestParam MultipartFile file,
             @RequestParam FileFormat extension, @RequestParam(required = false) Long inheritVersionId)
             throws IOException {
-        accessEntity.validateRole(Role.DEV);
-        accessEntity.validateApp(appService.getById(appId));
+        adminSession.validateRole(Role.DEV);
+        adminSession.validateApp(appService.getById(appId));
         return configService.updateBaseline(appService.getById(appId), versionService.getById(versionId),
                 moduleService.getById(moduleId), file.getInputStream(), extension,
                 inheritVersionId != null ? versionService.getById(inheritVersionId) : null);
     }
 
     @PostMapping("/baseline/item/update")
-    public ConfigItem updateBaselineItem(@RequestAttribute AdminSession accessEntity, ConfigItem item) {
-        accessEntity.validateRole(Role.DEV);
-        accessEntity.validateApp(appService.getById(item.getAppId()));
+    public ConfigItem updateBaselineItem(@RequestAttribute AdminSession adminSession, ConfigItem item) {
+        adminSession.validateRole(Role.DEV);
+        adminSession.validateApp(appService.getById(item.getAppId()));
         return configService.updateBaselineItem(item);
     }
 
     @PostMapping("/list")
-    public List<ConfigItem> listConfigItem(@RequestAttribute AdminSession accessEntity, @RequestParam Long appId,
+    public List<ConfigItem> listConfigItem(@RequestAttribute AdminSession adminSession, @RequestParam Long appId,
             @RequestParam Long versionId, @RequestParam Long moduleId, @RequestParam Long envId) {
-        accessEntity.validateApp(appService.getById(appId));
+        adminSession.validateApp(appService.getById(appId));
         Env env = envService.getById(envId);
         List<ConfigItem> list = configService.listConfigItem(appId, versionId, moduleId, env.getId());
         //非环境可编辑用户，需要隐藏机密信息
-        if (!accessEntity.getUser().hasRole(env.getType().getRole())) {
+        if (!adminSession.getUser().hasRole(env.getType().getRole())) {
             for (ConfigItem item : list) {
                 if (item.getKey().contains("secret") || item.getKey().contains("password")) {
                     item.setValue("***");
@@ -101,10 +101,10 @@ public class ConfigController {
     }
 
     @PostMapping("/item/update")
-    public ConfigItem updateConfigItem(@RequestAttribute AdminSession accessEntity, ConfigItem item) {
-        accessEntity.validateRole(Role.TEST, Role.OPS);
-        accessEntity.validateApp(appService.getById(item.getAppId()));
-        accessEntity.validateEnv(envService.getById(item.getEnvId()).getType());
+    public ConfigItem updateConfigItem(@RequestAttribute AdminSession adminSession, ConfigItem item) {
+        adminSession.validateRole(Role.TEST, Role.OPS);
+        adminSession.validateApp(appService.getById(item.getAppId()));
+        adminSession.validateEnv(envService.getById(item.getEnvId()).getType());
         return configService.updateConfigItem(item);
     }
 

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

@@ -36,20 +36,20 @@ public class EnvController {
     }
 
     @PostMapping("/insert")
-    public Env insert(@RequestAttribute AdminSession accessEntity, Env env) {
-        accessEntity.validateRole(Role.ADMIN, Role.OPS);
+    public Env insert(@RequestAttribute AdminSession adminSession, Env env) {
+        adminSession.validateRole(Role.ADMIN, Role.OPS);
         return envService.insert(env);
     }
 
     @PostMapping("/update")
-    public Env update(@RequestAttribute AdminSession accessEntity, Env env) {
-        accessEntity.validateRole(Role.ADMIN, Role.OPS);
+    public Env update(@RequestAttribute AdminSession adminSession, Env env) {
+        adminSession.validateRole(Role.ADMIN, Role.OPS);
         return envService.update(env);
     }
 
     @PostMapping("/list")
-    public List<Env> list(@RequestAttribute AdminSession accessEntity, Long appId) {
-        accessEntity.validateApp(appService.getById(appId));
+    public List<Env> list(@RequestAttribute AdminSession adminSession, Long appId) {
+        adminSession.validateApp(appService.getById(appId));
         return envService.list(appId);
     }
 

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

@@ -26,20 +26,20 @@ public class ModuleController {
     private ModuleService moduleService;
 
     @PostMapping("/insert")
-    public Module insert(@RequestAttribute AdminSession accessEntity, Module module) {
-        accessEntity.validateRole(Role.ADMIN, Role.DEV);
+    public Module insert(@RequestAttribute AdminSession adminSession, Module module) {
+        adminSession.validateRole(Role.ADMIN, Role.DEV);
         return moduleService.insert(module);
     }
 
     @PostMapping("/update")
-    public Module update(@RequestAttribute AdminSession accessEntity, Module module) {
-        accessEntity.validateRole(Role.ADMIN, Role.DEV);
+    public Module update(@RequestAttribute AdminSession adminSession, Module module) {
+        adminSession.validateRole(Role.ADMIN, Role.DEV);
         return moduleService.update(module);
     }
 
     @PostMapping("/list")
-    public List<Module> list(@RequestAttribute AdminSession accessEntity, ModuleQuery query) {
-        accessEntity.validateApp(appService.getById(query.getAppId()));
+    public List<Module> list(@RequestAttribute AdminSession adminSession, ModuleQuery query) {
+        adminSession.validateApp(appService.getById(query.getAppId()));
         return moduleService.list(query);
     }
 

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

@@ -51,34 +51,34 @@ public class UserController {
     }
 
     @PostMapping("/query")
-    public IPage<User> query(@RequestAttribute AdminSession accessEntity, UserQuery query) {
-        accessEntity.validateRole(Role.ADMIN);
+    public IPage<User> query(@RequestAttribute AdminSession adminSession, UserQuery query) {
+        adminSession.validateRole(Role.ADMIN);
         return userService.query(query);
     }
 
     @PostMapping("/list")
-    public List<User> list(@RequestAttribute AdminSession accessEntity, UserQuery query) {
-        accessEntity.validateRole(Role.ADMIN);
+    public List<User> list(@RequestAttribute AdminSession adminSession, UserQuery query) {
+        adminSession.validateRole(Role.ADMIN);
         return userService.list(query);
     }
 
     @PostMapping("/insert")
-    public User insert(@RequestAttribute AdminSession accessEntity,
+    public User insert(@RequestAttribute AdminSession adminSession,
             @Validated(UserForm.InsertGroup.class) UserForm form) {
-        accessEntity.validateRole(Role.ADMIN);
+        adminSession.validateRole(Role.ADMIN);
         return userService.insert(form.build());
     }
 
     @PostMapping("/update")
-    public User update(@RequestAttribute AdminSession accessEntity,
+    public User update(@RequestAttribute AdminSession adminSession,
             @Validated(UserForm.UpdateGroup.class) UserForm form) {
-        accessEntity.validateRole(Role.ADMIN);
+        adminSession.validateRole(Role.ADMIN);
         return userService.update(form.build());
     }
 
     @PostMapping("/change_password")
-    public User changePassword(@RequestAttribute AdminSession accessEntity, @RequestParam String password) {
-        User user = accessEntity.getUser();
+    public User changePassword(@RequestAttribute AdminSession adminSession, @RequestParam String password) {
+        User user = adminSession.getUser();
         user.setPassword(password);
         return userService.changePassword(user);
     }

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

@@ -31,17 +31,17 @@ public class VersionController {
     }
 
     @PostMapping("/insert")
-    public Version insert(@RequestAttribute AdminSession accessEntity, @RequestParam Long appId,
+    public Version insert(@RequestAttribute AdminSession adminSession, @RequestParam Long appId,
             @RequestParam VersionNumber name) {
-        accessEntity.validateRole(Role.ADMIN, Role.DEV);
-        accessEntity.validateApp(appService.getById(appId));
+        adminSession.validateRole(Role.ADMIN, Role.DEV);
+        adminSession.validateApp(appService.getById(appId));
         return versionService.insert(appService.getById(appId), name);
     }
 
     @PostMapping("/update")
-    public Version list(@RequestAttribute AdminSession accessEntity, Version version) {
-        accessEntity.validateRole(Role.ADMIN, Role.DEV);
-        accessEntity.validateApp(appService.getById(versionService.getById(version.getId()).getAppId()));
+    public Version list(@RequestAttribute AdminSession adminSession, Version version) {
+        adminSession.validateRole(Role.ADMIN, Role.DEV);
+        adminSession.validateApp(appService.getById(versionService.getById(version.getId()).getAppId()));
         return versionService.update(version);
     }