diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java index d589ebd9..bafa5f55 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java @@ -95,8 +95,11 @@ public class PipelineRunContext extends BaseRunContext{ ||ContextStateEnum.BAD_ENDING.equals(stateEnum) ||ContextStateEnum.SKIP_TO.equals(stateEnum)) { this.endTime=LocalDateTime.now(); - // 入库保存 - contextManager.toHistory(getContextDef().getId()); + if (!curr.equals(ContextStateEnum.HAPPY_ENDING)) { + // 入库保存 + contextManager.toHistory(getContextDef().getId()); + } + } } else { log.error("非法状态扭转直接忽略,{},{}",curr,stateEnum); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java index 85dcef35..853f7535 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java @@ -149,7 +149,8 @@ public class ApplicationWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-应用包审查分析节点执行失败"); } - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); } private MultiValueMap buildRequestBody(Map applicationConfigInfo, File file) { @@ -214,7 +215,8 @@ public class ApplicationWorker extends HttpWorker { // 轮询间隔 5 秒 Thread.sleep(POLLING_INTERVAL); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); log.error("轮询被中断: " + e.getMessage()); } currentPollingTimes++; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java index 7ef6b05a..8aac3c4b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java @@ -194,7 +194,8 @@ public class CodingWorker extends HttpWorker { // 轮询间隔 5 秒 Thread.sleep(POLLING_INTERVAL); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); log.error("轮询被中断: " + e.getMessage()); } currentPollingTimes++; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java index 7cc717c0..97dd032f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java @@ -158,7 +158,8 @@ public class ScaBinaryWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); } private MultiValueMap buildRequestBody(Map scaBinaryConfigInfo, File file) { @@ -224,7 +225,8 @@ public class ScaBinaryWorker extends HttpWorker { // 轮询间隔 5 秒 Thread.sleep(POLLING_INTERVAL); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); log.error("轮询被中断: " + e.getMessage()); } currentPollingTimes++; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java index 18d6a60b..ec417579 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java @@ -155,7 +155,8 @@ public class ScaMirrorWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); } private MultiValueMap buildRequestBody(Map scaMirrorConfigInfo, File file) { @@ -227,7 +228,8 @@ public class ScaMirrorWorker extends HttpWorker { // 轮询间隔 5 秒 Thread.sleep(POLLING_INTERVAL); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); log.error("轮询被中断: " + e.getMessage()); } currentPollingTimes++; 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 57dd5caa..f197d395 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 @@ -85,8 +85,8 @@ public class ScaSbomWorker extends HttpWorker { throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"目标文件不存在"); } TargetVersion targetVersion = targetVersionService.getById(pipeline.getTargetVersionId()); - filePath = targetVersion.getFilePath(); - +// filePath = targetVersion.getFilePath(); + filePath = "C:\\Users\\admin\\Desktop\\新建文件夹\\dist.zip"; try { @@ -151,7 +151,8 @@ public class ScaSbomWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); } private MultiValueMap buildRequestBody(Map scaSbomConfigInfo, File file) { @@ -216,7 +217,8 @@ public class ScaSbomWorker extends HttpWorker { // 轮询间隔 5 秒 Thread.sleep(POLLING_INTERVAL); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); +// Thread.currentThread().interrupt(); + toBadEnding(); log.error("轮询被中断: " + e.getMessage()); } currentPollingTimes++;