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

Compare commits

base: mianbin:a78308f1d0c9ee45199fa745e80b656ada5d6d46
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp
..
compare: mianbin:898de4e49a6ef7e73b7e0ce220bc68498a8ef3c8
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp

No commits in common. "a78308f1d0c9ee45199fa745e80b656ada5d6d46" and "898de4e49a6ef7e73b7e0ce220bc68498a8ef3c8" have entirely different histories.
a78308f1d0 ... 898de4e49a

2 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -141,7 +141,7 @@ public class MemoryLogManager implements LoggerManager {
if (!CollectionUtils.isEmpty(sseEmitters)) { if (!CollectionUtils.isEmpty(sseEmitters)) {
sseEmitters.forEach(ResponseBodyEmitter::complete); sseEmitters.forEach(ResponseBodyEmitter::complete);
} }
logDao.updateById(pipTaskLog); // logDao.updateById(pipTaskLog);
} else { } else {
// 不存在就新增 // 不存在就新增
PipTaskLog pipTaskLog = new PipTaskLog(); PipTaskLog pipTaskLog = new PipTaskLog();

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java
View File

@ -85,7 +85,8 @@ public class ScaSbomWorker extends HttpWorker {
throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"目标文件不存在"); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"目标文件不存在");
} }
TargetVersion targetVersion = targetVersionService.getById(pipeline.getTargetVersionId()); TargetVersion targetVersion = targetVersionService.getById(pipeline.getTargetVersionId());
filePath = targetVersion.getFilePath(); // filePath = targetVersion.getFilePath();
filePath = "C:\\Users\\admin\\Desktop\\新建文件夹\\dist.zip";
try { try {