diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/DockerWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/DockerWorker.java index c637820a..7af764a9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/DockerWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/DockerWorker.java @@ -120,7 +120,7 @@ public abstract class DockerWorker extends BaseWorker{ case STDOUT: System.out.print(output); log.info("标准输出: {}", output.trim()); - append(context, "标准输出: ,容器id:" + containerId + " content" + output); +// append(context, "容器id:" + containerId + "\n content" + output); break; case STDERR: System.err.print(output); 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 a2e44e1c..79774952 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 @@ -255,9 +255,9 @@ public class ShuiMuServiceImpl implements ShuiMuService { .queryParam("arch","x86") .queryParam("fuzzMinutes",fuzzMinutes) .toUriString(); - ResponseEntity exchange = restTemplate.exchange(uriString, HttpMethod.GET, entity, String.class, new HashMap<>()); + ResponseEntity exchange = restTemplate.exchange(uriString, HttpMethod.POST, entity, String.class, new HashMap<>()); if (exchange.getStatusCode().isError()) { - throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"保存并且构建失败"); + throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"执行测试失败"); } }