From 6d6c2c8f58c25be4c7555e3e9017f76f2a8e73c9 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Fri, 25 Jul 2025 16:20:30 +0800 Subject: [PATCH] =?UTF-8?q?0725=20ljc=20=20=E4=BF=AE=E6=94=B9TargetFileUpl?= =?UTF-8?q?oadProperties=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ci/commons}/properties/TargetFileUploadProperties.java | 2 +- .../process/service/sftpFile/impl/SftpFileServiceImpl.java | 2 +- .../process/service/target/impl/TargetManagerServiceImpl.java | 2 +- .../service/testCase/impl/TestCaseManagerServiceImpl.java | 2 +- ops-server/src/test/java/cd/casic/server/ZipFileTest.java | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) rename modules/{module-ci-process-biz/src/main/java/cd/casic/ci/process => module-ci-commons/src/main/java/cd/casic/ci/commons}/properties/TargetFileUploadProperties.java (95%) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/properties/TargetFileUploadProperties.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/properties/TargetFileUploadProperties.java similarity index 95% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/properties/TargetFileUploadProperties.java rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/properties/TargetFileUploadProperties.java index 9683d967..3f17edb6 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/properties/TargetFileUploadProperties.java +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/properties/TargetFileUploadProperties.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.properties; +package cd.casic.ci.commons.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sftpFile/impl/SftpFileServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sftpFile/impl/SftpFileServiceImpl.java index a513c8ca..c5e5524f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sftpFile/impl/SftpFileServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sftpFile/impl/SftpFileServiceImpl.java @@ -3,7 +3,7 @@ package cd.casic.ci.process.process.service.sftpFile.impl; import cd.casic.ci.commons.sftp.SftpClientUtils; import cd.casic.ci.process.process.service.sftpFile.SftpFileService; -import cd.casic.ci.process.properties.TargetFileUploadProperties; +import cd.casic.ci.commons.properties.TargetFileUploadProperties; import com.amazonaws.util.IOUtils; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java index 03652702..1b167d1e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java @@ -15,7 +15,7 @@ import cd.casic.ci.process.process.dataObject.target.TargetVersion; import cd.casic.ci.process.process.service.pipeline.PipelineService; import cd.casic.ci.process.process.service.sftpFile.impl.SftpFileServiceImpl; import cd.casic.ci.process.process.service.target.TargetManagerService; -import cd.casic.ci.process.properties.TargetFileUploadProperties; +import cd.casic.ci.commons.properties.TargetFileUploadProperties; import cd.casic.ci.process.util.SftpUploadUtil; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; 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 124bd748..7ce6fb11 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 @@ -13,7 +13,7 @@ import cd.casic.ci.process.process.dataObject.testCase.TestCaseInfo; import cd.casic.ci.process.process.dataObject.testCase.TestCaseManager; import cd.casic.ci.process.process.service.testCase.TestCaseInfoService; import cd.casic.ci.process.process.service.testCase.TestCaseManagerService; -import cd.casic.ci.process.properties.TargetFileUploadProperties; +import cd.casic.ci.commons.properties.TargetFileUploadProperties; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.pojo.PageResult; diff --git a/ops-server/src/test/java/cd/casic/server/ZipFileTest.java b/ops-server/src/test/java/cd/casic/server/ZipFileTest.java index ab2ea76e..d385df77 100644 --- a/ops-server/src/test/java/cd/casic/server/ZipFileTest.java +++ b/ops-server/src/test/java/cd/casic/server/ZipFileTest.java @@ -1,10 +1,8 @@ package cd.casic.server; -import cd.casic.ci.process.properties.TargetFileUploadProperties; -import cd.casic.ci.process.util.SftpUploadUtil; +import cd.casic.ci.commons.properties.TargetFileUploadProperties; import com.jcraft.jsch.*; import jakarta.annotation.Resource; -import jodd.io.IOUtil; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;