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

Compare commits

base: mianbin:2a299453d7d2e8169c4679d6f3932346543e756d
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp
..
compare: mianbin:c568df8e6fd2fcf51a3959d308aa0ed386ab2ebd
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp

No commits in common. "2a299453d7d2e8169c4679d6f3932346543e756d" and "c568df8e6fd2fcf51a3959d308aa0ed386ab2ebd" have entirely different histories.
2a299453d7 ... c568df8e6f

5 changed files with 0 additions and 35 deletions
Show Stats Expand all files Collapse all files

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ApplicationWorker.java
View File

@ -9,7 +9,6 @@ import cd.casic.ci.process.engine.runContext.BaseRunContext;
import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.HttpWorker; import cd.casic.ci.process.engine.worker.base.HttpWorker;
import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dao.pipeline.PipTaskDao;
import cd.casic.ci.process.process.dataObject.base.BaseIdReq;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import cd.casic.ci.process.process.dataObject.target.TargetVersion; import cd.casic.ci.process.process.dataObject.target.TargetVersion;
@ -220,12 +219,6 @@ public class ApplicationWorker extends HttpWorker {
} }
} }
//插入报告数据到reportInfo
BaseIdReq baseIdReq = new BaseIdReq();
baseIdReq.setTaskId(pipTask.getId());
baseIdReq.setScaTaskId(String.valueOf(scaTaskId));
reportService.createVulListByScaTaskId(baseIdReq);
//更新scaTaskId数据到task表 //更新scaTaskId数据到task表
applicationConfigInfo.put("scaTaskId",scaTaskId); applicationConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(applicationConfigInfo); pipTask.setTaskProperties(applicationConfigInfo);

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/CodingWorker.java
View File

@ -9,7 +9,6 @@ import cd.casic.ci.process.engine.runContext.BaseRunContext;
import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.HttpWorker; import cd.casic.ci.process.engine.worker.base.HttpWorker;
import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dao.pipeline.PipTaskDao;
import cd.casic.ci.process.process.dataObject.base.BaseIdReq;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.dataObject.task.PipTask;
import cd.casic.ci.process.process.service.report.impl.ReportServiceImpl; import cd.casic.ci.process.process.service.report.impl.ReportServiceImpl;
@ -200,12 +199,6 @@ public class CodingWorker extends HttpWorker {
} }
} }
//插入报告数据到reportInfo
BaseIdReq baseIdReq = new BaseIdReq();
baseIdReq.setTaskId(pipTask.getId());
baseIdReq.setScaTaskId(String.valueOf(scaTaskId));
reportService.createVulListByScaTaskId(baseIdReq);
//更新scaTaskId数据到task表 //更新scaTaskId数据到task表
codingConfigInfo.put("scaTaskId",scaTaskId); codingConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(codingConfigInfo); pipTask.setTaskProperties(codingConfigInfo);

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaBinaryWorker.java
View File

@ -9,7 +9,6 @@ import cd.casic.ci.process.engine.runContext.BaseRunContext;
import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.HttpWorker; import cd.casic.ci.process.engine.worker.base.HttpWorker;
import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dao.pipeline.PipTaskDao;
import cd.casic.ci.process.process.dataObject.base.BaseIdReq;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import cd.casic.ci.process.process.dataObject.target.TargetVersion; import cd.casic.ci.process.process.dataObject.target.TargetVersion;
@ -228,12 +227,6 @@ public class ScaBinaryWorker extends HttpWorker {
} }
} }
//插入报告数据到reportInfo
BaseIdReq baseIdReq = new BaseIdReq();
baseIdReq.setTaskId(pipTask.getId());
baseIdReq.setScaTaskId(String.valueOf(scaTaskId));
reportService.createVulListByScaTaskId(baseIdReq);
//更新scaTaskId数据到task表 //更新scaTaskId数据到task表
scaBinaryConfigInfo.put("scaTaskId",scaTaskId); scaBinaryConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(scaBinaryConfigInfo); pipTask.setTaskProperties(scaBinaryConfigInfo);

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java
View File

@ -9,7 +9,6 @@ import cd.casic.ci.process.engine.runContext.BaseRunContext;
import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.HttpWorker; import cd.casic.ci.process.engine.worker.base.HttpWorker;
import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dao.pipeline.PipTaskDao;
import cd.casic.ci.process.process.dataObject.base.BaseIdReq;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import cd.casic.ci.process.process.dataObject.target.TargetVersion; import cd.casic.ci.process.process.dataObject.target.TargetVersion;
@ -231,12 +230,6 @@ public class ScaMirrorWorker extends HttpWorker {
} }
} }
//插入报告数据到reportInfo
BaseIdReq baseIdReq = new BaseIdReq();
baseIdReq.setTaskId(pipTask.getId());
baseIdReq.setScaTaskId(String.valueOf(scaTaskId));
reportService.createVulListByScaTaskId(baseIdReq);
//更新scaTaskId数据到task表 //更新scaTaskId数据到task表
scaMirrorConfigInfo.put("scaTaskId",scaTaskId); scaMirrorConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(scaMirrorConfigInfo); pipTask.setTaskProperties(scaMirrorConfigInfo);

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

@ -9,7 +9,6 @@ import cd.casic.ci.process.engine.runContext.BaseRunContext;
import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.HttpWorker; import cd.casic.ci.process.engine.worker.base.HttpWorker;
import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dao.pipeline.PipTaskDao;
import cd.casic.ci.process.process.dataObject.base.BaseIdReq;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import cd.casic.ci.process.process.dataObject.target.TargetVersion; import cd.casic.ci.process.process.dataObject.target.TargetVersion;
@ -223,12 +222,6 @@ public class ScaSbomWorker extends HttpWorker {
} }
} }
//插入报告数据到reportInfo
BaseIdReq baseIdReq = new BaseIdReq();
baseIdReq.setTaskId(pipTask.getId());
baseIdReq.setScaTaskId(String.valueOf(scaTaskId));
reportService.createVulListByScaTaskId(baseIdReq);
//更新scaTaskId数据到task表 //更新scaTaskId数据到task表
scaSbomConfigInfo.put("scaTaskId",scaTaskId); scaSbomConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(scaSbomConfigInfo); pipTask.setTaskProperties(scaSbomConfigInfo);