diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AgentController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AgentController.java index c09974a8..1ab36ceb 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AgentController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AgentController.java @@ -1,7 +1,7 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.agent.AgentQueryReq; -import cd.casic.ci.process.dal.resp.agent.AgentResp; +import cd.casic.ci.process.dto.req.agent.AgentQueryReq; +import cd.casic.ci.process.dto.resp.agent.AgentResp; import cd.casic.framework.commons.pojo.CommonResult; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/EnvController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/EnvController.java index 817f14d7..5f15121a 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/EnvController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/EnvController.java @@ -1,8 +1,8 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.env.EnvQueryReq; -import cd.casic.ci.process.dal.req.env.EnvReq; -import cd.casic.ci.process.dal.resp.env.EnvResp; +import cd.casic.ci.process.dto.req.env.EnvQueryReq; +import cd.casic.ci.process.dto.req.env.EnvReq; +import cd.casic.ci.process.dto.resp.env.EnvResp; import cd.casic.framework.commons.pojo.CommonResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.validation.Valid; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/GroupController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/GroupController.java index 0655bcac..ce257535 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/GroupController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/GroupController.java @@ -1,9 +1,9 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.group.GroupQueryReq; -import cd.casic.ci.process.dal.req.group.GroupReq; -import cd.casic.ci.process.dal.resp.group.GroupResp; +import cd.casic.ci.process.dto.req.group.GroupQueryReq; +import cd.casic.ci.process.dto.req.group.GroupReq; +import cd.casic.ci.process.dto.resp.group.GroupResp; import cd.casic.framework.commons.pojo.CommonResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.validation.Valid; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java index 6fe4aebc..74166120 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java @@ -1,6 +1,6 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.history.PipelineHistoryQueryReq; +import cd.casic.ci.process.dto.req.history.PipelineHistoryQueryReq; import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance; import cd.casic.ci.process.process.dataObject.log.PipTaskLog; import cd.casic.ci.process.process.service.history.PipelineHistoryService; @@ -10,8 +10,6 @@ import cd.casic.framework.commons.pojo.PageResult; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("/history") public class PipHistoryController { diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipelineController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipelineController.java index 6611be93..bd6eafb7 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipelineController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipelineController.java @@ -1,27 +1,23 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.pipeline.PipelineCreateReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineQueryReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineUpdateReq; -import cd.casic.ci.process.dal.resp.context.TreeRunContextResp; -import cd.casic.ci.process.dal.resp.pipeline.PipelineFindResp; +import cd.casic.ci.process.dto.req.pipeline.PipelineCreateReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineQueryReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineUpdateReq; +import cd.casic.ci.process.dto.resp.context.TreeRunContextResp; +import cd.casic.ci.process.dto.resp.pipeline.PipelineFindResp; import cd.casic.ci.process.engine.executor.PipelineExecutor; import cd.casic.ci.process.engine.runContext.PipelineRunContext; import cd.casic.ci.process.enums.PiplineTriggerModeEnum; import cd.casic.ci.process.process.service.pipeline.PipelineService; import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; -import cd.casic.framework.security.core.LoginUser; import jakarta.annotation.Resource; import jakarta.annotation.security.PermitAll; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import org.jetbrains.annotations.NotNull; -import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ReportController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ReportController.java index 25c9c576..55c4fe30 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ReportController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ReportController.java @@ -1,9 +1,9 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.report.ReportAssetTaskReq; -import cd.casic.ci.process.dal.req.report.ReportDeleteReq; -import cd.casic.ci.process.dal.resp.report.ReportResp; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.req.report.ReportDeleteReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.process.dataObject.base.BaseIdPageReq; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.report.ReportService; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ResourceManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ResourceManagerController.java index 61ed379d..268fdb3b 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ResourceManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ResourceManagerController.java @@ -1,9 +1,9 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.resource.ResourceQueryReq; -import cd.casic.ci.process.dal.req.resource.ResourceReq; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.req.resource.ResourceQueryReq; +import cd.casic.ci.process.dto.req.resource.ResourceReq; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.resource.ResourceManagerService; import cd.casic.framework.commons.pojo.CommonResult; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java index 3f275028..980a0c57 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java @@ -1,10 +1,10 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.stage.StageCreateReq; -import cd.casic.ci.process.dal.req.stage.StageUpdateReq; -import cd.casic.ci.process.dal.resp.context.SingletonRunContextResp; -import cd.casic.ci.process.dal.resp.stage.StageResp; +import cd.casic.ci.process.dto.req.stage.StageCreateReq; +import cd.casic.ci.process.dto.req.stage.StageUpdateReq; +import cd.casic.ci.process.dto.resp.context.SingletonRunContextResp; +import cd.casic.ci.process.dto.resp.stage.StageResp; import cd.casic.ci.process.process.service.stage.StageService; import cd.casic.framework.commons.pojo.CommonResult; import jakarta.annotation.Resource; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java index fb13b2a5..74b862fe 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java @@ -1,9 +1,9 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.target.*; -import cd.casic.ci.process.dal.resp.target.TargetManagerResp; -import cd.casic.ci.process.dal.resp.target.TargetVersionResp; +import cd.casic.ci.process.dto.req.target.*; +import cd.casic.ci.process.dto.resp.target.TargetManagerResp; +import cd.casic.ci.process.dto.resp.target.TargetVersionResp; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.target.TargetManagerService; import cd.casic.ci.process.process.service.target.TargetVersionService; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TaskTemplateController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TaskTemplateController.java index c720e833..bd6651ad 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TaskTemplateController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TaskTemplateController.java @@ -1,6 +1,6 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.resp.taskTemplate.TaskTemplateResp; +import cd.casic.ci.process.dto.resp.taskTemplate.TaskTemplateResp; import cd.casic.ci.process.process.service.taskTemplate.TaskTemplateService; import cd.casic.framework.commons.pojo.CommonResult; import jakarta.annotation.Resource; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TasksController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TasksController.java index e641450c..54d8131f 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TasksController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TasksController.java @@ -1,8 +1,8 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.task.TaskUpdateReq; -import cd.casic.ci.process.dal.resp.task.TasksResp; +import cd.casic.ci.process.dto.req.task.TaskUpdateReq; +import cd.casic.ci.process.dto.resp.task.TasksResp; import cd.casic.ci.process.process.service.task.TaskService; import cd.casic.framework.commons.pojo.CommonResult; import jakarta.annotation.Resource; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java index fa7dc347..06f019b1 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java @@ -1,8 +1,8 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.template.TemplateQueryReq; -import cd.casic.ci.process.dal.resp.template.TemplateFindResp; +import cd.casic.ci.process.dto.req.template.TemplateQueryReq; +import cd.casic.ci.process.dto.resp.template.TemplateFindResp; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.template.TemplateManagerService; import cd.casic.framework.commons.pojo.CommonResult; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TriggerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TriggerController.java index afa44950..fdd8f71b 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TriggerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TriggerController.java @@ -1,6 +1,6 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.trigger.TriggerQueryReq; +import cd.casic.ci.process.dto.req.trigger.TriggerQueryReq; import cd.casic.framework.commons.pojo.CommonResult; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/VariableController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/VariableController.java index 909cb752..c1c8b817 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/VariableController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/VariableController.java @@ -1,8 +1,8 @@ package cd.casic.ci.api; -import cd.casic.ci.process.dal.req.variable.VariableReq; -import cd.casic.ci.process.dal.resp.variable.VariableResp; +import cd.casic.ci.process.dto.req.variable.VariableReq; +import cd.casic.ci.process.dto.resp.variable.VariableResp; import cd.casic.framework.commons.pojo.CommonResult; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/package-info.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/package-info.java similarity index 74% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/package-info.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/package-info.java index d7acab1c..9f7dee22 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/package-info.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/package-info.java @@ -4,4 +4,4 @@ * @date: 2025/5/30 16:19 * @version: 1.0 */ -package cd.casic.ci.process.dal; \ No newline at end of file +package cd.casic.ci.process.dto; \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/agent/AgentQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/agent/AgentQueryReq.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/agent/AgentQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/agent/AgentQueryReq.java index da7ce80f..dc8741f4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/agent/AgentQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/agent/AgentQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.agent; +package cd.casic.ci.process.dto.req.agent; import cd.casic.framework.commons.pojo.PageParam; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/env/EnvQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/env/EnvQueryReq.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/env/EnvQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/env/EnvQueryReq.java index 1600e11d..ae5a9114 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/env/EnvQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/env/EnvQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.env; +package cd.casic.ci.process.dto.req.env; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/env/EnvReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/env/EnvReq.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/env/EnvReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/env/EnvReq.java index f0962f74..b2354d77 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/env/EnvReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/env/EnvReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.env; +package cd.casic.ci.process.dto.req.env; import cd.casic.framework.commons.dataobject.User; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/group/GroupQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/group/GroupQueryReq.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/group/GroupQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/group/GroupQueryReq.java index 6e2e8d8d..2c98c5f9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/group/GroupQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/group/GroupQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.group; +package cd.casic.ci.process.dto.req.group; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/group/GroupReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/group/GroupReq.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/group/GroupReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/group/GroupReq.java index 19d5bd76..7de81e37 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/group/GroupReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/group/GroupReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.group; +package cd.casic.ci.process.dto.req.group; import cd.casic.framework.commons.dataobject.User; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/history/PipelineHistoryQueryReq.java similarity index 84% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/history/PipelineHistoryQueryReq.java index 90436a8a..17d056fe 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/history/PipelineHistoryQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.history; +package cd.casic.ci.process.dto.req.history; import cd.casic.framework.commons.pojo.PageParam; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/machine/MachineInfoReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/machine/MachineInfoReq.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/machine/MachineInfoReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/machine/MachineInfoReq.java index 94df75a4..3944cb04 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/machine/MachineInfoReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/machine/MachineInfoReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.machine; +package cd.casic.ci.process.dto.req.machine; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineCreateReq.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineCreateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineCreateReq.java index 7d06e154..6c2dc210 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineCreateReq.java @@ -1,6 +1,6 @@ -package cd.casic.ci.process.dal.req.pipeline; +package cd.casic.ci.process.dto.req.pipeline; -import cd.casic.ci.process.dal.req.resource.ResourceReq; +import cd.casic.ci.process.dto.req.resource.ResourceReq; import lombok.Data; import java.time.LocalDateTime; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineQueryReq.java similarity index 93% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineQueryReq.java index 5bd500a8..cc4dfd05 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.pipeline; +package cd.casic.ci.process.dto.req.pipeline; import cd.casic.framework.commons.pojo.PageParam; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineReq.java similarity index 98% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineReq.java index e0f1e8b9..dd5ad805 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.pipeline; +package cd.casic.ci.process.dto.req.pipeline; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineUpdateReq.java similarity index 98% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineUpdateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineUpdateReq.java index d929920d..17505e12 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/pipeline/PipelineUpdateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineUpdateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.pipeline; +package cd.casic.ci.process.dto.req.pipeline; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportAdvancedSearch.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportAdvancedSearch.java similarity index 97% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportAdvancedSearch.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportAdvancedSearch.java index 24b36cb6..f45b7510 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportAdvancedSearch.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportAdvancedSearch.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.report; +package cd.casic.ci.process.dto.req.report; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportAssetTaskReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportAssetTaskReq.java similarity index 93% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportAssetTaskReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportAssetTaskReq.java index 9528866f..a1f68a9e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportAssetTaskReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportAssetTaskReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.report; +package cd.casic.ci.process.dto.req.report; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportDeleteReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportDeleteReq.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportDeleteReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportDeleteReq.java index b875487a..a0d56cc6 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/report/ReportDeleteReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/report/ReportDeleteReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.report; +package cd.casic.ci.process.dto.req.report; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/resource/ResourceQueryReq.java similarity index 93% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/resource/ResourceQueryReq.java index ef1db4bf..bb84a43f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/resource/ResourceQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.resource; +package cd.casic.ci.process.dto.req.resource; import cd.casic.framework.commons.pojo.PageParam; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/resource/ResourceReq.java similarity index 95% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/resource/ResourceReq.java index 250186ce..c2239d17 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/resource/ResourceReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.resource; +package cd.casic.ci.process.dto.req.resource; import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud; import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/stage/StageCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageCreateReq.java similarity index 68% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/stage/StageCreateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageCreateReq.java index d35c1600..9e428e6e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/stage/StageCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageCreateReq.java @@ -1,6 +1,6 @@ -package cd.casic.ci.process.dal.req.stage; +package cd.casic.ci.process.dto.req.stage; -import cd.casic.ci.process.dal.req.task.TaskCreateReq; +import cd.casic.ci.process.dto.req.task.TaskCreateReq; import lombok.Data; @Data diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/stage/StageUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageUpdateReq.java similarity index 83% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/stage/StageUpdateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageUpdateReq.java index 718da7ee..dff3b3e1 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/stage/StageUpdateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageUpdateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.stage; +package cd.casic.ci.process.dto.req.stage; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetDownloadReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetDownloadReq.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetDownloadReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetDownloadReq.java index 80888968..fad8d15f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetDownloadReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetDownloadReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.target; +package cd.casic.ci.process.dto.req.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetManagerCreateReq.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetManagerCreateReq.java index d3e81515..c372cf5e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetManagerCreateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.target; +package cd.casic.ci.process.dto.req.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetManagerUpdateReq.java similarity index 91% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetManagerUpdateReq.java index b6522b16..914fdfdd 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetManagerUpdateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.target; +package cd.casic.ci.process.dto.req.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetQueryReq.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetQueryReq.java index 1e3d7733..cafbd7f8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.target; +package cd.casic.ci.process.dto.req.target; import cd.casic.framework.commons.pojo.PageParam; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetUploadReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetUploadReq.java similarity index 95% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetUploadReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetUploadReq.java index 76fd082b..a67c53ca 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetUploadReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetUploadReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.target; +package cd.casic.ci.process.dto.req.target; import lombok.Data; import org.springframework.web.multipart.MultipartFile; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetVersionCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetVersionCreateReq.java similarity index 93% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetVersionCreateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetVersionCreateReq.java index 56159221..be9dd502 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetVersionCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetVersionCreateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.target; +package cd.casic.ci.process.dto.req.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetVersionUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetVersionUpdateReq.java similarity index 93% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetVersionUpdateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetVersionUpdateReq.java index dbb81e55..4bc83e8f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetVersionUpdateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/target/TargetVersionUpdateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.target; +package cd.casic.ci.process.dto.req.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TaskCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskCreateReq.java similarity index 89% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TaskCreateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskCreateReq.java index 8560d82b..a0da9a7f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TaskCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskCreateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.task; +package cd.casic.ci.process.dto.req.task; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TaskUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskUpdateReq.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TaskUpdateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskUpdateReq.java index 3b9f3186..5e67867a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TaskUpdateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskUpdateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.task; +package cd.casic.ci.process.dto.req.task; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TasksReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TasksReq.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TasksReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TasksReq.java index 80260967..5139618e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/task/TasksReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TasksReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.task; +package cd.casic.ci.process.dto.req.task; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/template/TemplateCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java similarity index 79% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/template/TemplateCreateReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java index c3bf7aae..edf15f59 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/template/TemplateCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.template; +package cd.casic.ci.process.dto.req.template; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/template/TemplateQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateQueryReq.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/template/TemplateQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateQueryReq.java index 0900f7b7..fc958490 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/template/TemplateQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.template; +package cd.casic.ci.process.dto.req.template; import cd.casic.framework.commons.pojo.PageParam; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/trigger/TriggerQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/trigger/TriggerQueryReq.java similarity index 87% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/trigger/TriggerQueryReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/trigger/TriggerQueryReq.java index a653967f..78d77e0d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/trigger/TriggerQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/trigger/TriggerQueryReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.trigger; +package cd.casic.ci.process.dto.req.trigger; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/variable/VariableReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/variable/VariableReq.java similarity index 95% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/variable/VariableReq.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/variable/VariableReq.java index 2f9c62c8..9ef713ca 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/variable/VariableReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/variable/VariableReq.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.req.variable; +package cd.casic.ci.process.dto.req.variable; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/agent/AgentResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/agent/AgentResp.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/agent/AgentResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/agent/AgentResp.java index 253573b3..c2d28b64 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/agent/AgentResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/agent/AgentResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.agent; +package cd.casic.ci.process.dto.resp.agent; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/context/SingletonRunContextResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/context/SingletonRunContextResp.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/context/SingletonRunContextResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/context/SingletonRunContextResp.java index 7c70aaf3..deb935ce 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/context/SingletonRunContextResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/context/SingletonRunContextResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.context; +package cd.casic.ci.process.dto.resp.context; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/context/TreeRunContextResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/context/TreeRunContextResp.java similarity index 87% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/context/TreeRunContextResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/context/TreeRunContextResp.java index 24fe0264..82ad3b14 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/context/TreeRunContextResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/context/TreeRunContextResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.context; +package cd.casic.ci.process.dto.resp.context; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/env/EnvResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/env/EnvResp.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/env/EnvResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/env/EnvResp.java index 5e06f836..bbc292bc 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/env/EnvResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/env/EnvResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.env; +package cd.casic.ci.process.dto.resp.env; import cd.casic.framework.commons.dataobject.User; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/group/GroupResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/group/GroupResp.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/group/GroupResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/group/GroupResp.java index c251ad60..bc5aefe2 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/group/GroupResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/group/GroupResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.group; +package cd.casic.ci.process.dto.resp.group; import cd.casic.framework.commons.dataobject.User; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/machine/MachineInfoResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/machine/MachineInfoResp.java similarity index 93% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/machine/MachineInfoResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/machine/MachineInfoResp.java index c256252b..b5b6172e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/machine/MachineInfoResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/machine/MachineInfoResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.machine; +package cd.casic.ci.process.dto.resp.machine; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/pipeline/PipelineFindResp.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/pipeline/PipelineFindResp.java index ed9b9764..7ae91505 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/pipeline/PipelineFindResp.java @@ -1,6 +1,6 @@ -package cd.casic.ci.process.dal.resp.pipeline; +package cd.casic.ci.process.dto.resp.pipeline; -import cd.casic.ci.process.dal.resp.stage.StageResp; +import cd.casic.ci.process.dto.resp.stage.StageResp; import lombok.Data; import java.time.LocalDateTime; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/pipeline/PipelineResp.java similarity index 98% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/pipeline/PipelineResp.java index 68317fb5..1d7a8dc9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/pipeline/PipelineResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.pipeline; +package cd.casic.ci.process.dto.resp.pipeline; import cd.casic.framework.commons.dataobject.Group; import cd.casic.framework.commons.dataobject.PatchUser; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/report/ReportResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/report/ReportResp.java similarity index 97% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/report/ReportResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/report/ReportResp.java index d3ff95f7..a52b46db 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/report/ReportResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/report/ReportResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.report; +package cd.casic.ci.process.dto.resp.report; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceFindResp.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceFindResp.java index 806c5a1c..75bd8287 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceFindResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.resource; +package cd.casic.ci.process.dto.resp.resource; import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud; import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceResp.java similarity index 95% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceResp.java index 3f0d016b..7b215cb7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.resource; +package cd.casic.ci.process.dto.resp.resource; import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S; import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/stage/StageResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/stage/StageResp.java similarity index 93% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/stage/StageResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/stage/StageResp.java index b7596fcf..85e7de4c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/stage/StageResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/stage/StageResp.java @@ -1,6 +1,6 @@ -package cd.casic.ci.process.dal.resp.stage; +package cd.casic.ci.process.dto.resp.stage; -import cd.casic.ci.process.dal.resp.task.TasksResp; +import cd.casic.ci.process.dto.resp.task.TasksResp; import lombok.Data; import java.util.List; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetManagerResp.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetManagerResp.java index d40557ec..62f7a235 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetManagerResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.target; +package cd.casic.ci.process.dto.resp.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetUploadResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetUploadResp.java similarity index 85% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetUploadResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetUploadResp.java index 7ab53aa2..2ba8d3a5 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetUploadResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetUploadResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.target; +package cd.casic.ci.process.dto.resp.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetVersionResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetVersionResp.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetVersionResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetVersionResp.java index a8e6c4e8..bd9bae86 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetVersionResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/target/TargetVersionResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.target; +package cd.casic.ci.process.dto.resp.target; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/task/TasksResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/task/TasksResp.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/task/TasksResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/task/TasksResp.java index c6754103..f16b5eb5 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/task/TasksResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/task/TasksResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.task; +package cd.casic.ci.process.dto.resp.task; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/taskTemplate/TaskTemplateResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/taskTemplate/TaskTemplateResp.java similarity index 92% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/taskTemplate/TaskTemplateResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/taskTemplate/TaskTemplateResp.java index c36d8269..e9142335 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/taskTemplate/TaskTemplateResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/taskTemplate/TaskTemplateResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.taskTemplate; +package cd.casic.ci.process.dto.resp.taskTemplate; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateFindResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateFindResp.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateFindResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateFindResp.java index 2d34d14f..99e91da9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateFindResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateFindResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.template; +package cd.casic.ci.process.dto.resp.template; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateStageResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateStageResp.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateStageResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateStageResp.java index fa1bae2b..6306d73e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateStageResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateStageResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.template; +package cd.casic.ci.process.dto.resp.template; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateTasksResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateTasksResp.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateTasksResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateTasksResp.java index b88d05ab..965178de 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/template/TemplateTasksResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateTasksResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.template; +package cd.casic.ci.process.dto.resp.template; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/variable/VariableResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/variable/VariableResp.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/variable/VariableResp.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/variable/VariableResp.java index fa1c279b..827eed4c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/variable/VariableResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/variable/VariableResp.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.dal.resp.variable; +package cd.casic.ci.process.dto.resp.variable; import lombok.Data; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java index 5039c97f..759c0205 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java @@ -1,15 +1,13 @@ package cd.casic.ci.process.engine.manager.impl; -import cd.casic.ci.process.dal.req.pipeline.PipelineQueryReq; -import cd.casic.ci.process.dal.resp.context.TreeRunContextResp; +import cd.casic.ci.process.dto.req.pipeline.PipelineQueryReq; +import cd.casic.ci.process.dto.resp.context.TreeRunContextResp; import cd.casic.ci.process.engine.constant.EngineRuntimeConstant; -import cd.casic.ci.process.engine.constant.PipelineBehaviorConstant; import cd.casic.ci.process.engine.enums.ContextStateEnum; import cd.casic.ci.process.engine.manager.LoggerManager; import cd.casic.ci.process.engine.manager.RunContextManager; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.PipelineRunContext; -import cd.casic.ci.process.engine.runContext.SecondStageRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.enums.PiplineTriggerModeEnum; import cd.casic.ci.process.process.dal.history.PipPipelineHisInstanceDao; @@ -17,14 +15,12 @@ import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; -import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.pipeline.PipelineService; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.security.core.LoginUser; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java index c245eec6..bf7c76f0 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java @@ -1,17 +1,14 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.engine.constant.AFLConstant; import cd.casic.ci.process.engine.constant.DIYImageExecuteCommandConstant; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.DockerWorker; -import cd.casic.ci.process.engine.worker.base.SshWorker; -import cd.casic.ci.process.process.dataObject.machine.MachineInfo; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.module.execute.docker.dataobject.dto.DockerEndpointDo; -import cd.casic.module.execute.docker.dataobject.model.DockerEndpoint; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CustomCompilerWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CustomCompilerWorker.java index d7c78ebd..d0f5d7ea 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CustomCompilerWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CustomCompilerWorker.java @@ -2,17 +2,14 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.engine.constant.DIYImageExecuteCommandConstant; import cd.casic.ci.process.engine.runContext.TaskRunContext; -import cd.casic.ci.process.engine.worker.base.BaseWorker; import cd.casic.ci.process.engine.worker.base.SshWorker; -import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.util.CryptogramUtil; -import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java index fa76fd42..4156bb9a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java @@ -2,13 +2,10 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.engine.constant.DIYImageExecuteCommandConstant; -import cd.casic.ci.process.engine.constant.EngineRuntimeConstant; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.SshWorker; -import cd.casic.ci.process.process.dataObject.log.PipTaskLog; -import cd.casic.ci.process.process.dataObject.machine.MachineInfo; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine; import cd.casic.ci.process.process.dataObject.task.PipTask; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java index 17d07f8a..4481cf6a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java @@ -2,27 +2,12 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.BaseWorker; -import cd.casic.ci.process.process.dataObject.base.PipBaseElement; -import cd.casic.ci.process.process.dataObject.machine.MachineInfo; -import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; -import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine; -import cd.casic.ci.process.process.dataObject.target.TargetVersion; -import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.machine.MachineInfoService; import cd.casic.ci.process.process.service.target.TargetVersionService; -import cd.casic.ci.process.util.CryptogramUtil; -import cd.casic.ci.process.util.SftpUploadUtil; -import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import java.io.File; -import java.util.Map; /** * 目标处理worker diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestCaseGenerationWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestCaseGenerationWorker.java index 3acd36fc..7b6de709 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestCaseGenerationWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestCaseGenerationWorker.java @@ -2,12 +2,11 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.engine.constant.DIYImageExecuteCommandConstant; import cd.casic.ci.process.engine.constant.TestCaseGenerationConstant; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.SshWorker; -import cd.casic.ci.process.process.dataObject.machine.MachineInfo; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine; import cd.casic.ci.process.process.dataObject.task.PipTask; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/MachineConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/MachineConverter.java index e100cd5f..1f4eb8cd 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/MachineConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/MachineConverter.java @@ -1,7 +1,7 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.resp.machine.MachineInfoResp; +import cd.casic.ci.process.dto.resp.machine.MachineInfoResp; import cd.casic.ci.process.process.dataObject.machine.MachineInfo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/PipelineConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/PipelineConverter.java index 6bb5f202..2404212d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/PipelineConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/PipelineConverter.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.req.pipeline.PipelineCreateReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineUpdateReq; -import cd.casic.ci.process.dal.resp.pipeline.PipelineFindResp; +import cd.casic.ci.process.dto.req.pipeline.PipelineCreateReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineUpdateReq; +import cd.casic.ci.process.dto.resp.pipeline.PipelineFindResp; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/ResourceConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/ResourceConverter.java index b37b4bed..f26f9312 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/ResourceConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/ResourceConverter.java @@ -1,7 +1,7 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.req.resource.ResourceReq; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.req.resource.ResourceReq; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.process.dataObject.resource.PipResourceManager; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/StageConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/StageConverter.java index 71722ee4..0eb58b3d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/StageConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/StageConverter.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.resp.stage.StageResp; +import cd.casic.ci.process.dto.resp.stage.StageResp; import cd.casic.ci.process.process.dataObject.stage.PipStage; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetConverter.java index 3736280a..292b4b69 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetConverter.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.req.target.TargetManagerCreateReq; -import cd.casic.ci.process.dal.req.target.TargetManagerUpdateReq; -import cd.casic.ci.process.dal.resp.target.TargetManagerResp; +import cd.casic.ci.process.dto.req.target.TargetManagerCreateReq; +import cd.casic.ci.process.dto.req.target.TargetManagerUpdateReq; +import cd.casic.ci.process.dto.resp.target.TargetManagerResp; import cd.casic.ci.process.process.dataObject.target.TargetManager; import org.mapstruct.Mapper; import org.mapstruct.MappingTarget; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java index d261ebf4..c1e4a40c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java @@ -1,9 +1,9 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.req.target.TargetManagerCreateReq; -import cd.casic.ci.process.dal.req.target.TargetVersionCreateReq; -import cd.casic.ci.process.dal.req.target.TargetVersionUpdateReq; -import cd.casic.ci.process.dal.resp.target.TargetVersionResp; +import cd.casic.ci.process.dto.req.target.TargetManagerCreateReq; +import cd.casic.ci.process.dto.req.target.TargetVersionCreateReq; +import cd.casic.ci.process.dto.req.target.TargetVersionUpdateReq; +import cd.casic.ci.process.dto.resp.target.TargetVersionResp; import cd.casic.ci.process.process.dataObject.target.TargetVersion; import org.mapstruct.Mapper; import org.mapstruct.MappingTarget; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TaskConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TaskConverter.java index 471b61f4..0c21bfe3 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TaskConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TaskConverter.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.resp.task.TasksResp; +import cd.casic.ci.process.dto.resp.task.TasksResp; import cd.casic.ci.process.process.dataObject.task.PipTask; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java index a77ca940..114e6667 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.converter; -import cd.casic.ci.process.dal.resp.template.TemplateFindResp; -import cd.casic.ci.process.dal.resp.template.TemplateStageResp; -import cd.casic.ci.process.dal.resp.template.TemplateTasksResp; +import cd.casic.ci.process.dto.resp.template.TemplateFindResp; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; +import cd.casic.ci.process.dto.resp.template.TemplateTasksResp; import cd.casic.ci.process.process.dataObject.stage.PipStage; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.dataObject.template.TemplateManager; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java index 0ceaca7f..c6d12140 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java @@ -1,13 +1,10 @@ package cd.casic.ci.process.process.service.history; -import cd.casic.ci.process.dal.req.history.PipelineHistoryQueryReq; +import cd.casic.ci.process.dto.req.history.PipelineHistoryQueryReq; import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance; -import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.framework.commons.pojo.PageResult; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - public interface PipelineHistoryService extends IService { PageResult getPageByPipelineId(PipelineHistoryQueryReq req); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java index 07b3932e..cdb94eb4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java @@ -1,14 +1,9 @@ package cd.casic.ci.process.process.service.history.impl; -import cd.casic.ci.process.dal.req.history.PipelineHistoryQueryReq; -import cd.casic.ci.process.dal.resp.pipeline.PipelineFindResp; +import cd.casic.ci.process.dto.req.history.PipelineHistoryQueryReq; import cd.casic.ci.process.process.dal.history.PipPipelineHisInstanceDao; -import cd.casic.ci.process.process.dal.pipeline.PipelineDao; import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance; -import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.service.history.PipelineHistoryService; -import cd.casic.ci.process.process.service.pipeline.PipelineService; -import cd.casic.framework.commons.pojo.PageParam; import cd.casic.framework.commons.pojo.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,8 +11,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class PipelineHistoryServiceImpl extends ServiceImpl implements PipelineHistoryService { @Resource diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/MachineInfoService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/MachineInfoService.java index ecf8f26a..a94fe966 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/MachineInfoService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/MachineInfoService.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.machine; -import cd.casic.ci.process.dal.req.machine.MachineInfoReq; -import cd.casic.ci.process.dal.resp.machine.MachineInfoResp; +import cd.casic.ci.process.dto.req.machine.MachineInfoReq; +import cd.casic.ci.process.dto.resp.machine.MachineInfoResp; import cd.casic.ci.process.process.dataObject.machine.MachineInfo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/impl/MachineInfoServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/impl/MachineInfoServiceImpl.java index 72768c8d..e704013a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/impl/MachineInfoServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/machine/impl/MachineInfoServiceImpl.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.machine.impl; -import cd.casic.ci.process.dal.req.machine.MachineInfoReq; -import cd.casic.ci.process.dal.resp.machine.MachineInfoResp; +import cd.casic.ci.process.dto.req.machine.MachineInfoReq; +import cd.casic.ci.process.dto.resp.machine.MachineInfoResp; import cd.casic.ci.process.process.converter.MachineConverter; import cd.casic.ci.process.process.dal.machine.MachineInfoDao; import cd.casic.ci.process.process.dataObject.machine.MachineInfo; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java index a13ff10f..d2bffdc8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java @@ -1,12 +1,12 @@ package cd.casic.ci.process.process.service.pipeline; -import cd.casic.ci.process.dal.req.pipeline.PipelineCreateReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineQueryReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineUpdateReq; -import cd.casic.ci.process.dal.resp.context.TreeRunContextResp; -import cd.casic.ci.process.dal.resp.pipeline.PipelineFindResp; +import cd.casic.ci.process.dto.req.pipeline.PipelineCreateReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineQueryReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineUpdateReq; +import cd.casic.ci.process.dto.resp.context.TreeRunContextResp; +import cd.casic.ci.process.dto.resp.pipeline.PipelineFindResp; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.framework.commons.pojo.PageResult; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java index 4a24cd21..5e17d2d5 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java @@ -1,15 +1,15 @@ package cd.casic.ci.process.process.service.pipeline.impl; -import cd.casic.ci.process.dal.req.pipeline.PipelineCreateReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineQueryReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineUpdateReq; -import cd.casic.ci.process.dal.resp.context.TreeRunContextResp; -import cd.casic.ci.process.dal.resp.pipeline.PipelineFindResp; -import cd.casic.ci.process.dal.resp.stage.StageResp; -import cd.casic.ci.process.dal.resp.template.TemplateFindResp; -import cd.casic.ci.process.dal.resp.template.TemplateStageResp; +import cd.casic.ci.process.dto.req.pipeline.PipelineCreateReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineQueryReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineUpdateReq; +import cd.casic.ci.process.dto.resp.context.TreeRunContextResp; +import cd.casic.ci.process.dto.resp.pipeline.PipelineFindResp; +import cd.casic.ci.process.dto.resp.stage.StageResp; +import cd.casic.ci.process.dto.resp.template.TemplateFindResp; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; import cd.casic.ci.process.engine.manager.RunContextManager; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.PipelineRunContext; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/ReportService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/ReportService.java index 28718edf..0fc207e4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/ReportService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/ReportService.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.report; -import cd.casic.ci.process.dal.req.report.ReportAssetTaskReq; -import cd.casic.ci.process.dal.req.report.ReportDeleteReq; -import cd.casic.ci.process.dal.resp.report.ReportResp; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.req.report.ReportDeleteReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.process.dataObject.base.BaseIdPageReq; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.framework.commons.pojo.PageResult; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java index f5510a9d..a6e7b6ca 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.report.impl; -import cd.casic.ci.process.dal.req.report.ReportAssetTaskReq; -import cd.casic.ci.process.dal.req.report.ReportDeleteReq; -import cd.casic.ci.process.dal.resp.report.ReportResp; +import cd.casic.ci.process.dto.req.report.ReportAssetTaskReq; +import cd.casic.ci.process.dto.req.report.ReportDeleteReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.process.dataObject.base.BaseIdPageReq; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/ResourceManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/ResourceManagerService.java index 28f3e6ba..4d55f60c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/ResourceManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/ResourceManagerService.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.resource; -import cd.casic.ci.process.dal.req.resource.ResourceQueryReq; -import cd.casic.ci.process.dal.req.resource.ResourceReq; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.req.resource.ResourceQueryReq; +import cd.casic.ci.process.dto.req.resource.ResourceReq; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.process.dataObject.resource.PipResourceManager; import cd.casic.framework.commons.pojo.PageResult; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java index 07189814..1f15a10d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.resource.impl; -import cd.casic.ci.process.dal.req.resource.ResourceQueryReq; -import cd.casic.ci.process.dal.req.resource.ResourceReq; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.req.resource.ResourceQueryReq; +import cd.casic.ci.process.dto.req.resource.ResourceReq; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.process.converter.ResourceConverter; import cd.casic.ci.process.process.dal.pipeline.PipResourceCloudDao; import cd.casic.ci.process.process.dal.pipeline.PipResourceK8SDao; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java index 86244e11..6e0e1c39 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java @@ -1,10 +1,10 @@ package cd.casic.ci.process.process.service.stage; -import cd.casic.ci.process.dal.req.stage.StageCreateReq; -import cd.casic.ci.process.dal.req.stage.StageUpdateReq; -import cd.casic.ci.process.dal.resp.context.SingletonRunContextResp; -import cd.casic.ci.process.dal.resp.stage.StageResp; +import cd.casic.ci.process.dto.req.stage.StageCreateReq; +import cd.casic.ci.process.dto.req.stage.StageUpdateReq; +import cd.casic.ci.process.dto.resp.context.SingletonRunContextResp; +import cd.casic.ci.process.dto.resp.stage.StageResp; import cd.casic.ci.process.process.dataObject.stage.PipStage; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.constraints.NotEmpty; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java index 0623e0a4..3954ff82 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java @@ -1,11 +1,11 @@ package cd.casic.ci.process.process.service.stage.impl; -import cd.casic.ci.process.dal.req.stage.StageCreateReq; -import cd.casic.ci.process.dal.req.stage.StageUpdateReq; -import cd.casic.ci.process.dal.req.task.TaskCreateReq; -import cd.casic.ci.process.dal.resp.context.SingletonRunContextResp; -import cd.casic.ci.process.dal.resp.stage.StageResp; +import cd.casic.ci.process.dto.req.stage.StageCreateReq; +import cd.casic.ci.process.dto.req.stage.StageUpdateReq; +import cd.casic.ci.process.dto.req.task.TaskCreateReq; +import cd.casic.ci.process.dto.resp.context.SingletonRunContextResp; +import cd.casic.ci.process.dto.resp.stage.StageResp; import cd.casic.ci.process.engine.manager.RunContextManager; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.process.converter.StageConverter; @@ -17,7 +17,6 @@ import cd.casic.ci.process.process.service.task.TaskService; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.ci.process.util.WebFrameworkUtils; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java index 7876cf8a..158ea11d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.target; -import cd.casic.ci.process.dal.req.target.*; -import cd.casic.ci.process.dal.resp.target.TargetManagerResp; +import cd.casic.ci.process.dto.req.target.*; +import cd.casic.ci.process.dto.resp.target.TargetManagerResp; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.dataObject.target.TargetManager; import cd.casic.ci.process.util.SftpUploadUtil; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetVersionService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetVersionService.java index 9cf5f010..f617cf50 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetVersionService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetVersionService.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.process.service.target; -import cd.casic.ci.process.dal.resp.target.TargetVersionResp; +import cd.casic.ci.process.dto.resp.target.TargetVersionResp; import cd.casic.ci.process.process.dataObject.target.TargetVersion; import com.baomidou.mybatisplus.extension.service.IService; 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 807f98d4..efa848dc 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 @@ -1,9 +1,9 @@ package cd.casic.ci.process.process.service.target.impl; -import cd.casic.ci.process.dal.req.target.*; -import cd.casic.ci.process.dal.resp.target.TargetManagerResp; -import cd.casic.ci.process.dal.resp.target.TargetVersionResp; +import cd.casic.ci.process.dto.req.target.*; +import cd.casic.ci.process.dto.resp.target.TargetManagerResp; +import cd.casic.ci.process.dto.resp.target.TargetVersionResp; import cd.casic.ci.process.process.converter.TargetConverter; import cd.casic.ci.process.process.converter.TargetVersionConverter; import cd.casic.ci.process.process.dal.pipeline.TargetManagerDao; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetVersionServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetVersionServiceImpl.java index 73d3cbd7..b6ef7e42 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetVersionServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetVersionServiceImpl.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.process.service.target.impl; -import cd.casic.ci.process.dal.resp.target.TargetVersionResp; +import cd.casic.ci.process.dto.resp.target.TargetVersionResp; import cd.casic.ci.process.process.converter.TargetVersionConverter; import cd.casic.ci.process.process.dal.pipeline.TargetVersionDao; import cd.casic.ci.process.process.dataObject.target.TargetVersion; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java index 53bc4a26..24fc9d0c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java @@ -1,7 +1,7 @@ package cd.casic.ci.process.process.service.task; -import cd.casic.ci.process.dal.req.task.TaskUpdateReq; -import cd.casic.ci.process.dal.resp.task.TasksResp; +import cd.casic.ci.process.dto.req.task.TaskUpdateReq; +import cd.casic.ci.process.dto.resp.task.TasksResp; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.framework.commons.pojo.CommonResult; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java index cf8b71df..2944e58f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java @@ -1,7 +1,7 @@ package cd.casic.ci.process.process.service.task.impl; -import cd.casic.ci.process.dal.req.task.TaskUpdateReq; -import cd.casic.ci.process.dal.resp.task.TasksResp; +import cd.casic.ci.process.dto.req.task.TaskUpdateReq; +import cd.casic.ci.process.dto.resp.task.TasksResp; import cd.casic.ci.process.engine.manager.LoggerManager; import cd.casic.ci.process.engine.manager.RunContextManager; import cd.casic.ci.process.process.converter.TaskConverter; @@ -16,7 +16,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/TaskTemplateService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/TaskTemplateService.java index 1991f87c..5e4f8076 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/TaskTemplateService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/TaskTemplateService.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.process.service.taskTemplate; -import cd.casic.ci.process.dal.resp.taskTemplate.TaskTemplateResp; +import cd.casic.ci.process.dto.resp.taskTemplate.TaskTemplateResp; import cd.casic.ci.process.process.dataObject.node.PipTaskTemplate; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/impl/TaskTemplateServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/impl/TaskTemplateServiceImpl.java index 6c7c199a..30c52d13 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/impl/TaskTemplateServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskTemplate/impl/TaskTemplateServiceImpl.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.process.service.taskTemplate.impl; -import cd.casic.ci.process.dal.resp.taskTemplate.TaskTemplateResp; +import cd.casic.ci.process.dto.resp.taskTemplate.TaskTemplateResp; import cd.casic.ci.process.process.dal.pipeline.PipTaskTemplateDao; import cd.casic.ci.process.process.dataObject.node.PipTaskTemplate; import cd.casic.ci.process.process.service.taskTemplate.TaskTemplateService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java index e34341d4..d7d3558a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java @@ -1,8 +1,8 @@ package cd.casic.ci.process.process.service.template; -import cd.casic.ci.process.dal.req.template.TemplateQueryReq; -import cd.casic.ci.process.dal.resp.template.TemplateFindResp; +import cd.casic.ci.process.dto.req.template.TemplateQueryReq; +import cd.casic.ci.process.dto.resp.template.TemplateFindResp; import cd.casic.ci.process.process.dataObject.template.TemplateManager; import cd.casic.framework.commons.pojo.PageResult; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java index fe0ea61b..17844f3b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java @@ -1,10 +1,9 @@ package cd.casic.ci.process.process.service.template.impl; -import cd.casic.ci.process.dal.req.template.TemplateQueryReq; -import cd.casic.ci.process.dal.resp.template.TemplateFindResp; -import cd.casic.ci.process.dal.resp.template.TemplateStageResp; -import cd.casic.ci.process.process.converter.StageConverter; +import cd.casic.ci.process.dto.req.template.TemplateQueryReq; +import cd.casic.ci.process.dto.resp.template.TemplateFindResp; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; import cd.casic.ci.process.process.converter.TemplateConverter; import cd.casic.ci.process.process.dal.template.TemplateManagerDao; import cd.casic.ci.process.process.dal.template.TemplateStageDao; @@ -16,7 +15,6 @@ import cd.casic.ci.process.process.service.template.TemplateManagerService; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.framework.security.dal.user.AdminUserDO; import cd.casic.framework.tenant.core.service.AdminUserServiceImpl; import com.alibaba.fastjson.JSON; diff --git a/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java b/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java index 34d5091f..3ffd511c 100644 --- a/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java +++ b/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java @@ -4,8 +4,6 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; -import org.springframework.security.core.context.SecurityContextHolder; /** * 项目的启动类 @@ -15,7 +13,7 @@ import org.springframework.security.core.context.SecurityContextHolder; @SuppressWarnings("SpringComponentScan") @ComponentScan({"cd.casic"}) -@MapperScan(basePackages = {"cd.casic.**.dal","cd.casic.**.dao"}) +@MapperScan(basePackages = {"cd.casic.**.dto","cd.casic.**.dao"}) @SpringBootApplication(scanBasePackages = {"${ops.info.base-package}.server", "${ops.info.base-package}.module"}) public class OpsServerApplication { public static void main(String[] args) { diff --git a/ops-server/src/test/java/cd/casic/server/PipelineTest.java b/ops-server/src/test/java/cd/casic/server/PipelineTest.java index f291cbe2..dec96e7c 100644 --- a/ops-server/src/test/java/cd/casic/server/PipelineTest.java +++ b/ops-server/src/test/java/cd/casic/server/PipelineTest.java @@ -1,13 +1,13 @@ package cd.casic.server; -import cd.casic.ci.process.dal.req.pipeline.PipelineCreateReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineQueryReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineReq; -import cd.casic.ci.process.dal.req.pipeline.PipelineUpdateReq; -import cd.casic.ci.process.dal.resp.pipeline.PipelineFindResp; -import cd.casic.ci.process.dal.resp.template.TemplateFindResp; -import cd.casic.ci.process.dal.resp.template.TemplateStageResp; -import cd.casic.ci.process.dal.resp.template.TemplateTasksResp; +import cd.casic.ci.process.dto.req.pipeline.PipelineCreateReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineQueryReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineReq; +import cd.casic.ci.process.dto.req.pipeline.PipelineUpdateReq; +import cd.casic.ci.process.dto.resp.pipeline.PipelineFindResp; +import cd.casic.ci.process.dto.resp.template.TemplateFindResp; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; +import cd.casic.ci.process.dto.resp.template.TemplateTasksResp; import cd.casic.ci.process.process.service.pipeline.impl.PipelineServiceImpl; import cd.casic.ci.process.process.service.template.impl.TemplateManagerServiceImpl; import cd.casic.framework.commons.exception.ServiceException; diff --git a/ops-server/src/test/java/cd/casic/server/ResourceTest.java b/ops-server/src/test/java/cd/casic/server/ResourceTest.java index e5182b9b..e0749061 100644 --- a/ops-server/src/test/java/cd/casic/server/ResourceTest.java +++ b/ops-server/src/test/java/cd/casic/server/ResourceTest.java @@ -1,7 +1,7 @@ package cd.casic.server; -import cd.casic.ci.process.dal.req.resource.ResourceReq; -import cd.casic.ci.process.dal.resp.resource.ResourceFindResp; +import cd.casic.ci.process.dto.req.resource.ResourceReq; +import cd.casic.ci.process.dto.resp.resource.ResourceFindResp; import cd.casic.ci.process.process.converter.ResourceConverter; import cd.casic.ci.process.process.dal.pipeline.PipResourceCloudDao; import cd.casic.ci.process.process.dal.pipeline.PipResourceK8SDao; diff --git a/ops-server/src/test/java/cd/casic/server/StageTest.java b/ops-server/src/test/java/cd/casic/server/StageTest.java index ef0e7236..1d793553 100644 --- a/ops-server/src/test/java/cd/casic/server/StageTest.java +++ b/ops-server/src/test/java/cd/casic/server/StageTest.java @@ -1,6 +1,6 @@ package cd.casic.server; -import cd.casic.ci.process.dal.req.stage.StageUpdateReq; +import cd.casic.ci.process.dto.req.stage.StageUpdateReq; import cd.casic.ci.process.process.service.stage.StageService; import com.alibaba.fastjson.JSON; import jakarta.annotation.Resource; diff --git a/ops-server/src/test/java/cd/casic/server/TargetTest.java b/ops-server/src/test/java/cd/casic/server/TargetTest.java index 6215764a..fb3ddc9b 100644 --- a/ops-server/src/test/java/cd/casic/server/TargetTest.java +++ b/ops-server/src/test/java/cd/casic/server/TargetTest.java @@ -1,7 +1,7 @@ package cd.casic.server; -import cd.casic.ci.process.dal.req.target.TargetManagerCreateReq; -import cd.casic.ci.process.dal.req.target.TargetManagerUpdateReq; +import cd.casic.ci.process.dto.req.target.TargetManagerCreateReq; +import cd.casic.ci.process.dto.req.target.TargetManagerUpdateReq; import cd.casic.ci.process.process.converter.TargetConverter; import cd.casic.ci.process.process.dal.pipeline.TargetManagerDao; import cd.casic.ci.process.process.dal.pipeline.TargetVersionDao; diff --git a/ops-server/src/test/java/cd/casic/server/TaskTest.java b/ops-server/src/test/java/cd/casic/server/TaskTest.java index 61cf3109..21e93ec1 100644 --- a/ops-server/src/test/java/cd/casic/server/TaskTest.java +++ b/ops-server/src/test/java/cd/casic/server/TaskTest.java @@ -1,7 +1,7 @@ package cd.casic.server; -import cd.casic.ci.process.dal.req.stage.StageCreateReq; -import cd.casic.ci.process.dal.req.task.TaskUpdateReq; +import cd.casic.ci.process.dto.req.stage.StageCreateReq; +import cd.casic.ci.process.dto.req.task.TaskUpdateReq; import cd.casic.ci.process.process.service.stage.StageService; import cd.casic.ci.process.process.service.task.TaskService; import com.alibaba.fastjson.JSON;