包名称修改

This commit is contained in:
even 2025-06-11 09:50:36 +08:00
parent a78308f1d0
commit 37b1115f95
110 changed files with 194 additions and 245 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -4,4 +4,4 @@
* @date: 2025/5/30 16:19
* @version: 1.0
*/
package cd.casic.ci.process.dal;
package cd.casic.ci.process.dto;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.machine;
package cd.casic.ci.process.dto.req.machine;
import lombok.Data;

View File

@ -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;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.pipeline;
package cd.casic.ci.process.dto.req.pipeline;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.pipeline;
package cd.casic.ci.process.dto.req.pipeline;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.report;
package cd.casic.ci.process.dto.req.report;
import lombok.Data;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.stage;
package cd.casic.ci.process.dto.req.stage;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.target;
package cd.casic.ci.process.dto.req.target;
import lombok.Data;

View File

@ -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;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.task;
package cd.casic.ci.process.dto.req.task;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.task;
package cd.casic.ci.process.dto.req.task;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.task;
package cd.casic.ci.process.dto.req.task;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.template;
package cd.casic.ci.process.dto.req.template;
import lombok.Data;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.trigger;
package cd.casic.ci.process.dto.req.trigger;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.req.variable;
package cd.casic.ci.process.dto.req.variable;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.agent;
package cd.casic.ci.process.dto.resp.agent;
import lombok.Data;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.report;
package cd.casic.ci.process.dto.resp.report;
import lombok.Data;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.target;
package cd.casic.ci.process.dto.resp.target;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.target;
package cd.casic.ci.process.dto.resp.target;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.target;
package cd.casic.ci.process.dto.resp.target;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.task;
package cd.casic.ci.process.dto.resp.task;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.taskTemplate;
package cd.casic.ci.process.dto.resp.taskTemplate;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.template;
package cd.casic.ci.process.dto.resp.template;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.template;
package cd.casic.ci.process.dto.resp.template;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.template;
package cd.casic.ci.process.dto.resp.template;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.process.dal.resp.variable;
package cd.casic.ci.process.dto.resp.variable;
import lombok.Data;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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<PipPipelineHisInstance> {
PageResult<PipPipelineHisInstance> getPageByPipelineId(PipelineHistoryQueryReq req);
}

View File

@ -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<PipPipelineHisInstanceDao, PipPipelineHisInstance> implements PipelineHistoryService {
@Resource

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More