From c09ebec3c721e68d0ffc28e3dea6e6b0bc03d115 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 22 May 2025 09:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=90=8D=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../casic/ci/process/engine/runContext/BaseRunContext.java | 6 +++--- .../ci/process/engine/runContext/PipelineRunContext.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 9fb39b80..0123d2e7 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 @@ -35,7 +35,7 @@ public abstract class BaseRunContext { * */ private LocalDateTime endTime; private String resourceId; - private String targetId; + private String targetVersionId; private String targetType; /** * 整个流水线全局的变量 @@ -47,14 +47,14 @@ public abstract class BaseRunContext { private Map localVariables; private Map childContext; - public BaseRunContext(PipBaseElement contextDef,Integer childCount,BaseRunContext parentContext, LocalDateTime startTime, String resourceId, String targetId, String targetType, Map globalVariables, Map localVariables, Map childContext) { + public BaseRunContext(PipBaseElement contextDef,Integer childCount,BaseRunContext parentContext, LocalDateTime startTime, String resourceId, String targetVersionId, String targetType, Map globalVariables, Map localVariables, Map childContext) { this.contextDef = contextDef; this.childCount = childCount; this.parentContext = parentContext; this.state = new AtomicInteger(ContextStateEnum.INIT.getCode()); this.startTime = startTime; this.resourceId = resourceId; - this.targetId = targetId; + this.targetVersionId = targetVersionId; this.targetType = targetType; this.globalVariables = globalVariables; this.localVariables = localVariables; 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 3565ae51..a02d9c81 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 @@ -17,16 +17,16 @@ public class PipelineRunContext extends BaseRunContext{ } public PipelineRunContext(PipPipeline pipeline,Integer childCount,BaseRunContext parentContext, Map globalVariables, Map localVariables) { - this(pipeline,childCount,parentContext,LocalDateTime.now(),pipeline.getResourceId(),pipeline.getTargetId(),pipeline.getTargetType(),globalVariables,localVariables,new ConcurrentHashMap<>()); + this(pipeline,childCount,parentContext,LocalDateTime.now(),pipeline.getResourceId(),pipeline.getTargetVersionId(),pipeline.getTargetType(),globalVariables,localVariables,new ConcurrentHashMap<>()); } - private PipelineRunContext(PipBaseElement contextDef,Integer childCount, BaseRunContext parentContext, LocalDateTime startTime, String resourceId, String targetId, String targetType, Map globalVariables, Map localVariables, Map childContext) { + private PipelineRunContext(PipBaseElement contextDef,Integer childCount, BaseRunContext parentContext, LocalDateTime startTime, String resourceId, String targetVersionId, String targetType, Map globalVariables, Map localVariables, Map childContext) { super( contextDef ,childCount ,parentContext ,startTime , resourceId - , targetId + , targetVersionId , targetType , globalVariables , localVariables