From 3c4e338b23b8113220c1f51f1717c4166b853435 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Mon, 12 May 2025 09:36:04 +0800 Subject: [PATCH] 0512 ljc --- .../java/cd/casic/framework/commons/pojo/CommonResult.java | 7 +++++-- .../java/cd/casic/server/controller/EnvController.java | 4 ++-- .../java/cd/casic/server/controller/GroupController.java | 4 ++-- .../cd/casic/server/controller/PipelineController.java | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/framework/commons/src/main/java/cd/casic/framework/commons/pojo/CommonResult.java b/framework/commons/src/main/java/cd/casic/framework/commons/pojo/CommonResult.java index 4c90fd0..c9f1c4d 100644 --- a/framework/commons/src/main/java/cd/casic/framework/commons/pojo/CommonResult.java +++ b/framework/commons/src/main/java/cd/casic/framework/commons/pojo/CommonResult.java @@ -82,8 +82,11 @@ public class CommonResult implements Serializable { return Objects.equals(code, GlobalErrorCodeConstants.SUCCESS.getCode()); } - public static CommonResult ok() { - return new CommonResult(); + public static CommonResult success() { + CommonResult result = new CommonResult<>(); + result.code = GlobalErrorCodeConstants.SUCCESS.getCode(); + result.msg = ""; + return result; } @JsonIgnore // 避免 jackson 序列化 diff --git a/ops-server/src/main/java/cd/casic/server/controller/EnvController.java b/ops-server/src/main/java/cd/casic/server/controller/EnvController.java index 151a6ff..c9ee8e4 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/EnvController.java +++ b/ops-server/src/main/java/cd/casic/server/controller/EnvController.java @@ -41,7 +41,7 @@ public class EnvController { // envService.deleteEnv(envId); - return CommonResult.ok(); + return CommonResult.success(); } @PostMapping(path="/findEnvList") @@ -64,7 +64,7 @@ public class EnvController { // this.envService.updateEnv(env); - return CommonResult.ok(); + return CommonResult.success(); } diff --git a/ops-server/src/main/java/cd/casic/server/controller/GroupController.java b/ops-server/src/main/java/cd/casic/server/controller/GroupController.java index 1ebdb5d..7f9b0a8 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/GroupController.java +++ b/ops-server/src/main/java/cd/casic/server/controller/GroupController.java @@ -41,7 +41,7 @@ public class GroupController { // groupService.deleteGroup(groupId); - return CommonResult.ok(); + return CommonResult.success(); } @PostMapping(path="/findGroupList") @@ -64,7 +64,7 @@ public class GroupController { // this.groupService.updateGroup(group); - return CommonResult.ok(); + return CommonResult.success(); } diff --git a/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java b/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java index 090aaf9..32ad132 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java +++ b/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java @@ -51,7 +51,7 @@ public class PipelineController { // pipelineService.deletePipeline(pipelineId); - return CommonResult.ok(); + return CommonResult.success(); } @PostMapping(path="/findOnePipeline") @@ -95,7 +95,7 @@ public class PipelineController { // pipelineService.updatePipeline(pipeline); - return CommonResult.ok(); + return CommonResult.success(); } @@ -148,7 +148,7 @@ public class PipelineController { // pipelineService.pipelineClone(pipelineId,pipelineName); - return CommonResult.ok(); + return CommonResult.success(); } @PostMapping(path="/findPipelineCloneName")