From a2fc4819ce1f45456ba129e5ef94f2c266e53582 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Wed, 11 Jun 2025 10:00:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/manager/impl/DefaultRunContextManager.java | 4 ++-- .../ci/process/engine/manager/impl/MemoryLogManager.java | 3 +-- .../ci/process/engine/runContext/PipelineRunContext.java | 6 +----- .../casic/ci/process/engine/worker/ApplicationWorker.java | 2 +- .../cd/casic/ci/process/engine/worker/CodingWorker.java | 2 +- .../casic/ci/process/engine/worker/ScaBinaryWorker.java | 2 +- .../casic/ci/process/engine/worker/ScaMirrorWorker.java | 2 +- .../cd/casic/ci/process/engine/worker/ScaSbomWorker.java | 2 +- .../{dal => dao}/history/PipPipelineHisInstanceDao.java | 2 +- .../process/{dal => dao}/machine/MachineInfoDao.java | 2 +- .../{dal => dao}/pipeline/PipResourceCloudDao.java | 2 +- .../pipeline/PipResourceDockerEndpointDao.java | 2 +- .../process/{dal => dao}/pipeline/PipResourceK8SDao.java | 2 +- .../{dal => dao}/pipeline/PipResourceMachineDao.java | 2 +- .../{dal => dao}/pipeline/PipResourceManagerDao.java | 2 +- .../process/{dal => dao}/pipeline/PipStageDao.java | 2 +- .../process/process/{dal => dao}/pipeline/PipTaskDao.java | 2 +- .../process/{dal => dao}/pipeline/PipTaskLogDao.java | 2 +- .../process/{dal => dao}/pipeline/PipTaskTemplateDao.java | 2 +- .../process/{dal => dao}/pipeline/PipelineDao.java | 2 +- .../process/{dal => dao}/pipeline/TargetManagerDao.java | 2 +- .../process/{dal => dao}/pipeline/TargetVersionDao.java | 2 +- .../process/{dal => dao}/template/TemplateManagerDao.java | 2 +- .../process/{dal => dao}/template/TemplateStageDao.java | 2 +- .../process/{dal => dao}/template/TemplateTaskDao.java | 2 +- .../service/history/impl/PipelineHistoryServiceImpl.java | 2 +- .../service/machine/impl/MachineInfoServiceImpl.java | 2 +- .../service/pipeline/impl/PipelineServiceImpl.java | 8 ++++---- .../service/resource/impl/ResourceManagerServiceImpl.java | 8 ++++---- .../process/service/stage/impl/StageServiceImpl.java | 2 +- .../service/target/impl/TargetManagerServiceImpl.java | 4 ++-- .../service/target/impl/TargetVersionServiceImpl.java | 2 +- .../process/service/task/impl/TaskServiceImpl.java | 2 +- .../process/service/taskLog/impl/TaskLogServiceImpl.java | 2 +- .../taskTemplate/impl/TaskTemplateServiceImpl.java | 2 +- .../service/template/impl/TemplateManagerServiceImpl.java | 6 +++--- .../main/java/cd/casic/server/OpsServerApplication.java | 2 +- .../src/test/java/cd/casic/server/ResourceTest.java | 8 ++++---- ops-server/src/test/java/cd/casic/server/TargetTest.java | 4 ++-- 39 files changed, 53 insertions(+), 58 deletions(-) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/history/PipPipelineHisInstanceDao.java (82%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/machine/MachineInfoDao.java (84%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipResourceCloudDao.java (87%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipResourceDockerEndpointDao.java (87%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipResourceK8SDao.java (86%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipResourceMachineDao.java (87%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipResourceManagerDao.java (86%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipStageDao.java (78%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipTaskDao.java (78%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipTaskLogDao.java (79%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipTaskTemplateDao.java (87%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/PipelineDao.java (85%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/TargetManagerDao.java (86%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/pipeline/TargetVersionDao.java (86%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/template/TemplateManagerDao.java (86%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/template/TemplateStageDao.java (86%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/{dal => dao}/template/TemplateTaskDao.java (86%) 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 759c0205..30b3080c 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 @@ -10,8 +10,8 @@ import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.PipelineRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.enums.PiplineTriggerModeEnum; -import cd.casic.ci.process.process.dal.history.PipPipelineHisInstanceDao; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.history.PipPipelineHisInstanceDao; +import cd.casic.ci.process.process.dao.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; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java index 19df3f56..b4d0c572 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java @@ -3,11 +3,10 @@ package cd.casic.ci.process.engine.manager.impl; import cd.casic.ci.process.engine.constant.EngineRuntimeConstant; import cd.casic.ci.process.engine.manager.LoggerManager; import cd.casic.ci.process.engine.runContext.TaskRunContext; -import cd.casic.ci.process.process.dal.pipeline.PipTaskLogDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskLogDao; import cd.casic.ci.process.process.dataObject.log.PipTaskLog; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.task.TaskService; -import cd.casic.ci.process.util.snowflake.SnowflakeIdWorker; import cd.casic.ci.process.util.snowflake.SnowflakeIdentifierGenerator; import cd.casic.framework.commons.util.network.IpUtil; import cd.casic.ci.process.util.WebFrameworkUtils; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java index bafa5f55..cce48a85 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java @@ -4,18 +4,14 @@ 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.enums.PiplineTriggerModeEnum; -import cd.casic.ci.process.process.dal.history.PipPipelineHisInstanceDao; +import cd.casic.ci.process.process.dao.history.PipPipelineHisInstanceDao; 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.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java index 853f7535..e6a73c71 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java @@ -6,7 +6,7 @@ import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.HttpWorker; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; 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.target.TargetVersion; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java index 8aac3c4b..74148b27 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java @@ -6,7 +6,7 @@ import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.HttpWorker; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.framework.commons.exception.ServiceException; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java index 97dd032f..d6e8a0a9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java @@ -6,7 +6,7 @@ import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.HttpWorker; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; 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.target.TargetVersion; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java index ec417579..d5654da7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java @@ -6,7 +6,7 @@ import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.HttpWorker; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; 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.target.TargetVersion; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java index fa06eeb8..628fb694 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java @@ -6,7 +6,7 @@ import cd.casic.ci.process.engine.context.ConstantContextHolder; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.HttpWorker; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; 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.target.TargetVersion; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/history/PipPipelineHisInstanceDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/history/PipPipelineHisInstanceDao.java similarity index 82% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/history/PipPipelineHisInstanceDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/history/PipPipelineHisInstanceDao.java index 68111fbb..638e4635 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/history/PipPipelineHisInstanceDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/history/PipPipelineHisInstanceDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.history; +package cd.casic.ci.process.process.dao.history; import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/machine/MachineInfoDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/machine/MachineInfoDao.java similarity index 84% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/machine/MachineInfoDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/machine/MachineInfoDao.java index dd39fc8b..b8fca226 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/machine/MachineInfoDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/machine/MachineInfoDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.machine; +package cd.casic.ci.process.process.dao.machine; 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/dal/pipeline/PipResourceCloudDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceCloudDao.java similarity index 87% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceCloudDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceCloudDao.java index 0a445ef4..92d399dd 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceCloudDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceCloudDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceDockerEndpointDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceDockerEndpointDao.java similarity index 87% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceDockerEndpointDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceDockerEndpointDao.java index e954751e..c337607f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceDockerEndpointDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceDockerEndpointDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.resource.PipelineDockerEndpoint; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceK8SDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceK8SDao.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceK8SDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceK8SDao.java index 2864aa5a..238e83db 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceK8SDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceK8SDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceMachineDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceMachineDao.java similarity index 87% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceMachineDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceMachineDao.java index 68cd0b78..a68386ee 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceMachineDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceMachineDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceManagerDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceManagerDao.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceManagerDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceManagerDao.java index 0793df7f..516064c5 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipResourceManagerDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipResourceManagerDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.resource.PipResourceManager; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipStageDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipStageDao.java similarity index 78% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipStageDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipStageDao.java index 15276749..77b86838 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipStageDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipStageDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.stage.PipStage; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskDao.java similarity index 78% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskDao.java index cdfc1e4d..a67e1445 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskLogDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskLogDao.java similarity index 79% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskLogDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskLogDao.java index 47fcd1ff..3d3ce30c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskLogDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskLogDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.log.PipTaskLog; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskTemplateDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskTemplateDao.java similarity index 87% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskTemplateDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskTemplateDao.java index ba73a4ca..2b913244 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipTaskTemplateDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipTaskTemplateDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.node.PipTaskTemplate; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipelineDao.java similarity index 85% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipelineDao.java index b2bd2937..ba806534 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/PipelineDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/TargetManagerDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/TargetManagerDao.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/TargetManagerDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/TargetManagerDao.java index 3b808a17..ef2a3f95 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/TargetManagerDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/TargetManagerDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.target.TargetManager; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/TargetVersionDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/TargetVersionDao.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/TargetVersionDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/TargetVersionDao.java index 5cabdfe1..1a71df33 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/TargetVersionDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/pipeline/TargetVersionDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.pipeline; +package cd.casic.ci.process.process.dao.pipeline; import cd.casic.ci.process.process.dataObject.target.TargetVersion; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateManagerDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateManagerDao.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateManagerDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateManagerDao.java index 8272bfb5..bdff6700 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateManagerDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateManagerDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.template; +package cd.casic.ci.process.process.dao.template; import cd.casic.ci.process.process.dataObject.template.TemplateManager; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateStageDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateStageDao.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateStageDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateStageDao.java index 946f92aa..8dc5b5e3 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateStageDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateStageDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.template; +package cd.casic.ci.process.process.dao.template; import cd.casic.ci.process.process.dataObject.template.TemplateStage; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateTaskDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateTaskDao.java similarity index 86% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateTaskDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateTaskDao.java index f5ae79a9..a15d5330 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateTaskDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dao/template/TemplateTaskDao.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.process.dal.template; +package cd.casic.ci.process.process.dao.template; import cd.casic.ci.process.process.dataObject.template.TemplateTask; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; 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 cdb94eb4..52cc5c90 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,7 +1,7 @@ package cd.casic.ci.process.process.service.history.impl; import cd.casic.ci.process.dto.req.history.PipelineHistoryQueryReq; -import cd.casic.ci.process.process.dal.history.PipPipelineHisInstanceDao; +import cd.casic.ci.process.process.dao.history.PipPipelineHisInstanceDao; import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance; import cd.casic.ci.process.process.service.history.PipelineHistoryService; import cd.casic.framework.commons.pojo.PageResult; 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 e704013a..fff3a0dd 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 @@ -4,7 +4,7 @@ package cd.casic.ci.process.process.service.machine.impl; 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.dao.machine.MachineInfoDao; import cd.casic.ci.process.process.dataObject.machine.MachineInfo; import cd.casic.ci.process.process.service.machine.MachineInfoService; import cn.hutool.core.util.ObjectUtil; 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 5e17d2d5..a2fcaf81 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 @@ -15,10 +15,10 @@ import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.PipelineRunContext; import cd.casic.ci.process.process.converter.PipelineConverter; import cd.casic.ci.process.process.converter.TemplateConverter; -import cd.casic.ci.process.process.dal.pipeline.PipStageDao; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; -import cd.casic.ci.process.process.dal.pipeline.PipelineDao; -import cd.casic.ci.process.process.dal.pipeline.TargetVersionDao; +import cd.casic.ci.process.process.dao.pipeline.PipStageDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.pipeline.PipelineDao; +import cd.casic.ci.process.process.dao.pipeline.TargetVersionDao; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.ci.process.process.dataObject.stage.PipStage; 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/resource/impl/ResourceManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java index 1f15a10d..51a8ae6f 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 @@ -4,10 +4,10 @@ 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; -import cd.casic.ci.process.process.dal.pipeline.PipResourceMachineDao; -import cd.casic.ci.process.process.dal.pipeline.PipResourceManagerDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceCloudDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceK8SDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceMachineDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceManagerDao; import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud; 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/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 3954ff82..056e8e75 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 @@ -9,7 +9,7 @@ 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; -import cd.casic.ci.process.process.dal.pipeline.PipStageDao; +import cd.casic.ci.process.process.dao.pipeline.PipStageDao; import cd.casic.ci.process.process.dataObject.stage.PipStage; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.stage.StageService; 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 efa848dc..f6d64d6f 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 @@ -6,8 +6,8 @@ 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; -import cd.casic.ci.process.process.dal.pipeline.TargetVersionDao; +import cd.casic.ci.process.process.dao.pipeline.TargetManagerDao; +import cd.casic.ci.process.process.dao.pipeline.TargetVersionDao; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.dataObject.target.TargetManager; 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/target/impl/TargetVersionServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetVersionServiceImpl.java index b6ef7e42..572a617a 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 @@ -2,7 +2,7 @@ package cd.casic.ci.process.process.service.target.impl; 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.dao.pipeline.TargetVersionDao; import cd.casic.ci.process.process.dataObject.target.TargetVersion; import cd.casic.ci.process.process.service.target.TargetVersionService; import cd.casic.framework.security.dal.user.AdminUserDO; 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 2944e58f..6f2e00bf 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 @@ -5,7 +5,7 @@ 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; -import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskDao; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.task.TaskService; import cd.casic.framework.commons.exception.ServiceException; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskLog/impl/TaskLogServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskLog/impl/TaskLogServiceImpl.java index 6c7cf3c5..3b8ea2e6 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskLog/impl/TaskLogServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/taskLog/impl/TaskLogServiceImpl.java @@ -1,6 +1,6 @@ package cd.casic.ci.process.process.service.taskLog.impl; -import cd.casic.ci.process.process.dal.pipeline.PipTaskLogDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskLogDao; import cd.casic.ci.process.process.dataObject.log.PipTaskLog; import cd.casic.ci.process.process.service.taskLog.TaskLogService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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 30c52d13..db2de387 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,7 +1,7 @@ package cd.casic.ci.process.process.service.taskTemplate.impl; import cd.casic.ci.process.dto.resp.taskTemplate.TaskTemplateResp; -import cd.casic.ci.process.process.dal.pipeline.PipTaskTemplateDao; +import cd.casic.ci.process.process.dao.pipeline.PipTaskTemplateDao; import cd.casic.ci.process.process.dataObject.node.PipTaskTemplate; import cd.casic.ci.process.process.service.taskTemplate.TaskTemplateService; import cn.hutool.core.bean.BeanUtil; 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 17844f3b..f063151f 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 @@ -5,9 +5,9 @@ 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; -import cd.casic.ci.process.process.dal.template.TemplateTaskDao; +import cd.casic.ci.process.process.dao.template.TemplateManagerDao; +import cd.casic.ci.process.process.dao.template.TemplateStageDao; +import cd.casic.ci.process.process.dao.template.TemplateTaskDao; import cd.casic.ci.process.process.dataObject.template.TemplateManager; import cd.casic.ci.process.process.dataObject.template.TemplateStage; import cd.casic.ci.process.process.dataObject.template.TemplateTask; 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 3ffd511c..89679ddc 100644 --- a/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java +++ b/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.ComponentScan; @SuppressWarnings("SpringComponentScan") @ComponentScan({"cd.casic"}) -@MapperScan(basePackages = {"cd.casic.**.dto","cd.casic.**.dao"}) +@MapperScan(basePackages = {"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/ResourceTest.java b/ops-server/src/test/java/cd/casic/server/ResourceTest.java index e0749061..1941406d 100644 --- a/ops-server/src/test/java/cd/casic/server/ResourceTest.java +++ b/ops-server/src/test/java/cd/casic/server/ResourceTest.java @@ -3,10 +3,10 @@ package cd.casic.server; 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; -import cd.casic.ci.process.process.dal.pipeline.PipResourceMachineDao; -import cd.casic.ci.process.process.dal.pipeline.PipResourceManagerDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceCloudDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceK8SDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceMachineDao; +import cd.casic.ci.process.process.dao.pipeline.PipResourceManagerDao; import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud; import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S; import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine; 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 fb3ddc9b..03711e20 100644 --- a/ops-server/src/test/java/cd/casic/server/TargetTest.java +++ b/ops-server/src/test/java/cd/casic/server/TargetTest.java @@ -3,8 +3,8 @@ package cd.casic.server; 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; +import cd.casic.ci.process.process.dao.pipeline.TargetManagerDao; +import cd.casic.ci.process.process.dao.pipeline.TargetVersionDao; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.dataObject.target.TargetManager; import cd.casic.ci.process.process.dataObject.target.TargetVersion;