From f817f21c8955b5af869282db3530238baea64567 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Mon, 30 Jun 2025 16:35:32 +0800 Subject: [PATCH] =?UTF-8?q?0630=20ljc=20=20=20=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cd/casic/ci/api/TestCaseManagerController.java | 3 +-- .../casic/ci/process/engine/worker/sca/ScaMirrorWorker.java | 4 ++-- .../process/service/testCase/TestCaseManagerService.java | 3 +-- .../service/testCase/impl/TestCaseManagerServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java index 2a2db9ae..6b77e5fb 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java @@ -8,7 +8,6 @@ import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.testCase.TestCaseManagerService; import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; -import com.jcraft.jsch.JSchException; import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.jetbrains.annotations.NotNull; @@ -43,7 +42,7 @@ public class TestCaseManagerController { @PostMapping(path="/delete") - public CommonResult delete(@RequestBody @Valid BaseIdReq req) throws JSchException, InterruptedException { + public CommonResult delete(@RequestBody @Valid BaseIdReq req){ testCaseManagerService.delete(req.getId()); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java index b4a79426..271825f8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java @@ -113,7 +113,7 @@ public class ScaMirrorWorker extends HttpWorker { append(context,"SCA-MIRROR节点执行失败失败，请检查当前节点配置!"); append(context,e.getMessage()); log.error("==================SCA-MIRROR节点执行失败=================",e); - throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); + throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-MIRROR节点执行失败"); } } @@ -156,7 +156,7 @@ public class ScaMirrorWorker extends HttpWorker { } else { append(context,"==================SCA接口异常，调用失败================="); append(context,message); - throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); + throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-MIRROR节点执行失败"); } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java index 1b814122..936cff83 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java @@ -7,7 +7,6 @@ import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.dataObject.testCase.TestCaseManager; import cd.casic.framework.commons.pojo.PageResult; import com.baomidou.mybatisplus.extension.service.IService; -import com.jcraft.jsch.JSchException; import jakarta.validation.Valid; import java.util.List; @@ -23,7 +22,7 @@ public interface TestCaseManagerService extends IService { String create(@Valid TestCaseManagerReq req); - void delete(String id) throws JSchException, InterruptedException; + void delete(String id); void updateTestCaseManager(@Valid TestCaseManagerReq req); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java index 0c395cfa..e658cc29 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java @@ -63,7 +63,7 @@ public class TestCaseManagerServiceImpl extends ServiceImpl