使用 cn.reghao.jutil.jdk.result.WebResult 替换 cn.reghao.jutil.jdk.result.WebBody

manager/src/main/java/cn/reghao/devops/manager/app/controller/config/BuildDirController.java

@@ -3,7 +3,8 @@ package cn.reghao.devops.manager.app.controller.config;
 import cn.reghao.devops.manager.app.service.config.BuildDirService;
 import cn.reghao.devops.manager.app.model.po.config.build.BuildDir;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +31,6 @@ public class BuildDirController {
     @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     public String modifyBuildDir(@Validated BuildDir buildDir) {
         Result result = buildDirService.modify(buildDir);
-        return WebBody.result(result);
+        return WebResult.result(result);
     }
 }

manager/src/main/java/cn/reghao/devops/manager/app/model/po/config/build/CompilerConfig.java

@@ -2,7 +2,7 @@ package cn.reghao.devops.manager.app.model.po.config.build;
 
 import cn.reghao.devops.common.build.model.CompilerDto;
 import cn.reghao.devops.common.build.model.constant.CompileType;
-import cn.reghao.devops.manager.util.validator.CompilerConfigGroupSequenceProvider;
+import cn.reghao.devops.manager.util.validator.provider.CompilerConfigGroupSequenceProvider;
 import cn.reghao.devops.manager.util.validator.ValidEnum;
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import lombok.*;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/config/build/PackerConfig.java

@@ -2,7 +2,7 @@ package cn.reghao.devops.manager.app.model.po.config.build;
 
 import cn.reghao.devops.common.build.model.PackerDto;
 import cn.reghao.devops.common.msg.constant.PackType;
-import cn.reghao.devops.manager.util.validator.PackerConfigGroupSequenceProvider;
+import cn.reghao.devops.manager.util.validator.provider.PackerConfigGroupSequenceProvider;
 import cn.reghao.devops.manager.util.validator.ValidEnum;
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import lombok.*;

manager/src/main/java/cn/reghao/devops/manager/app/model/po/config/build/RepoAuthConfig.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.manager.app.model.po.config.build;
 
 import cn.reghao.devops.common.build.model.RepoAuth;
-import cn.reghao.devops.manager.util.validator.RepoAuthGroupSequenceProvider;
+import cn.reghao.devops.manager.util.validator.provider.RepoAuthGroupSequenceProvider;
 import cn.reghao.devops.common.build.model.constant.RepoAuthType;
 import cn.reghao.devops.common.build.model.constant.RepoType;
 import cn.reghao.devops.manager.util.validator.ValidEnum;

manager/src/main/java/cn/reghao/devops/manager/home/controller/HomePageController.java

@@ -5,7 +5,7 @@ import cn.reghao.devops.manager.home.model.UserInfo;
 import cn.reghao.devops.manager.rbac.model.po.Menu;
 import cn.reghao.devops.manager.rbac.model.po.User;
 import cn.reghao.devops.manager.home.service.HomeService;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.servlet.error.ErrorController;
