diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/constant/ShuiMuConstant.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/constant/ShuiMuConstant.java index e4b42ede..5afa457d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/constant/ShuiMuConstant.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/constant/ShuiMuConstant.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.engine.constant; public class ShuiMuConstant { - public static final String SHUI_MU_PROJECT_ID_KEY="projectId"; + public static final String SHUI_MU_PROJECT_ID_KEY="id"; public static final String SHUI_MU_FUZZ_MINUTES = "fuzzMinutes"; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/shuimu/ShuiMuWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/shuimu/ShuiMuWorker.java index d726d489..e5dc971b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/shuimu/ShuiMuWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/shuimu/ShuiMuWorker.java @@ -34,10 +34,15 @@ public class ShuiMuWorker extends BaseWorker { ShuiMuProjectResourceResp projectResource = shuiMuService.getProjectResource(projectId); append(context,"当前执行情况:"); append(context, JSON.toJSONString(projectResource)); - if (projectResource.getTestResource()==0) { + if (projectResource.getTestResource()+projectResource.getQueueResource()==0) { append(context,"水木模糊测试执行完毕"); break; } + try { + Thread.sleep(1000L); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java index 79774952..8986bedd 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java @@ -207,11 +207,11 @@ public class ShuiMuServiceImpl implements ShuiMuService { public void uploadWfuzzJson(ShuiMuUpdateWFuzzJsonReq req) { ShuiMuProjectInfoResp projectInfo = getProjectInfo(req.getProjectId()); String projectName = projectInfo.getName(); - Map restReq = new HashMap<>(); + Map restReq = new HashMap<>(); restReq.put("project",projectName); restReq.put("product",projectInfo.getProduct()); restReq.put("language",projectInfo.getLanguage()); - restReq.put("build",req.getBuild()); + restReq.put("build",JSON.parseObject(req.getBuild())); String tempDir = System.getProperty("java.io.tmpdir"); File tempFile = new File(tempDir,"wfuzz.json");