From 41340cde89a35447f89c19e1724547fd2c8ae0bc Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 2 Nov 2020 12:10:32 +0800
Subject: [PATCH 1/8] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=20kafka=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=20<!--=20avoid=20recursive=20logging=20-->?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/jmeter-base/log4j2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/jmeter-base/log4j2.xml b/docker/jmeter-base/log4j2.xml
index 3e11c0dc68..cdb08d7377 100644
--- a/docker/jmeter-base/log4j2.xml
+++ b/docker/jmeter-base/log4j2.xml
@@ -43,7 +43,7 @@
             <AppenderRef ref="gui-log-event" />
             <AppenderRef ref="Kafka" />
         </Root>
-
+        <Logger name="org.apache.kafka" level="INFO" />
         <Logger name="org.apache.jmeter.junit" level="debug" />
         <!--
         <Logger name="org.apache.jmeter.control" level="debug" />

From 45344632163c7207d65cd29b6ab109b5216989de Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 2 Nov 2020 13:20:44 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8A=A5=E5=91=8A=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/notice/PerformanceNoticeTask.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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 3eeb70d0f9..2daeca53a3 100644
--- a/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java
+++ b/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java
@@ -1,6 +1,7 @@
 package io.metersphere.performance.notice;
 
 import io.metersphere.base.domain.LoadTestReportWithBLOBs;
+import io.metersphere.base.mapper.LoadTestReportMapper;
 import io.metersphere.commons.constants.NoticeConstants;
 import io.metersphere.commons.constants.PerformanceTestStatus;
 import io.metersphere.commons.utils.LogUtil;