@@ -74,7 +74,7 @@ public class HomePageController implements ErrorController {
     @PostMapping(value = "/userInfo", produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public String updateUserInfo(UserInfo userInfo) {
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @GetMapping("/editPwd")
@@ -85,7 +85,7 @@ public class HomePageController implements ErrorController {
     @PostMapping(value = "/editPwd", produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public String editPasswd(UpdatePasswordDto updatePasswordDto) {
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @Override

manager/src/main/java/cn/reghao/devops/manager/machine/controller/MachineHostController.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.manager.machine.controller;
 import cn.reghao.devops.manager.machine.service.MachineHostService;
 import cn.reghao.devops.manager.machine.service.MachineService;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.devops.manager.machine.model.po.SshAuth;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
@@ -38,14 +38,14 @@ public class MachineHostController {
     public ResponseEntity<String> editExtraMachineInfo(@PathVariable("machineId") String machineId,
                                                        @RequestParam("env") String env) {
         hostService.setEnv(machineId, env);
-        return ResponseEntity.ok().body(WebBody.success());
+        return ResponseEntity.ok().body(WebResult.success());
     }
 
     @ApiOperation(value = "编辑 SSH 认证信息")
     @PostMapping(value = "/sshauth/{machineId}", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> editSshAuth(@PathVariable("machineId") String machineId, @Valid SshAuth sshAuth) {
         hostService.setSshAuth(machineId, sshAuth);
-        return ResponseEntity.ok().body(WebBody.success());
+        return ResponseEntity.ok().body(WebResult.success());
     }
 
     @ApiOperation(value = "删除机器")

manager/src/main/java/cn/reghao/devops/manager/monitor/controller/AppMonitorController.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.manager.monitor.controller;
 import cn.reghao.devops.manager.monitor.model.dto.AppMonitorDto;
 import cn.reghao.devops.manager.monitor.model.dto.AppNotifyDto;
 import cn.reghao.devops.manager.monitor.service.AppMonitorService;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -30,13 +30,13 @@ public class AppMonitorController {
     @PostMapping(value = "/notify", produces = MediaType.APPLICATION_JSON_VALUE)
     public String setNotify(@Validated AppMonitorDto appMonitorDto) {
         appMonitorService.setNotify(appMonitorDto);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "应用监控通知批量设置")
     @PostMapping(value = "/notify/batch", produces = MediaType.APPLICATION_JSON_VALUE)
     public String setNotifyBatch(@Validated AppNotifyDto appNotifyDto) {
         appMonitorService.setNotifyBatch(appNotifyDto);
-        return WebBody.success();
+        return WebResult.success();
     }
 }

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/MenuController.java

@@ -5,7 +5,7 @@ import cn.reghao.devops.manager.rbac.db.query.MenuQuery;
 import cn.reghao.devops.manager.rbac.model.dto.MenuDTO;
 import cn.reghao.devops.manager.rbac.model.po.Menu;
 import cn.reghao.devops.manager.rbac.service.impl.MenuServiceImpl;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
@@ -36,29 +36,28 @@ public class MenuController {
     @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     public String addMenu(@Validated Menu menu) {
         Result result = menuServiceImpl.addMenu(menu);
-        return WebBody.result(result);
+        return WebResult.result(result);
     }
 
     @ApiOperation(value = "修改资源")
     @PostMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE)
     public String modifyMenu(@Validated MenuDTO menuDTO) {
-        /*Result result = menuServiceImpl.updateMenu(menuDTO);
-        return WebBody.result(Result.result(ResultStatus.SUCCESS));*/
-        return WebBody.success("");
+        Result result = menuServiceImpl.updateMenu(menuDTO);
+        return WebResult.result(result);
     }
 
     @ApiOperation(value = "修改资源状态")
     @PostMapping(value = "/status/{isEnabled}", produces = MediaType.APPLICATION_JSON_VALUE)
     public String menuStatus(@PathVariable("isEnabled") boolean isEnabled, @RequestParam("ids") List<Integer> ids) {
         // TODO 待实现
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "删除资源")
     @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteMenu(@PathVariable("id") Integer menuId) {
         Result result = menuServiceImpl.deleteMenu(menuId);
-        return WebBody.result(result);
+        return WebResult.result(result);
     }
 
     @ApiOperation(value = "获取指定状态的菜单")
@@ -69,7 +68,7 @@ public class MenuController {
                     role.setMenus(null);
                 }))
                 .collect(Collectors.toList());
-        return WebBody.success(list);
+        return WebResult.success(list);
     }
 
     @ApiOperation(value = "对同一 pid 组内的资源进行排序")
@@ -81,6 +80,6 @@ public class MenuController {
         if (menu != null) {
             map.remove(menu.getPos());
         }
-        return WebBody.success(map);
+        return WebResult.success(map);
     }
 }

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/RoleController.java

@@ -5,7 +5,8 @@ import cn.reghao.devops.manager.rbac.db.query.RoleQuery;
 import cn.reghao.devops.manager.rbac.model.po.Menu;
 import cn.reghao.devops.manager.rbac.model.po.Role;
 import cn.reghao.devops.manager.rbac.service.RoleService;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
@@ -37,14 +38,14 @@ public class RoleController {
     @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     public String addOrModifyRole(@Validated Role role) {
         roleService.addOrModify(role);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation("删除角色")
     @DeleteMapping(value = "/{roleId}", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteRole(@PathVariable("roleId") Integer roleId) {
         roleService.delete(roleId);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation("获取角色可访问的资源")
@@ -62,7 +63,7 @@ public class RoleController {
             }
         });
 
-        return WebBody.success(allMenus);
+        return WebResult.success(allMenus);
     }
 
     @ApiOperation("设置角色可访问的资源")
@@ -73,6 +74,6 @@ public class RoleController {
             menus = Collections.emptySet();
         }
         roleService.setRoleMenus(roleId, menus);
-        return WebBody.success();
+        return WebResult.success();
     }
 }

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/UserController.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.rbac.controller;
 
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.devops.manager.rbac.model.dto.UserInfo;
 import cn.reghao.devops.manager.rbac.model.dto.UserRole;
 import cn.reghao.devops.manager.rbac.model.po.UserAuthority;
@@ -42,14 +42,14 @@ public class UserController {
                 .collect(Collectors.toSet());
         user.setAuthorities(authorities);
         userService.createUser(user);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "修改用户信息")
     @PostMapping(value = "/modify", produces = MediaType.APPLICATION_JSON_VALUE)
     public String modifyUserInfo(@Validated UserInfo userInfo) {
         userService.modifyUserInfo(userInfo);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -57,21 +57,21 @@ public class UserController {
     @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteUser(@PathVariable("id") Integer userId) {
         userService.deleteUser(userId);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "修改用户密码")
     @PostMapping(value = "/passwd", produces = MediaType.APPLICATION_JSON_VALUE)
     public String modifyPassword(@NotNull Integer id, @NotNull String newPassword) {
         userService.modifyUserPassword(id, newPassword);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "分配用户角色")
     @PostMapping(value = "/role", produces = MediaType.APPLICATION_JSON_VALUE)
     public String assignRole(@Validated UserRole userRole) {
         userService.setUserRoles(userRole);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     // TODO 暂不启用本功能
@@ -80,6 +80,6 @@ public class UserController {
     public String setUserStatus(@PathVariable("enable") Boolean enable,
                                 @RequestParam(value = "ids") List<Integer> userIds) {
         userIds.forEach(userId -> userService.setUserStatus(userId, enable));
-        return WebBody.success();
+        return WebResult.success();
     }
 }

manager/src/main/java/cn/reghao/devops/manager/rbac/security/handler/AuthSuccessHandlerImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.rbac.security.handler;
 
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;
@@ -28,7 +28,7 @@ public class AuthSuccessHandlerImpl implements AuthenticationSuccessHandler {
 
     private void sendResponse(HttpServletResponse response) throws IOException {
         response.setContentType("text/html;charset=utf-8");
-        String result = WebBody.success("");
+        String result = WebResult.success();
         PrintWriter pt = response.getWriter();
         pt.println(result);
     }

manager/src/main/java/cn/reghao/devops/manager/sys/controller/AppEnvController.java

@@ -3,7 +3,8 @@ package cn.reghao.devops.manager.sys.controller;
 import cn.reghao.devops.manager.app.db.repository.AppEnvRepository;
 import cn.reghao.devops.manager.app.model.constant.EnvMap;
 import cn.reghao.devops.manager.app.model.po.AppEnv;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
@@ -40,13 +41,13 @@ public class AppEnvController {
                 appEnvRepository.save(appEnv1);
             }
         }
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "删除应用环境")
     @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteAppEnv(@PathVariable("id") AppEnv appEnv) {
-        return WebBody.success("暂未实现");
+        return WebResult.success("暂未实现");
     }
 
     @ApiOperation(value = "设置为默认环境")
@@ -66,6 +67,6 @@ public class AppEnvController {
             EnvMap.setDefaultEnv(appEnv.getEnvId());
         }
 
-        return WebBody.success();
+        return WebResult.success();
     }
 }

manager/src/main/java/cn/reghao/devops/manager/sys/controller/SysNotifyController.java

@@ -1,10 +1,10 @@
 package cn.reghao.devops.manager.sys.controller;
 
-import cn.reghao.jutil.jdk.result.WebBody;
 import cn.reghao.devops.manager.notification.model.po.DingAccount;
 import cn.reghao.devops.manager.notification.model.po.NotifyGroup;
 import cn.reghao.devops.manager.notification.db.repository.DingAccountRepository;
 import cn.reghao.devops.manager.notification.db.repository.NotifyGroupRepository;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
@@ -34,13 +34,13 @@ public class SysNotifyController {
     @PostMapping(value = "/ding", produces = MediaType.APPLICATION_JSON_VALUE)
     public String addDingAccount(@Validated DingAccount dingAccount) {
         dingRepository.save(dingAccount);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "删除钉钉通知账户")
     @DeleteMapping(value = "/ding", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteDingAccount(@Validated DingAccount dingAccount) {
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "添加/修改通知接收")
@@ -48,12 +48,12 @@ public class SysNotifyController {
     public String addNotifyReceiver(@Validated NotifyGroup notifyReceiver) {
         // TODO 检查通知类型和通知账户是否存在
         receiverRepository.save(notifyReceiver);
-        return WebBody.success();
+        return WebResult.success();
     }
 
     @ApiOperation(value = "删除通知接收")
     @DeleteMapping(value = "/receiver", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteNotifyReceiver(@Validated NotifyGroup notifyReceiver) {
-        return WebBody.success();
+        return WebResult.success();
     }
 }

manager/src/main/java/cn/reghao/devops/manager/sys/controller/VersionController.java

@@ -1,7 +1,8 @@
 package cn.reghao.devops.manager.sys.controller;
 
 import cn.reghao.devops.common.version.AppVersion;
-import cn.reghao.jutil.jdk.result.WebBody;
+import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,12 +27,12 @@ public class VersionController {
         if (appVersion == null) {
             appVersion = AppVersion.getVersion();
         }
-        return WebBody.success(appVersion);
+        return WebResult.success(appVersion);
     }
 
     @ApiOperation("agent 版本信息")
     @GetMapping(value = "/agent")
     public String agentVersion() {
-        return WebBody.success("暂未实现");
+        return WebResult.success("暂未实现");
     }
 }

manager/src/main/java/cn/reghao/devops/manager/util/validator/CompilerConfigGroupSequenceProvider.java → manager/src/main/java/cn/reghao/devops/manager/util/validator/provider/CompilerConfigGroupSequenceProvider.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.util.validator;
+package cn.reghao.devops.manager.util.validator.provider;
 
 import cn.reghao.devops.common.build.model.constant.CompileType;
 import cn.reghao.devops.manager.app.model.po.config.build.CompilerConfig;

manager/src/main/java/cn/reghao/devops/manager/util/validator/PackerConfigGroupSequenceProvider.java → manager/src/main/java/cn/reghao/devops/manager/util/validator/provider/PackerConfigGroupSequenceProvider.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.util.validator;
+package cn.reghao.devops.manager.util.validator.provider;
 
 import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.manager.app.model.po.config.build.PackerConfig;

manager/src/main/java/cn/reghao/devops/manager/util/validator/RepoAuthGroupSequenceProvider.java → manager/src/main/java/cn/reghao/devops/manager/util/validator/provider/RepoAuthGroupSequenceProvider.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.util.validator;
+package cn.reghao.devops.manager.util.validator.provider;
 
 import cn.reghao.devops.common.build.model.constant.RepoAuthType;
 import cn.reghao.devops.manager.app.model.po.config.build.RepoAuthConfig;