From 2fe673af83c7f4111a1d0852a82ff11505066c5a Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 9 Dec 2020 10:26:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Djenkins=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E6=B2=A1=E6=9C=89=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/jmeter/APIBackendListenerClient.java | 7 ++++++- .../performance/notice/PerformanceNoticeTask.java | 11 +++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java index bccf9dccb6..d9e14fe60e 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java @@ -229,7 +229,11 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl if (StringUtils.equals("Error", report.getStatus())) { event = NoticeConstants.Event.EXECUTE_FAILED; } - + Map paramMap = new HashMap<>(); + paramMap.put("testName", report.getName()); + paramMap.put("id", report.getId()); + paramMap.put("type", "performance"); + paramMap.put("url", baseSystemConfigDTO.getUrl()); NoticeModel noticeModel = NoticeModel.builder() .successContext(successContext) .successMailTemplate("ApiSuccessfulNotification") @@ -239,6 +243,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl .status(report.getStatus()) .event(event) .subject(subject) + .paramMap(paramMap) .build(); noticeSendService.send(report.getTriggerMode(), noticeModel); } diff --git a/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java b/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java index 6b9ea8226f..76782f6839 100644 --- a/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java +++ b/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java @@ -15,6 +15,8 @@ import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -49,7 +51,7 @@ public class PerformanceNoticeTask { } try { //查询定时任务是否关闭 - Thread.sleep(1000 * 30);// 每分钟检查 loadtest 的状态 + Thread.sleep(1000 * 10);// 检查 loadtest 的状态 } catch (InterruptedException e) { LogUtil.error(e.getMessage(), e); } @@ -81,7 +83,11 @@ public class PerformanceNoticeTask { if (PerformanceTestStatus.Error.name().equals(loadTestReport.getStatus())) { event = NoticeConstants.Event.EXECUTE_FAILED; } - + Map paramMap = new HashMap<>(); + paramMap.put("testName", loadTestReport.getName()); + paramMap.put("id", loadTestReport.getId()); + paramMap.put("type", "performance"); + paramMap.put("url", baseSystemConfigDTO.getUrl()); NoticeModel noticeModel = NoticeModel.builder() .successContext(successContext) .successMailTemplate("PerformanceApiSuccessNotification") @@ -91,6 +97,7 @@ public class PerformanceNoticeTask { .status(loadTestReport.getStatus()) .subject(subject) .event(event) + .paramMap(paramMap) .build(); noticeSendService.send(loadTestReport.getTriggerMode(), noticeModel); }