From d7641c4b1b9aa95d768bb9142aa01a3c63940c76 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Sun, 6 Jul 2025 17:26:55 +0800 Subject: [PATCH] =?UTF-8?q?0706=20ljc=20=20=20afl=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=93=8D=E4=BD=9C=E4=BB=A5=E5=8F=8A=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C=E4=BB=A5=E5=8F=8A=E6=97=B6=E5=BA=8F?= =?UTF-8?q?=E8=A1=A8=E6=93=8D=E4=BD=9C=E7=AD=89=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E5=8C=85=E5=90=AB=E5=88=86=E7=89=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BB=A5=E5=8F=8A=E6=96=87=E4=BB=B6=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AflCrashesInfoServiceImpl.java | 1 + .../aflManager/impl/AflInfoServiceImpl.java | 25 +++++++++---------- .../impl/AflPlotInfoServiceImpl.java | 2 ++ .../impl/AflSeedInfoServiceImpl.java | 11 ++++++-- .../casic/ci/process/util/SftpUploadUtil.java | 19 +++++--------- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflCrashesInfoServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflCrashesInfoServiceImpl.java index 4d4e7f61..6e5f3a89 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflCrashesInfoServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflCrashesInfoServiceImpl.java @@ -63,6 +63,7 @@ public class AflCrashesInfoServiceImpl extends ServiceImpl impleme throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"pipelineId或者taskId不能为空"); } - BaseRunContext runContext = runContextManager.getContext(req.getPipelineId()); - if (ObjectUtils.isEmpty(runContext)){ - throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"未找到运行上下文"); - } - String resourceId = runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY) instanceof String ? ((String) runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY)) : null; -// String resourceId = "1"; +// BaseRunContext runContext = runContextManager.getContext(req.getPipelineId()); +// if (ObjectUtils.isEmpty(runContext)){ +// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"未找到运行上下文"); +// } +// String resourceId = runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY) instanceof String ? ((String) runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY)) : null; + String resourceId = "2"; if (StringUtils.isEmpty(resourceId)){ throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"未找到资源"); } @@ -114,11 +112,12 @@ public class AflInfoServiceImpl extends ServiceImpl impleme throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"pipelineId或者taskId不能为空"); } - BaseRunContext runContext = runContextManager.getContext(req.getPipelineId()); - if (ObjectUtils.isEmpty(runContext)){ - throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"未找到运行上下文"); - } - String resourceId = runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY) instanceof String ? ((String) runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY)) : null; +// BaseRunContext runContext = runContextManager.getContext(req.getPipelineId()); +// if (ObjectUtils.isEmpty(runContext)){ +// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"未找到运行上下文"); +// } +// String resourceId = runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY) instanceof String ? ((String) runContext.getGlobalVariables().get(PipelineVariableConstant.AFL_RESOURCE_MANAGER_ID_KEY)) : null; + String resourceId = "2"; if (StringUtils.isEmpty(resourceId)){ throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"未找到资源"); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java index 7ec8be35..750f56a4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java @@ -59,6 +59,7 @@ public class AflPlotInfoServiceImpl extends ServiceImpl aflSeedInfos = new ArrayList<>(0); if (!CollectionUtils.isEmpty(copiedFiles)){ - //新增数据到crashes表中 + //新增数据到seed表中 copiedFiles.forEach(o->{ AflSeedInfo aflSeedInfo = new AflSeedInfo(); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java index 5f4f9d83..9e555aa1 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java @@ -1066,20 +1066,13 @@ public class SftpUploadUtil { session.connect(); System.out.println("SFTP Session 连接成功."); - //切换目录 - ChannelSftp sftpChannel = (ChannelSftp) session.openChannel("sftp"); - sftpChannel.connect(); - try { - sftpChannel.cd(remoteDir); - System.out.println("切换到远程目录: " + remoteDir); - } catch (SftpException e) { - System.err.println("切换目录失败: " + e.getMessage()); - } - sftpChannel.disconnect(); - - // 执行命令打印输出 + // 开始执行 find 命令 ChannelExec execChannel = (ChannelExec) session.openChannel("exec"); - execChannel.setCommand("find . -maxdepth 1 -type f -exec stat -c \"%n 创建时间: %w\" {} \\;"); + + // 设置要执行的命令 + String command = "find " + remoteDir + " -maxdepth 1 -type f -exec stat -c \"%n 创建时间: %w\" {} \\;"; + execChannel.setCommand(command); + InputStream in = execChannel.getInputStream(); execChannel.connect();