From 5857f215a206b3d37ac429ceb2945cd033db1fcf Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 22 May 2025 17:45:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8A=B6=E6=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cd/casic/ci/process/engine/worker/BaseWorker.java | 1 + .../process/engine/worker/DIYImageExecuteCommandWorker.java | 2 +- .../cd/casic/ci/process/engine/worker/ScaSbomWorker.java | 4 +++- .../ci/process/process/service/pipeline/PipelineService.java | 3 ++- .../process/service/pipeline/impl/PipelineServiceImpl.java | 5 +++-- .../java/cd/casic/server/controller/PipelineController.java | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/BaseWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/BaseWorker.java index 3d09b1fd..707ae17f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/BaseWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/BaseWorker.java @@ -61,6 +61,7 @@ public abstract class BaseWorker implements Runnable{ taskRunContext.getLocalVariables().put(EngineRuntimeConstant.LOG_KEY,pipTaskLog); execute(taskRunContext); } catch (Exception e) { + log.error("================worker执行报错：",e); taskRunContext.changeContextState(ContextStateEnum.BAD_ENDING); return; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java index 40e76c0e..43ddae22 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @Slf4j //@Plugin(taskType = "CUSTOM_IMAGE_EXECUTION_COMMAND") -@Plugin(taskType = "test") +//@Plugin(taskType = "test") public class DIYImageExecuteCommandWorker extends SshWorker { @Override diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java index 2886cebe..1c814e47 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java @@ -39,7 +39,7 @@ import java.util.*; * @Description: */ @Slf4j -@Plugin(taskType = "scaSbom") +@Plugin(taskType = "test") public class ScaSbomWorker extends HttpWorker{ private static final int POLLING_INTERVAL = 5000; // 轮询间隔，单位：毫秒 @@ -98,6 +98,7 @@ public class ScaSbomWorker extends HttpWorker{ pipTaskLog.append("==================SCA-SBOM节点执行失败================="); pipTaskLog.append("SCA-SBOM节点执行失败失败，请检查当前节点配置!"); pipTaskLog.append(e.getMessage()); + log.error("==================SCA-SBOM节点执行失败=================",e); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } } @@ -135,6 +136,7 @@ public class ScaSbomWorker extends HttpWorker{ pollTaskStatus(restTemplate, oldScaTaskId); } else { pipTaskLog.append("==================SCA接口异常，调用失败================="); + log.error(message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java index e5cda4c5..0500663b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java @@ -5,6 +5,7 @@ import cd.casic.ci.common.pipeline.req.pipeline.PipelineQueryReq; import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq; import cd.casic.ci.common.pipeline.req.pipeline.PipelineUpdateReq; import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp; +import cd.casic.ci.common.pipeline.resp.context.TreeRunContextResp; import cd.casic.ci.common.pipeline.resp.pipeline.PipelineFindResp; import cd.casic.ci.common.pipeline.utils.PageResult; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; @@ -36,5 +37,5 @@ public interface PipelineService extends IService { PipelineFindResp findPipelineById(@Valid PipelineQueryReq pipelineQueryReq); - Map getPipelineRunState(String pipelineId); + TreeRunContextResp getPipelineRunState(String pipelineId); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java index 6bf82e93..137287d9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java @@ -526,7 +526,7 @@ public class PipelineServiceImpl extends ServiceImpl i } @Override - public Map getPipelineRunState(String pipelineId) { + public TreeRunContextResp getPipelineRunState(String pipelineId) { BaseRunContext context = contextManager.getContext(pipelineId); if (context instanceof PipelineRunContext pipelineRunContext) { TreeRunContextResp pipeline = new TreeRunContextResp(); @@ -554,8 +554,9 @@ public class PipelineServiceImpl extends ServiceImpl i taskStateMap.put(taskId,taskState); } } + return pipeline; } - return new HashMap<>(); + return new TreeRunContextResp(); } } 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 814f9f88..151f9348 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 @@ -5,6 +5,7 @@ import cd.casic.ci.common.pipeline.req.pipeline.PipelineQueryReq; import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq; import cd.casic.ci.common.pipeline.req.pipeline.PipelineUpdateReq; import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp; +import cd.casic.ci.common.pipeline.resp.context.TreeRunContextResp; import cd.casic.ci.common.pipeline.resp.pipeline.PipelineFindResp; import cd.casic.ci.common.pipeline.utils.PageResult; import cd.casic.ci.process.engine.executor.PipelineExecutor; @@ -105,7 +106,7 @@ public class PipelineController { return CommonResult.success(execute); } @PostMapping("/getStageRunState/{pipelineId}") - public CommonResult> getPipelineRunState(@PathVariable String pipelineId){ + public CommonResult getPipelineRunState(@PathVariable String pipelineId){ return CommonResult.success(pipelineService.getPipelineRunState(pipelineId)); } }