From 6f1f3c890175f87a885d531eae246547e2ab9efc Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 23 Oct 2020 11:13:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(XPack):=20=E6=81=A2=E5=A4=8D=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index cf6b065263..ee74568be0 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit cf6b06526324326a563d933e07118fac014a63b4 +Subproject commit ee74568be0beba46da19616f5832e83f9164c688 From 2c839b0d619a82aa54dcd6dc8ccc728b559e795f Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Fri, 23 Oct 2020 11:25:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=B6=88=E6=81=AF=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/api/jmeter/APIBackendListenerClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e96f4b6ae2..a483fd82a4 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java @@ -178,7 +178,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl List noticeList = noticeService.queryNotice(testResult.getTestId()); mailService.sendApiNotification(report, noticeList); } - if (StringUtils.equals(NoticeConstants.API, "API")) { + if (StringUtils.equals(NoticeConstants.API, report.getTriggerMode())) { List userIds = new ArrayList<>(); MessageSettingDetail messageSettingDetail = noticeService.searchMessage(); List taskList = messageSettingDetail.getJenkinsTask();