From 635c4cdade6ff6a145f6c9818667f456f8612514 Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Wed, 30 Oct 2024 13:55:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ASW-119=20=E8=B0=83=E6=95=B4=20playbook?= =?UTF-8?q?=20job=20=E6=89=A7=E8=A1=8C=E6=88=90=E5=8A=9F=E5=90=8E=20pcap?= =?UTF-8?q?=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runner/job/JobPlaybookExecResultChecker.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java index f01cf90..d7c063d 100644 --- a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java +++ b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java @@ -8,6 +8,8 @@ import cn.hutool.log.Log; import net.geedge.asw.common.util.Constants; import net.geedge.asw.common.util.RCode; import net.geedge.asw.common.util.T; +import net.geedge.asw.module.app.entity.PackageEntity; +import net.geedge.asw.module.app.service.IPackageService; import net.geedge.asw.module.environment.entity.EnvironmentEntity; import net.geedge.asw.module.environment.service.IEnvironmentService; import net.geedge.asw.module.runner.entity.JobEntity; @@ -31,6 +33,7 @@ import java.util.Set; @DisallowConcurrentExecution +@SuppressWarnings("all") public class JobPlaybookExecResultChecker extends QuartzJobBean { private static final Log log = Log.get(); @@ -43,6 +46,9 @@ public class JobPlaybookExecResultChecker extends QuartzJobBean { @Autowired private IJobService jobService; + @Autowired + private IPackageService packageService; + @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { @@ -88,7 +94,9 @@ public class JobPlaybookExecResultChecker extends QuartzJobBean { // file if (MediaType.APPLICATION_OCTET_STREAM_VALUE.equals(response.header(Header.CONTENT_TYPE.getValue()))) { - String fileName = response.header(Header.CONTENT_DISPOSITION).split("filename=")[1]; + PackageEntity packageEntity = packageService.getById(job.getPackageId()); + // pcap name {package.name}-job-{jobId[0:8]}.pcap + String fileName = T.StrUtil.concat(true, packageEntity.getName(), T.StrUtil.DASHED, "job", T.StrUtil.DASHED , T.StrUtil.sub(jobId, 0, 8), ".pcap"); if (log.isDebugEnabled()) { log.debug("[playbookExecResultChecker] [env: {}] [result fileName: {}]", environment.getId(), fileName); }