From 79e348410194a2f17ed8b3082e25fd1664b77dfd Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Tue, 20 May 2025 09:49:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/$PROJECT_FILE$ | 11 - .idea/.gitignore | 9 - .idea/CopilotChatHistory.xml | 1215 -------------- .idea/MarsCodeWorkspaceAppSettings.xml | 7 - .idea/compiler.xml | 130 -- .idea/encodings.xml | 105 -- .idea/gradle.xml | 32 - .idea/inspectionProfiles/Project_Default.xml | 68 - .idea/jarRepositories.xml | 80 - .idea/misc.xml | 75 - .idea/mybatisx/templates.xml | 1468 ----------------- .idea/qaplug_profiles.xml | 933 ----------- .idea/uiDesigner.xml | 124 -- .idea/vcs.xml | 6 - .../dispatcher/impl/ParallelDispatcher.java | 1 + .../engine/runContext/BaseRunContext.java | 4 +- 16 files changed, 4 insertions(+), 4264 deletions(-) delete mode 100644 .idea/$PROJECT_FILE$ delete mode 100644 .idea/.gitignore delete mode 100644 .idea/CopilotChatHistory.xml delete mode 100644 .idea/MarsCodeWorkspaceAppSettings.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/mybatisx/templates.xml delete mode 100644 .idea/qaplug_profiles.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$ deleted file mode 100644 index 58b7e3e5..00000000 --- a/.idea/$PROJECT_FILE$ +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 8d558430..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# Default ignored files -/shelf/ -../.idea -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/CopilotChatHistory.xml b/.idea/CopilotChatHistory.xml deleted file mode 100644 index 745a94ff..00000000 --- a/.idea/CopilotChatHistory.xml +++ /dev/null @@ -1,1215 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/MarsCodeWorkspaceAppSettings.xml b/.idea/MarsCodeWorkspaceAppSettings.xml deleted file mode 100644 index 17061628..00000000 --- a/.idea/MarsCodeWorkspaceAppSettings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index b1f55977..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index fa2287a2..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 32a2ec44..00000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index ee9f695f..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 1945c076..00000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index d5c91f5b..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/mybatisx/templates.xml b/.idea/mybatisx/templates.xml deleted file mode 100644 index dbb801d3..00000000 --- a/.idea/mybatisx/templates.xml +++ /dev/null @@ -1,1468 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml deleted file mode 100644 index c6c6dc14..00000000 --- a/.idea/qaplug_profiles.xml +++ /dev/null @@ -1,933 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946d..00000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java index e3bc027b..7b814041 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java @@ -59,6 +59,7 @@ public class ParallelDispatcher implements BaseDispatcher{ } // 等待当前阶段执行 latch.await(); + // TODO 检查是否全部执行成功 ，目前没有逻辑就是忽略错误 } // 入库 } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java index 9b6f3969..2ba00b1d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java @@ -99,6 +99,7 @@ public abstract class BaseRunContext { return; } int result = ContextStateEnum.HAPPY_ENDING.getCode(); + int fail = ContextStateEnum.BAD_ENDING.getCode(); for (Map.Entry entry : childContext.entrySet()) { BaseRunContext child = entry.getValue(); int state = child.getState().get(); @@ -106,6 +107,7 @@ public abstract class BaseRunContext { return; } result&=state; + fail&=state; } boolean end = false; if (ContextStateEnum.HAPPY_ENDING.getCode()==result) { @@ -113,7 +115,7 @@ public abstract class BaseRunContext { this.changeContextState(ContextStateEnum.HAPPY_ENDING); end = true; } - } else { + } else if (ContextStateEnum.BAD_ENDING.getCode()==fail){ if (ContextStateEnum.canGoto(ContextStateEnum.getByCode(state.get()),ContextStateEnum.BAD_ENDING)) { this.changeContextState(ContextStateEnum.BAD_ENDING); end = true;