From 7749abdabd8fbacf108b069f9d90835739bf2408 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Wed, 30 Jul 2025 17:58:56 +0800 Subject: [PATCH] =?UTF-8?q?afl=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localAflCrashes/LocalAflCrashesSaveReq.java | 5 ----- .../ci/process/engine/worker/afl/AFLWorker.java | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/localAflCrashes/LocalAflCrashesSaveReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/localAflCrashes/LocalAflCrashesSaveReq.java index 262307c1..2456a4e4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/localAflCrashes/LocalAflCrashesSaveReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/localAflCrashes/LocalAflCrashesSaveReq.java @@ -9,11 +9,6 @@ public class LocalAflCrashesSaveReq { */ private String pipelineId; - /** - * 流水线历史记录id - */ - private String pipelineHistoryId; - /** * 任务节点id */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java index cea776d5..5b4e843c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java @@ -2,6 +2,7 @@ package cd.casic.ci.process.engine.worker.afl; import cd.casic.ci.process.common.WorkAtom; import cd.casic.ci.process.dto.req.aflManager.AflManagerReq; +import cd.casic.ci.process.dto.req.localAflCrashes.LocalAflCrashesSaveReq; import cd.casic.ci.process.dto.req.resource.ResourceQueryReq; import cd.casic.ci.process.dto.resp.resource.ResourceDetailResp; import cd.casic.ci.process.engine.constant.DIYImageExecuteCommandConstant; @@ -16,6 +17,7 @@ import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.aflManager.AflInfoService; import cd.casic.ci.process.process.service.aflManager.AflPlotInfoService; import cd.casic.ci.process.process.service.aflManager.AflSeedInfoService; +import cd.casic.ci.process.process.service.localAflCrashes.LocalAflCrashesService; import cd.casic.ci.process.process.service.target.TargetVersionService; import cd.casic.ci.process.util.SftpUploadUtil; import com.alibaba.fastjson.JSON; @@ -45,7 +47,8 @@ public class AFLWorker extends DockerWorker { private AflSeedInfoService aflSeedInfoService; @Resource private AflPlotInfoService aflPlotInfoService; - + @Resource + private LocalAflCrashesService localAflCrashesService; @Override public void execute(TaskRunContext context) { int statusCode = -1; @@ -154,7 +157,7 @@ public class AFLWorker extends DockerWorker { log.error("保存afl信息失败,入参{}", JSON.toJSONString(req),e); } } - private void afterPipelineExecute(TaskRunContext context){ + private void afterPipelineExecute(TaskRunContext context,PipPipeline pipeline){ append(context,"开始拉取afl输出信息"); PipTask contextDef = (PipTask)context.getContextDef(); String pipelineId =contextDef.getPipelineId(); @@ -162,6 +165,7 @@ public class AFLWorker extends DockerWorker { AflManagerReq req = new AflManagerReq(); req.setTaskId(taskId); req.setPipelineId(pipelineId); + TargetVersion targetVersion = targetVersionService.getById(pipeline.getTargetVersionId()); postHandlerManager.registerPostHandler(new ExecuteTaskPostHandler(taskId,pipelineId) { @Override public void executeAfterDone(PipPipelineHisInstance pipPipelineHisInstance) { @@ -172,6 +176,15 @@ public class AFLWorker extends DockerWorker { aflInfoService.updateHistoryPipelineIdByAflInfo(req); aflSeedInfoService.updateHistoryPipelineIdByAflSeedInfo(req); aflPlotInfoService.updateHistoryPipelineIdByAflPlotInfo(req); + LocalAflCrashesSaveReq crashesSaveReq = new LocalAflCrashesSaveReq(); + crashesSaveReq.setPipelineId(pipelineId); + crashesSaveReq.setInstanceId(pipPipelineHisInstance.getId()); + crashesSaveReq.setTaskId(taskId); + crashesSaveReq.setTaskType("AFL"); + crashesSaveReq.setCity("长沙");// 暂时空置 + crashesSaveReq.setTargetType(pipeline.getTargetType()); + crashesSaveReq.setTargetName(targetVersion.getFileName()); + localAflCrashesService.saveLocalAflCrashesInfo(crashesSaveReq); } }); }