包名称修改

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.dao.history.PipPipelineHisInstanceDao;
-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.history.PipPipelineHisInstance;
 import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.dao.pipeline.PipStageDao;
-import cd.casic.ci.process.process.dal.pipeline.PipTaskDao;
+import cd.casic.ci.process.process.dao.pipeline.PipTaskDao;
-import cd.casic.ci.process.process.dal.pipeline.PipelineDao;
+import cd.casic.ci.process.process.dao.pipeline.PipelineDao;
-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.pipeline.PipPipeline;
 import cd.casic.ci.process.process.dataObject.stage.PipStage;
 import cd.casic.ci.process.process.dataObject.target.TargetVersion;

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.dao.pipeline.PipResourceCloudDao;
-import cd.casic.ci.process.process.dal.pipeline.PipResourceK8SDao;
+import cd.casic.ci.process.process.dao.pipeline.PipResourceK8SDao;
-import cd.casic.ci.process.process.dal.pipeline.PipResourceMachineDao;
+import cd.casic.ci.process.process.dao.pipeline.PipResourceMachineDao;
-import cd.casic.ci.process.process.dal.pipeline.PipResourceManagerDao;
+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;

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;

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.dao.pipeline.TargetManagerDao;
-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.base.BaseIdReq;
 import cd.casic.ci.process.process.dataObject.target.TargetManager;
 import cd.casic.ci.process.process.dataObject.target.TargetVersion;

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;

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;

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;

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;

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.dao.template.TemplateManagerDao;
-import cd.casic.ci.process.process.dal.template.TemplateStageDao;
+import cd.casic.ci.process.process.dao.template.TemplateStageDao;
-import cd.casic.ci.process.process.dal.template.TemplateTaskDao;
+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;

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) {

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.dao.pipeline.PipResourceCloudDao;
-import cd.casic.ci.process.process.dal.pipeline.PipResourceK8SDao;
+import cd.casic.ci.process.process.dao.pipeline.PipResourceK8SDao;
-import cd.casic.ci.process.process.dal.pipeline.PipResourceMachineDao;
+import cd.casic.ci.process.process.dao.pipeline.PipResourceMachineDao;
-import cd.casic.ci.process.process.dal.pipeline.PipResourceManagerDao;
+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;

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.dao.pipeline.TargetManagerDao;
-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.base.BaseIdReq;
 import cd.casic.ci.process.process.dataObject.target.TargetManager;
 import cd.casic.ci.process.process.dataObject.target.TargetVersion;