mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重新运行逻辑结束时间清空

Browse Source
This commit is contained in:
even 2025-07-17 10:23:42 +08:00
parent 411526063a
commit d4778d8ee3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java
View File

@ -15,6 +15,7 @@ import cd.casic.ci.process.process.dataObject.task.PipTask;
import cd.casic.framework.mq.redis.core.RedisMQTemplate; import cd.casic.framework.mq.redis.core.RedisMQTemplate;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -56,6 +57,7 @@ public class SerialDispatcher implements BaseDispatcher {
if (context != null) { if (context != null) {
taskRunContext= (TaskRunContext) context; taskRunContext= (TaskRunContext) context;
context.setContextDef(pipTask); context.setContextDef(pipTask);
context.setEndTime(null);
} else { } else {
// 防止运行停止以后添加节点,以及到达之前未执行的节点 ,todo 删除节点的同时也要删除上下文 // 防止运行停止以后添加节点,以及到达之前未执行的节点 ,todo 删除节点的同时也要删除上下文
taskRunContext = new TaskRunContext(pipTask,stageRunContext,new HashMap<>()); taskRunContext = new TaskRunContext(pipTask,stageRunContext,new HashMap<>());

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseInfoServiceImpl.java
View File

@ -159,7 +159,7 @@ public class TestCaseInfoServiceImpl extends ServiceImpl<TestCaseInfoDao, TestCa
try{ try{
InputStream inputStream = file.getInputStream(); InputStream inputStream = file.getInputStream();
String md5Str = FileUtil.getMD5Str(inputStream); String md5Str = FileUtil.getMD5Str(inputStream);
if (checkMd5Exist(md5Str)) { if (!checkMd5Exist(md5Str)) {
return md5Str; return md5Str;
} }
} catch (Exception e ){ } catch (Exception e ){