diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java index 0fc1cf9f..4048ccf0 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipHistoryController.java @@ -1,14 +1,14 @@ package cd.casic.ci.api; +import cd.casic.ci.process.dal.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; import cd.casic.ci.process.process.service.taskLog.TaskLogService; import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.commons.pojo.PageResult; import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -24,9 +24,8 @@ public class PipHistoryController { PipTaskLog byId = taskLogService.getById(id); return CommonResult.success(byId); } - @GetMapping("/list") - public CommonResult> list(String pipelineId){ - List list = pipelineHistoryService.list(); - return CommonResult.success(list); + @PostMapping("/list") + public CommonResult> list(@RequestBody PipelineHistoryQueryReq req){ + return CommonResult.success(pipelineHistoryService.getPageByPipelineId(req)); } } diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestController.java index f4f35055..c9602ec9 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestController.java @@ -10,10 +10,10 @@ public class TestController { @PostMapping("/upload") public void uploadTest(){ - try { - SftpUploadUtil.uploadFileViaSftp("175.6.27.228",22,"hnidc", CryptogramUtil.doDecrypt("cb2ee50ff663312808773f1698b801d2f9d6073f9684473e090767edbc2dba93"),null,"/ops/ops-pro/ops-server.jar","/home/casic/706/ai_test_527","ops-server.jar"); - } catch (SftpUploadUtil.SftpUploadException e) { - throw new RuntimeException(e); - } +// try { +//// SftpUploadUtil.uploadFileViaSftp("175.6.27.228",22,"hnidc", CryptogramUtil.doDecrypt("cb2ee50ff663312808773f1698b801d2f9d6073f9684473e090767edbc2dba93"),null,"/ops/ops-pro/ops-server.jar","/home/casic/706/ai_test_527","ops-server.jar"); +// } catch (SftpUploadUtil.SftpUploadException e) { +// throw new RuntimeException(e); +// } } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java new file mode 100644 index 00000000..c51ad5e1 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java @@ -0,0 +1,10 @@ +package cd.casic.ci.process.dal.req.history; + +import cd.casic.framework.commons.pojo.PageParam; +import lombok.Data; + +@Data +public class PipelineHistoryQueryReq { + private String pipelineId; + private PageParam pageParam; +} 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 39b9362b..3e36e177 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 @@ -21,6 +21,7 @@ import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.util.util.WebFrameworkUtils; 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; @@ -173,11 +174,11 @@ public class DefaultRunContextManager implements RunContextManager { pipPipelineHisInstance.setEndTime(pipelineRunContext.getEndTime()); PiplineTriggerModeEnum triggerMode = pipelineRunContext.getTriggerMode(); pipPipelineHisInstance.setTriggerMode(triggerMode.getCode()); - pipPipelineHisInstance.setContextTree(JSON.toJSONString(pipelineRunContext)); + pipPipelineHisInstance.setContextTree(JSON.toJSONString(pipelineRunContext,SerializerFeature.DisableCircularReferenceDetect)); PipelineQueryReq pipelineQueryReq = new PipelineQueryReq(); pipelineQueryReq.setId(pipelineId); - pipPipelineHisInstance.setDefTree(JSON.toJSONString(pipelineService.findPipelineById(pipelineQueryReq))); - pipPipelineHisInstance.setStateTree(JSON.toJSONString(pipelineService.getPipelineRunState(pipelineId))); + pipPipelineHisInstance.setDefTree(JSON.toJSONString(pipelineService.findPipelineById(pipelineQueryReq), SerializerFeature.DisableCircularReferenceDetect)); + pipPipelineHisInstance.setStateTree(JSON.toJSONString(pipelineService.getPipelineRunState(pipelineId),SerializerFeature.DisableCircularReferenceDetect)); pipPipelineHisInstance.setTargetVersionName(""); pipPipelineHisInstance.setTargetVersionId(pipeline.getTargetVersionId()); hisInstanceDao.insert(pipPipelineHisInstance); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java index d8633ebf..50bba3b8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java @@ -80,10 +80,6 @@ public abstract class BaseRunContext { ||ContextStateEnum.BAD_ENDING.equals(stateEnum) ||ContextStateEnum.SKIP_TO.equals(stateEnum)) { this.endTime=LocalDateTime.now(); - if(this instanceof PipelineRunContext pipelineRunContext){ - // 流水线执行结束 进行入库 - - } } callParentChange(stateEnum); } else { diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java index 63ee3486..7c2bf23f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/AFLWorker.java @@ -47,7 +47,7 @@ public class AFLWorker extends DockerWorker { // MachineInfo machineInfoDO = this.getMachineInfoService().getById(machineId); // 获取docker 暂时先写固定值 DockerEndpoint dockerEndpoint = new DockerEndpoint(); - dockerEndpoint.setHost("175.6.27.228"); + dockerEndpoint.setHost("175.6.27.252"); dockerEndpoint.setPort(22375); dockerEndpoint.setType(DockerEndpoint.DockerEndpointTypeEnum.REMOTE); // TODO dockerEndpoint替换为查询 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java index 131bee17..5f3ad06e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java @@ -82,7 +82,7 @@ public abstract class BaseWorker implements Runnable{ if (contextDef instanceof PipTask task) { Map taskProperties = task.getTaskProperties(); Object taskSkip = taskProperties.get(PipelineBehaviorConstant.TASK_SKIP_KEY); - if (Boolean.TRUE.equals(taskSkip)) { + if (Integer.valueOf("1").equals(taskSkip)) { taskRunContext.changeContextState(ContextStateEnum.SKIP_TO); append(context,e.getMessage()); } else{ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java index d47bec4c..0ceaca7f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/PipelineHistoryService.java @@ -1,11 +1,13 @@ package cd.casic.ci.process.process.service.history; +import cd.casic.ci.process.dal.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 { - List getListByPipelineId(String pipelineId); + PageResult getPageByPipelineId(PipelineHistoryQueryReq req); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java index 19eb0845..34cd5973 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,12 +1,16 @@ 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.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.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -18,10 +22,10 @@ public class PipelineHistoryServiceImpl extends ServiceImpl getListByPipelineId(String pipelineId) { + public PageResult getPageByPipelineId(PipelineHistoryQueryReq req) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PipPipelineHisInstance::getPipelineId,pipelineId); - return pipelineHisInstanceDao.selectList(wrapper); - + wrapper.eq(PipPipelineHisInstance::getPipelineId,req.getPipelineId()); + Page page = pipelineHisInstanceDao.selectPage(new Page(), wrapper); + return new PageResult(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize()); } } diff --git a/ops-server/src/test/java/cd/casic/server/SftpTest.java b/ops-server/src/test/java/cd/casic/server/SftpTest.java index 7dce4412..202409b2 100644 --- a/ops-server/src/test/java/cd/casic/server/SftpTest.java +++ b/ops-server/src/test/java/cd/casic/server/SftpTest.java @@ -31,6 +31,6 @@ public class SftpTest { } @Test public void test03(){ - System.out.println(CryptogramUtil.doEncrypt("Hnidc@0626cn!@#zyx")); + System.out.println(CryptogramUtil.doEncrypt("hnidc0327cn!@#xhh")); } }