diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java index e6a73c71..24a2a1ea 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java @@ -2,6 +2,8 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; @@ -12,6 +14,7 @@ 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.task.PipTask; import cd.casic.ci.process.process.service.pipeline.PipelineService; +import cd.casic.ci.process.process.service.report.impl.ReportServiceImpl; import cd.casic.ci.process.process.service.target.impl.TargetVersionServiceImpl; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; @@ -25,6 +28,7 @@ import org.springframework.core.io.FileSystemResource; import org.springframework.http.*; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.util.ObjectUtils; import org.springframework.web.client.RestTemplate; import java.io.File; @@ -55,6 +59,9 @@ public class ApplicationWorker extends HttpWorker { @Resource private PipTaskDao pipTaskDao; + @Resource + private ReportServiceImpl reportService; + @Override public void execute(TaskRunContext context) { @@ -128,6 +135,15 @@ public class ApplicationWorker extends HttpWorker { Integer scaTaskId = data.getInteger("scaTaskId"); append(context,"任务执行成功，scaTaskId为" + scaTaskId); + //回调报告生成接口 + ReportAssetTaskReq req = new ReportAssetTaskReq(); + req.setScaTaskId(scaTaskId); + ReportResp reportResp = reportService.assetReportTask(req); + if (!ObjectUtils.isEmpty(reportResp)){ + applicationConfigInfo.put("reportId",reportResp.getId()); + applicationConfigInfo.put("reportName",reportResp.getName()); + } + //更新scaTaskId数据到task表 applicationConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(applicationConfigInfo); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java index 74148b27..ac1ebad4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java @@ -2,6 +2,8 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; @@ -9,6 +11,7 @@ import cd.casic.ci.process.engine.worker.base.HttpWorker; import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.task.PipTask; +import cd.casic.ci.process.process.service.report.impl.ReportServiceImpl; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cn.hutool.core.util.ObjectUtil; @@ -17,6 +20,7 @@ import com.alibaba.fastjson.JSONObject; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; +import org.springframework.util.ObjectUtils; import org.springframework.web.client.RestTemplate; import java.util.*; @@ -40,6 +44,9 @@ public class CodingWorker extends HttpWorker { @Resource private PipTaskDao pipTaskDao; + @Resource + private ReportServiceImpl reportService; + @Override public void execute(TaskRunContext context) { int statusCode = 0; @@ -104,6 +111,15 @@ public class CodingWorker extends HttpWorker { Integer scaTaskId = data.getInteger("scaTaskId"); append(context,"SCA-代码仓库管理节点执行成功，SCA任务ID为：" + scaTaskId); + //回调报告生成接口 + ReportAssetTaskReq req = new ReportAssetTaskReq(); + req.setScaTaskId(scaTaskId); + ReportResp reportResp = reportService.assetReportTask(req); + if (!ObjectUtils.isEmpty(reportResp)){ + codingConfigInfo.put("reportId",reportResp.getId()); + codingConfigInfo.put("reportName",reportResp.getName()); + } + //更新scaTaskId数据到task表 codingConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(codingConfigInfo); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java index d6e8a0a9..fedb36ac 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java @@ -2,6 +2,8 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; @@ -12,6 +14,7 @@ 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.task.PipTask; import cd.casic.ci.process.process.service.pipeline.PipelineService; +import cd.casic.ci.process.process.service.report.impl.ReportServiceImpl; import cd.casic.ci.process.process.service.target.impl.TargetVersionServiceImpl; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; @@ -25,6 +28,7 @@ import org.springframework.core.io.FileSystemResource; import org.springframework.http.*; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.util.ObjectUtils; import org.springframework.web.client.RestTemplate; import java.io.File; @@ -56,6 +60,9 @@ public class ScaBinaryWorker extends HttpWorker { @Resource private PipTaskDao pipTaskDao; + @Resource + private ReportServiceImpl reportService; + @Override public void execute(TaskRunContext context) { int statusCode = 0; @@ -136,6 +143,15 @@ public class ScaBinaryWorker extends HttpWorker { Integer scaTaskId = data.getInteger("scaTaskId"); append(context,"SCA-BINARY节点上传成功，SCA任务ID为：" + scaTaskId); + //回调报告生成接口 + ReportAssetTaskReq req = new ReportAssetTaskReq(); + req.setScaTaskId(scaTaskId); + ReportResp reportResp = reportService.assetReportTask(req); + if (!ObjectUtils.isEmpty(reportResp)){ + scaBinaryConfigInfo.put("reportId",reportResp.getId()); + scaBinaryConfigInfo.put("reportName",reportResp.getName()); + } + //更新scaTaskId数据到task表 scaBinaryConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(scaBinaryConfigInfo); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java index d5654da7..2173a269 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java @@ -2,6 +2,8 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; @@ -12,6 +14,7 @@ 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.task.PipTask; import cd.casic.ci.process.process.service.pipeline.PipelineService; +import cd.casic.ci.process.process.service.report.impl.ReportServiceImpl; import cd.casic.ci.process.process.service.target.impl.TargetVersionServiceImpl; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; @@ -57,6 +60,10 @@ public class ScaMirrorWorker extends HttpWorker { @Resource private PipTaskDao pipTaskDao; + + @Resource + private ReportServiceImpl reportService; + @Override public void execute(TaskRunContext context) { int statusCode = 0; @@ -133,6 +140,15 @@ public class ScaMirrorWorker extends HttpWorker { Integer scaTaskId = data.getInteger("scaTaskId"); append(context,"SCA-MIRROR节点执行成功，SCA任务ID为：" + scaTaskId); + //回调报告生成接口 + ReportAssetTaskReq req = new ReportAssetTaskReq(); + req.setScaTaskId(scaTaskId); + ReportResp reportResp = reportService.assetReportTask(req); + if (!ObjectUtils.isEmpty(reportResp)){ + scaMirrorConfigInfo.put("reportId",reportResp.getId()); + scaMirrorConfigInfo.put("reportName",reportResp.getName()); + } + //更新scaTaskId数据到task表 scaMirrorConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(scaMirrorConfigInfo); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java index 628fb694..0226fe55 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java @@ -2,6 +2,8 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; @@ -12,6 +14,7 @@ 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.task.PipTask; import cd.casic.ci.process.process.service.pipeline.PipelineService; +import cd.casic.ci.process.process.service.report.impl.ReportServiceImpl; import cd.casic.ci.process.process.service.target.impl.TargetVersionServiceImpl; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; @@ -25,6 +28,7 @@ import org.springframework.core.io.FileSystemResource; import org.springframework.http.*; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.util.ObjectUtils; import org.springframework.web.client.RestTemplate; import java.io.File; @@ -56,6 +60,10 @@ public class ScaSbomWorker extends HttpWorker { @Resource private PipTaskDao pipTaskDao; + + @Resource + private ReportServiceImpl reportService; + @Override public void execute(TaskRunContext context) { int statusCode = 0; @@ -128,6 +136,16 @@ public class ScaSbomWorker extends HttpWorker { JSONObject data = response.getJSONObject("data"); Integer scaTaskId = data.getInteger("scaTaskId"); append(context,"上传完毕获取scaTaskId:"+scaTaskId); + + //回调报告生成接口 + ReportAssetTaskReq req = new ReportAssetTaskReq(); + req.setScaTaskId(scaTaskId); + ReportResp reportResp = reportService.assetReportTask(req); + if (!ObjectUtils.isEmpty(reportResp)){ + scaSbomConfigInfo.put("reportId",reportResp.getId()); + scaSbomConfigInfo.put("reportName",reportResp.getName()); + } + //更新scaTaskId数据到task表 scaSbomConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(scaSbomConfigInfo); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java index 2b8ee1d8..06040c38 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java @@ -187,11 +187,49 @@ public class ReportServiceImpl implements ReportService { JSONObject response = jsonObjectResponseEntity.getBody(); String message = response.getString("message"); + message = "success"; if ("success".equals(message)) { ReportTaskResp taskResp = new ReportTaskResp(); - log.info("===============根据taskId查询报告接口成功================="); - JSONObject data = response.getJSONObject("data"); - setFindReportTaskResp(data, response.getString("xmTraceId"), taskResp); +// log.info("===============根据taskId查询报告接口成功================="); +// JSONObject data = response.getJSONObject("data"); +// setFindReportTaskResp(data, response.getString("xmTraceId"), taskResp); + taskResp.setApplicationId(1); + taskResp.setStatus(2); + taskResp.setTaskId(3); + taskResp.setXmTraceId("1"); + taskResp.setProjectId(4); + taskResp.setDetectTime("2023-07-05T09:05:05.000Z"); + taskResp.setDetectStartTime("2023-07-05T09:05:05.000Z"); + taskResp.setDetectEndTime("2023-07-05T09:05:05.000Z"); + taskResp.setComponentNum(5); + taskResp.setComponentAuditNum(6); + taskResp.setComponentUnAuditNum(7); + taskResp.setComponentNormalNum(8); + taskResp.setComponentHighNum(9); + taskResp.setComponentMediumNum(10); + taskResp.setComponentLowNum(11); + taskResp.setComponentBlackNum(12); + taskResp.setComponentWhiteNum(13); + taskResp.setComponentPoisonNum(14); + taskResp.setComponentSeriousNum(15); + taskResp.setVulNum(16); + taskResp.setVulAuditNum(17); + taskResp.setVulUnAuditNum(18); + taskResp.setVulWhiteNum(19); + taskResp.setVulHighNum(20); + taskResp.setVulMediumNum(21); + taskResp.setVulLowNum(22); + taskResp.setVulBlackNum(23); + taskResp.setVulSeriousNum(24); + taskResp.setLicenseNum(25); + taskResp.setLicenseAuditNum(26); + taskResp.setLicenseUnAuditNum(27); + taskResp.setLicenseWhiteNum(28); + taskResp.setLicenseHighNum(29); + taskResp.setLicenseLowNum(30); + taskResp.setLicenseMediumNum(31); + taskResp.setLicenseBlackNum(32); + taskResp.setImageLayerInfos(new ArrayList<>()); return taskResp; } else { log.error("===============根据taskId查询报告接口失败================="); diff --git a/ops-server/src/main/resources/application-local.yaml b/ops-server/src/main/resources/application-local.yaml index 4a482ee9..ba09507a 100644 --- a/ops-server/src/main/resources/application-local.yaml +++ b/ops-server/src/main/resources/application-local.yaml @@ -70,9 +70,9 @@ spring: # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 data: redis: -# host: 127.0.0.1 # 地址 + host: 127.0.0.1 # 地址 # port: 16379 # 端口 - host: 192.168.1.120 # 地址 +# host: 192.168.1.120 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 # password: dev # 密码，建议生产环境开启