@@ -34,6 +35,9 @@ public class PerformanceNoticeTask {
     private MailService mailService;
     @Resource
     private SystemParameterService systemParameterService;
+    @Resource
+    private LoadTestReportMapper loadTestReportMapper;
+
     private final ExecutorService executorService = Executors.newFixedThreadPool(20);
     private boolean isRunning = true;
 
@@ -45,14 +49,16 @@ public class PerformanceNoticeTask {
     public void registerNoticeTask(LoadTestReportWithBLOBs loadTestReport) {
         executorService.submit(() -> {
             while (isRunning) {
-                if (StringUtils.equals(loadTestReport.getStatus(), PerformanceTestStatus.Completed.name())) {
+                LoadTestReportWithBLOBs loadTestReportFromDatabase = loadTestReportMapper.selectByPrimaryKey(loadTestReport.getId());
+
+                if (StringUtils.equals(loadTestReportFromDatabase.getStatus(), PerformanceTestStatus.Completed.name())) {
                     isRunning = false;
-                    sendSuccessNotice(loadTestReport);
+                    sendSuccessNotice(loadTestReportFromDatabase);
                     return;
                 }
-                if (StringUtils.equals(loadTestReport.getStatus(), PerformanceTestStatus.Error.name())) {
+                if (StringUtils.equals(loadTestReportFromDatabase.getStatus(), PerformanceTestStatus.Error.name())) {
                     isRunning = false;
-                    sendFailNotice(loadTestReport);
+                    sendFailNotice(loadTestReportFromDatabase);
                     return;
                 }
                 try {

From b749f6277b4856f3844e32e7812f56cc5bbee94d Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 2 Nov 2020 15:21:08 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/issue/AbstractIssuePlatform.java    |  2 +-
 .../track/issue/IssuesPlatform.java           | 11 +++---
 .../track/service/TestCaseNodeService.java    | 34 +++++++++++++++++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index a5e8dd6bf1..4a5ba53f7a 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -62,7 +62,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
 
     /**
      * 获取平台与项目相关的属性
-     * @return
+     * @return 其他平台和本地项目绑定的属性值
      */
     abstract String getProjectId();
 
diff --git a/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java b/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java
index a80d225733..458e885408 100644
--- a/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java
@@ -9,31 +9,30 @@ public interface IssuesPlatform {
 
     /**
      * 获取平台相关联的缺陷
-     * @return
+     * @return platform issues list
      */
     List<Issues> getIssue();
 
     /**
      * 添加缺陷到缺陷平台
-     * @param issuesRequest
+     * @param issuesRequest issueRequest
      */
     void addIssue(IssuesRequest issuesRequest);
 
     /**
      * 删除缺陷平台缺陷
-     * @param id
+     * @param id issue id
      */
     void deleteIssue(String id);
 
     /**
-     * 测试缺陷平台连通性
-     * @param
+     * 测试平台联通性
      */
     void testAuth();
 
     /**
      * 获取缺陷平台项目下的相关人员
-     * @return
+     * @return platform user list
      */
     List<PlatformUser> getPlatformUser();
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
index 22d612a948..bda8df1325 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
@@ -586,9 +586,14 @@ public class TestCaseNodeService {
     }
 
 
-    // 测试用例同级模块排序
+    /**
+     * 测试用例同级模块排序
+     * @param ids 被拖拽模块相邻的前一个模块 id，
+     *            被拖拽的模块 id，
+     *            被拖拽模块相邻的后一个模块 id
+     */
     public void sort(List<String> ids) {
-        // 获取相邻节点
+        // 获取相邻节点 id
         String before = ids.get(0);
         String id = ids.get(1);
         String after = ids.get(2);
@@ -598,6 +603,7 @@ public class TestCaseNodeService {
 
         TestCaseNode caseNode = getCaseNode(id);
 
+        // 获取相邻节点
         if (StringUtils.isNotBlank(before)) {
             beforeCase = getCaseNode(before);
             beforeCase = beforeCase.getLevel().equals(caseNode.getLevel()) ? beforeCase : null;
@@ -625,6 +631,14 @@ public class TestCaseNodeService {
         }
     }
 
+    /**
+     * 按照指定排序方式获取同级模块的列表
+     * @param projectId 所属项目 id
+     * @param level node level
+     * @param parentId node parent id
+     * @param order pos 排序方式
+     * @return 按照指定排序方式排序的同级模块列表
+     */
     private List<TestCaseNode> getPos(String projectId, int level, String parentId, String order) {
         TestCaseNodeExample example = new TestCaseNodeExample();
         TestCaseNodeExample.Criteria criteria = example.createCriteria();
@@ -636,6 +650,12 @@ public class TestCaseNodeService {
         return testCaseNodeMapper.selectByExample(example);
     }
 
+    /**
+     * 刷新同级模块的 pos 值
+     * @param projectId project id
+     * @param level node level
+     * @param parentId node parent id
+     */
     private void refreshPos(String projectId, int level, String parentId) {
         List<TestCaseNode> nodes = getPos(projectId, level, parentId, "pos asc");
         if (!CollectionUtils.isEmpty(nodes)) {
@@ -650,7 +670,15 @@ public class TestCaseNodeService {
         }
     }
 
-    public double getNextLevelPos(String projectId, int level, String parentId) {
+
+    /**
+     * 获得同级模块下一个 pos 值
+     * @param projectId project id
+     * @param level node level
+     * @param parentId node parent id
+     * @return 同级模块下一个 pos 值
+     */
+    private double getNextLevelPos(String projectId, int level, String parentId) {
         List<TestCaseNode> list = getPos(projectId, level, parentId, "pos desc");
         if (!CollectionUtils.isEmpty(list)) {
             return list.get(0).getPos() + 65536;

From 352d464ca68d1c3207381b5884000a38269ded93 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 2 Nov 2020 16:51:06 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E9=92=89=E9=92=89=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=AD=E4=B8=BA=E7=A9=BA=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/service/DingTaskService.java       |  3 +-
 .../notice/service/WxChatTaskService.java     |  3 +-
 .../track/service/TestCaseReviewService.java  | 44 ++++++++++---------
 .../track/service/TestPlanService.java        | 12 ++---
 4 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java b/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java
index fef93eb126..dd30c10ff3 100644
--- a/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java
@@ -6,6 +6,7 @@ import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.dingtalk.api.response.OapiRobotSendResponse;
 import com.taobao.api.ApiException;
 import io.metersphere.commons.constants.NoticeConstants;
+import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.notice.domain.MessageDetail;
 import io.metersphere.notice.domain.UserDetail;
 import io.metersphere.service.UserService;
@@ -62,7 +63,7 @@ public class DingTaskService {
         try {
             response = client.execute(request);
         } catch (ApiException e) {
-            e.printStackTrace();
+            LogUtil.error(e);
         }
         System.out.println(response.getErrcode());
     }
diff --git a/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java b/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java
index a4bc03e904..10be211dc5 100644
--- a/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java
@@ -1,6 +1,7 @@
 package io.metersphere.notice.service;
 
 import io.metersphere.commons.constants.NoticeConstants;
+import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.notice.domain.MessageDetail;
 import io.metersphere.notice.domain.UserDetail;
 import io.metersphere.notice.message.TextMessage;
@@ -55,7 +56,7 @@ public class WxChatTaskService {
             SendResult result = WxChatbotClient.send(Webhook, message);
             System.out.println(result);
         } catch (IOException e) {
-            e.printStackTrace();
+            LogUtil.error(e);
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index a3e0bee76a..69575d5f69 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -8,6 +8,7 @@ import io.metersphere.base.mapper.ext.ExtTestCaseReviewMapper;
 import io.metersphere.base.mapper.ext.ExtTestReviewCaseMapper;
 import io.metersphere.commons.constants.NoticeConstants;
 import io.metersphere.commons.constants.TestCaseReviewStatus;
+import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.commons.constants.TestReviewCaseStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
@@ -184,28 +185,31 @@ public class TestCaseReviewService {
         testCaseReview.setUpdateTime(System.currentTimeMillis());
         checkCaseReviewExist(testCaseReview);
         testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview);
-        List<String>  userIds=new ArrayList<>();
+        List<String> userIds = new ArrayList<>();
         userIds.addAll(testCaseReview.getUserIds());
-        try {
-            String context = getReviewContext(testCaseReview, NoticeConstants.CREATE);
-            MessageSettingDetail messageSettingDetail = noticeService.searchMessage();
-            List<MessageDetail> taskList = messageSettingDetail.getReviewTask();
-            taskList.forEach(r -> {
-                switch (r.getType()) {
-                    case NoticeConstants.NAIL_ROBOT:
-                        dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.CREATE);
-                        break;
-                    case NoticeConstants.WECHAT_ROBOT:
-                        wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.CREATE);
-                        break;
-                    case NoticeConstants.EMAIL:
-                        mailService.sendReviewerNotice(r, userIds, testCaseReview, NoticeConstants.CREATE);
-                        break;
-                }
-            });
-        } catch (Exception e) {
-            LogUtil.error(e);
+        if (StringUtils.equals(TestPlanStatus.Completed.name(), testCaseReview.getStatus())) {
+            try {
+                String context = getReviewContext(testCaseReview, NoticeConstants.UPDATE);
+                MessageSettingDetail messageSettingDetail = noticeService.searchMessage();
+                List<MessageDetail> taskList = messageSettingDetail.getReviewTask();
+                taskList.forEach(r -> {
+                    switch (r.getType()) {
+                        case NoticeConstants.NAIL_ROBOT:
+                            dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.UPDATE);
+                            break;
+                        case NoticeConstants.WECHAT_ROBOT:
+                            wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.UPDATE);
+                            break;
+                        case NoticeConstants.EMAIL:
+                            mailService.sendReviewerNotice(r, userIds, testCaseReview, NoticeConstants.UPDATE);
+                            break;
+                    }
+                });
+            } catch (Exception e) {
+                LogUtil.error(e);
+            }
         }
+
     }
 
     private void editCaseReviewer(SaveTestCaseReviewRequest testCaseReview) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 7ae31d1ea3..14e16fb576 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -165,20 +165,20 @@ public class TestPlanService {
             //已完成，写入实际完成时间
             testPlan.setActualEndTime(System.currentTimeMillis());
             try {
-                BeanUtils.copyBean(testPlans, testPlan);
-                String context = getTestPlanContext(testPlans, NoticeConstants.CREATE);
+                BeanUtils.copyBean(testPlans, getTestPlan(testPlan.getId()));
+                String context = getTestPlanContext(testPlans, NoticeConstants.UPDATE);
                 MessageSettingDetail messageSettingDetail = noticeService.searchMessage();
-                List<MessageDetail> taskList = messageSettingDetail.getReviewTask();
+                List<MessageDetail> taskList = messageSettingDetail.getTestCasePlanTask();
                 taskList.forEach(r -> {
                     switch (r.getType()) {
                         case NoticeConstants.NAIL_ROBOT:
-                            dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.CREATE);
+                            dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.UPDATE);
                             break;
                         case NoticeConstants.WECHAT_ROBOT:
-                            wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.CREATE);
+                            wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.UPDATE);
                             break;
                         case NoticeConstants.EMAIL:
-                            mailService.sendTestPlanStartNotice(r, userIds, testPlans, NoticeConstants.CREATE);
+                            mailService.sendTestPlanStartNotice(r, userIds, testPlans, NoticeConstants.UPDATE);
                             break;
                     }
                 });

From e983319e9a4c8076533b12294a98e977c6b2ab10 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 2 Nov 2020 17:11:09 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dflyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V39__modify_message_task_create_time.sql     | 4 ++--
 .../resources/db/migration/V41__modify_message_task_set.sql   | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 backend/src/main/resources/db/migration/V41__modify_message_task_set.sql

diff --git a/backend/src/main/resources/db/migration/V39__modify_message_task_create_time.sql b/backend/src/main/resources/db/migration/V39__modify_message_task_create_time.sql
index 3235c4246d..74ecfc6196 100644
--- a/backend/src/main/resources/db/migration/V39__modify_message_task_create_time.sql
+++ b/backend/src/main/resources/db/migration/V39__modify_message_task_create_time.sql
@@ -1,2 +1,2 @@
-alter table message_task
-    add create_time bigint(13) null;
\ No newline at end of file
+ALTER TABLE message_task
+    ADD create_time bigint(13) DEFAULT 0;
\ No newline at end of file
diff --git a/backend/src/main/resources/db/migration/V41__modify_message_task_set.sql b/backend/src/main/resources/db/migration/V41__modify_message_task_set.sql
deleted file mode 100644
index 3e41e45e93..0000000000
--- a/backend/src/main/resources/db/migration/V41__modify_message_task_set.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table message_task
-    alter column create_time set default 0;
-

From 65872f16598f887df48865c06ae82ebc97a17bee Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 3 Nov 2020 11:20:38 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/PerformanceTestService.java       | 21 +------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
index 09c997b495..96b1123c33 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -19,7 +19,6 @@ import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.dto.ScheduleDao;
 import io.metersphere.i18n.Translator;
 import io.metersphere.job.sechedule.PerformanceTestJob;
-import io.metersphere.notice.domain.NoticeDetail;
 import io.metersphere.performance.engine.Engine;
 import io.metersphere.performance.engine.EngineFactory;
 import io.metersphere.performance.notice.PerformanceNoticeTask;
@@ -230,12 +229,10 @@ public class PerformanceTestService {
         startEngine(loadTest, engine, request.getTriggerMode());
 
         LoadTestReportWithBLOBs loadTestReport = loadTestReportMapper.selectByPrimaryKey(engine.getReportId());
+        loadTestReport.setTriggerMode("API");
         if (StringUtils.equals(NoticeConstants.API, loadTestReport.getTriggerMode()) || StringUtils.equals(NoticeConstants.SCHEDULE, loadTestReport.getTriggerMode())) {
             performanceNoticeTask.registerNoticeTask(loadTestReport);
         }
-        /*if (StringUtils.equals(NoticeConstants.API, loadTestReport.getTriggerMode()) || StringUtils.equals(NoticeConstants.SCHEDULE, "SCHEDULE")) {
-            performanceNoticeTask.registerNoticeTask(loadTestReport);
-        }*/
         return engine.getReportId();
     }
 
@@ -305,15 +302,10 @@ public class PerformanceTestService {
         } catch (MSException e) {
             // 启动失败之后清理任务
             engine.stop();
-
             LogUtil.error(e);
             loadTest.setStatus(PerformanceTestStatus.Error.name());
             loadTest.setDescription(e.getMessage());
             loadTestMapper.updateByPrimaryKeySelective(loadTest);
-            LoadTestReportWithBLOBs loadTestReport = loadTestReportMapper.selectByPrimaryKey(engine.getReportId());
-            if (StringUtils.equals(NoticeConstants.API, loadTestReport.getTriggerMode()) || StringUtils.equals(NoticeConstants.SCHEDULE, loadTestReport.getTriggerMode())) {
-                performanceNoticeTask.registerNoticeTask(loadTestReport);
-            }
             throw e;
         }
     }
@@ -436,17 +428,6 @@ public class PerformanceTestService {
             reportService.stopEngine(loadTest, engine);
             // 停止测试之后设置报告的状态
             reportService.updateStatus(reportId, PerformanceTestStatus.Completed.name());
-            List<NoticeDetail> noticeList = null;
-            if (loadTestReport.getTriggerMode().equals("SCHEDULE")) {
-               /* try {
-                    noticeList = noticeService.queryNotice(loadTest.getId());
-                    mailService.sendPerformanceNotification(noticeList, loadTestReport.getStatus(), loadTest, loadTestReport.getId());
-                } catch (Exception e) {
-                    LogUtil.error(e.getMessage(), e);
-                }*/
-            }
-
-
         }
     }
 

From b2560a84962d48a0ca532ce57cabd00b2e52044d Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Tue, 3 Nov 2020 13:28:41 +0800
Subject: [PATCH 7/8] Update ROADMAP.md

---
 ROADMAP.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 5102ed85b0..3921fe2abb 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -38,9 +38,21 @@
 - [x] 其他：消息通知
 - [x] 其他：报告导出
 
+## v1.4 (已发布）
+- [x] 测试跟踪模块编辑测试用例支持上传附件
+- [x] 支持上传并引用自定义Jar包
+- [x] 接口测试支持TCP协议请求
+- [x] 全新的消息通知设置，支持企业微信、钉钉机器人通知
+
+## v1.5 (开发中)
+- [ ] 性能测试：优化并发数、持续时间等压力配置方式
+- [ ] 性能测试：支持使用了额外插件的 JMX 文件
+- [ ] 性能测试：自动修改 csv 等数据文件引用路径
+- [ ] 性能测试：优化性能测试报告展示
+- [ ] 测试跟踪：支持对接禅道同步缺陷
+- [ ] 其他：Jenkins 插件支持 pipeline 方式调用
 
 ## 规划中
-- [ ] 接口测试支持添加 TCP 协议请求
 - [ ] 接口测试支持添加 WebSocket 协议请求
 - [ ] 接口管理功能
 - [ ] 集成云平台动态管理测试资源池

From ce0a688130a40debd290ef288076022539e69b33 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 3 Nov 2020 14:33:20 +0800
Subject: [PATCH 8/8] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.java    |  7 +++++++
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.xml     |  8 ++++++++
 .../base/mapper/ext/ExtTestReviewCaseMapper.java      |  7 +++++++
 .../base/mapper/ext/ExtTestReviewCaseMapper.xml       |  8 ++++++++
 .../track/service/TestCaseReviewService.java          | 11 ++++++-----
 .../io/metersphere/track/service/TestPlanService.java | 11 ++++++-----
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index a42648ab81..1bff19ab89 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -31,4 +31,11 @@ public interface ExtTestPlanTestCaseMapper {
 
     List<String> getTestPlanTestCaseIds(String testId);
 
+    /**
+     * 根据项目 ids 查询 TestPlanCaseDTO 列表
+     * @param ids project id list
+     * @return List<TestPlanCaseDTO>
+     */
+    List<TestPlanCaseDTO> listTestCaseByProjectIds(@Param("ids") List<String> ids);
+
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 4737fed2b2..7b267835c1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -210,6 +210,14 @@
             </foreach>
         </if>
     </select>
+    <select id="listTestCaseByProjectIds" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
+        select distinct * from test_plan_test_case, test_case
+        where test_plan_test_case.case_id = test_case.id
+        and test_case.project_id in
+        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
     <select id="listByNode" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_plan_test_case.*, test_case.*
         from test_plan_test_case
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
index b3a19d01b6..1cfd376151 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
@@ -12,4 +12,11 @@ public interface ExtTestReviewCaseMapper {
     List<TestReviewCaseDTO> list(@Param("request") QueryCaseReviewRequest request);
     List<String> getStatusByReviewId(String reviewId);
     List<String> findRelateTestReviewId(@Param("userId") String userId, @Param("workspaceId") String workspaceId);
+
+    /**
+     * 根据项目 ids 查询 TestReviewCaseDTO 列表
+     * @param ids project id list
+     * @return List<TestReviewCaseDTO>
+     */
+    List<TestReviewCaseDTO> listTestCaseByProjectIds(@Param("ids") List<String> ids);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
index d49214cba6..ed50f42be8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
@@ -195,4 +195,12 @@
         where test_case_review_test_case.review_id = #{userId}
         and project.workspace_id = #{workspaceId}
     </select>
+    <select id="listTestCaseByProjectIds" resultType="io.metersphere.track.dto.TestReviewCaseDTO">
+        select distinct * from test_case_review_test_case, test_case
+        where test_case_review_test_case.case_id = test_case.id
+        and test_case.project_id in
+        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index 69575d5f69..a08e4de8f8 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -484,7 +484,7 @@ public class TestCaseReviewService {
         request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         request.setReviewIds(extTestReviewCaseMapper.findRelateTestReviewId(user.getId(), SessionUtils.getCurrentWorkspaceId()));
 
-        List<String> projectIds = extProjectMapper.getProjectIdByWorkspaceId(SessionUtils.getCurrentOrganizationId());
+        List<String> projectIds = extProjectMapper.getProjectIdByWorkspaceId(SessionUtils.getCurrentWorkspaceId());
 
         List<TestReviewDTOWithMetric> testReviews = extTestCaseReviewMapper.listRelate(request);
 
@@ -553,10 +553,11 @@ public class TestCaseReviewService {
         return name;
     }
 
-    public List<TestReviewCaseDTO> listTestCaseByProjectIds(List<String> projectIds) {
-        QueryCaseReviewRequest request = new QueryCaseReviewRequest();
-        request.setProjectIds(projectIds);
-        return extTestReviewCaseMapper.list(request);
+    private List<TestReviewCaseDTO> listTestCaseByProjectIds(List<String> projectIds) {
+        if (CollectionUtils.isEmpty(projectIds)) {
+            return new ArrayList<>();
+        }
+        return extTestReviewCaseMapper.listTestCaseByProjectIds(projectIds);
     }
 
     /*编辑，新建，完成,删除通知内容*/
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 14e16fb576..4467628bcf 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -365,7 +365,7 @@ public class TestPlanService {
         request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         request.setPlanIds(extTestPlanTestCaseMapper.findRelateTestPlanId(user.getId(), SessionUtils.getCurrentWorkspaceId()));
 
-        List<String> projectIds = extProjectMapper.getProjectIdByWorkspaceId(SessionUtils.getCurrentOrganizationId());
+        List<String> projectIds = extProjectMapper.getProjectIdByWorkspaceId(SessionUtils.getCurrentWorkspaceId());
 
         List<TestPlanDTOWithMetric> testPlans = extTestPlanMapper.listRelate(request);
 
@@ -411,10 +411,11 @@ public class TestPlanService {
         return testPlanTestCaseService.list(request);
     }
 
-    public List<TestPlanCaseDTO> listTestCaseByProjectIds(List<String> projectIds) {
-        QueryTestPlanCaseRequest request = new QueryTestPlanCaseRequest();
-        request.setProjectIds(projectIds);
-        return extTestPlanTestCaseMapper.list(request);
+    private List<TestPlanCaseDTO> listTestCaseByProjectIds(List<String> projectIds) {
+        if (CollectionUtils.isEmpty(projectIds)) {
+            return new ArrayList<>();
+        }
+        return extTestPlanTestCaseMapper.listTestCaseByProjectIds(projectIds);
     }
 
     public TestCaseReportMetricDTO getMetric(String planId) {