From 92fa95b91fc167958c618c394a4b3361e51180cf Mon Sep 17 00:00:00 2001
From: even <827656971@qq.com>
Date: Mon, 7 Jul 2025 09:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=9C=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../casic/ci/process/engine/constant/ShuiMuConstant.java   | 2 +-
 .../ci/process/engine/worker/shuimu/ShuiMuWorker.java      | 7 ++++++-
 .../process/service/shuimu/impl/ShuiMuServiceImpl.java     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

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<String,String> restReq = new HashMap<>();
+        Map<String,Object> 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");