From e6fc2adb5819ad18f50656cdb1021b03aca5264b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 24 Nov 2020 10:39:25 +0800
Subject: [PATCH 01/52] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E6=AF=8F=E9=A1=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml     |   3 +-
 .../components/track/case/TestCase.vue        | 373 +++++------
 .../track/case/components/TestCaseDetail.vue  |  11 +-
 .../track/case/components/TestCaseEdit.vue    |   4 +-
 .../track/case/components/TestCaseList.vue    | 606 +++++++++---------
 5 files changed, 510 insertions(+), 487 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 53bb178dec..9a9a8b2d51 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -258,7 +258,8 @@
     </select>
 
     <select id="list" resultType="io.metersphere.track.dto.TestCaseDTO">
-        select test_case.* from test_case
+        select <include refid="io.metersphere.base.mapper.TestCaseMapper.Base_Column_List"/>
+        from test_case
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index b58b389157..ee8e4cd59d 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -55,204 +55,205 @@
 
 <script>
 
-  import NodeTree from '../common/NodeTree';
-  import TestCaseEdit from './components/TestCaseEdit';
-  import {CURRENT_PROJECT, ROLE_TEST_MANAGER, ROLE_TEST_USER} from '../../../../common/js/constants';
-  import TestCaseList from "./components/TestCaseList";
-  import SelectMenu from "../common/SelectMenu";
-  import TestCaseMove from "./components/TestCaseMove";
-  import MsContainer from "../../common/components/MsContainer";
-  import MsAsideContainer from "../../common/components/MsAsideContainer";
-  import MsMainContainer from "../../common/components/MsMainContainer";
-  import {checkoutTestManagerOrTestUser, hasRoles} from "../../../../common/js/utils";
-  import BatchMove from "./components/BatchMove";
+import NodeTree from '../common/NodeTree';
+import TestCaseEdit from './components/TestCaseEdit';
+import {CURRENT_PROJECT, ROLE_TEST_MANAGER, ROLE_TEST_USER} from '../../../../common/js/constants';
+import TestCaseList from "./components/TestCaseList";
+import SelectMenu from "../common/SelectMenu";
+import TestCaseMove from "./components/TestCaseMove";
+import MsContainer from "../../common/components/MsContainer";
+import MsAsideContainer from "../../common/components/MsAsideContainer";
+import MsMainContainer from "../../common/components/MsMainContainer";
+import {checkoutTestManagerOrTestUser, hasRoles} from "../../../../common/js/utils";
+import BatchMove from "./components/BatchMove";
 
-  export default {
-    name: "TestCase",
-    components: {
-      MsMainContainer,
-      MsAsideContainer, MsContainer, TestCaseMove, TestCaseList, NodeTree, TestCaseEdit, SelectMenu, BatchMove},
-    comments: {},
-    data() {
-      return {
-        result: {},
-        currentPage: 1,
-        pageSize: 5,
-        total: 0,
-        projects: [],
-        currentProject: null,
-        treeNodes: [],
-        selectNodeIds: [],
-        selectParentNodes: [],
-        testCaseReadOnly: true,
-        selectNode: {},
-        nodeTreeDraggable: true,
+export default {
+  name: "TestCase",
+  components: {
+    MsMainContainer,
+    MsAsideContainer, MsContainer, TestCaseMove, TestCaseList, NodeTree, TestCaseEdit, SelectMenu, BatchMove
+  },
+  comments: {},
+  data() {
+    return {
+      result: {},
+      currentPage: 1,
+      pageSize: 5,
+      total: 0,
+      projects: [],
+      currentProject: null,
+      treeNodes: [],
+      selectNodeIds: [],
+      selectParentNodes: [],
+      testCaseReadOnly: true,
+      selectNode: {},
+      nodeTreeDraggable: true,
+    }
+  },
+  mounted() {
+    this.init(this.$route);
+  },
+  watch: {
+    '$route'(to, from) {
+      this.init(to);
+    },
+    currentProject() {
+      this.refresh();
+    }
+  },
+  methods: {
+    init(route) {
+      let path = route.path;
+      if (path.indexOf("/track/case/edit") >= 0 || path.indexOf("/track/case/create") >= 0) {
+        this.getProjects();
+        this.testCaseReadOnly = false;
+        if (!checkoutTestManagerOrTestUser()) {
+          this.testCaseReadOnly = true;
+        }
+        let caseId = this.$route.params.caseId;
+        this.openRecentTestCaseEditDialog(caseId);
+        this.$router.push('/track/case/all');
+      } else if (route.params.projectId) {
+        this.getProjects();
+        this.getProjectById(route.params.projectId);
       }
     },
-    mounted() {
-      this.init(this.$route);
-    },
-    watch: {
-      '$route'(to, from) {
-        this.init(to);
-      },
-      currentProject() {
-        this.refresh();
-      }
-    },
-    methods: {
-      init(route) {
-        let path = route.path;
-        if (path.indexOf("/track/case/edit") >= 0 || path.indexOf("/track/case/create") >= 0){
-          this.getProjects();
-          this.testCaseReadOnly = false;
-          if (!checkoutTestManagerOrTestUser()) {
-            this.testCaseReadOnly = true;
+    getProjects() {
+      this.$get("/project/listAll", (response) => {
+        this.projects = response.data;
+        let lastProject = JSON.parse(localStorage.getItem(CURRENT_PROJECT));
+        if (lastProject) {
+          let hasCurrentProject = false;
+          for (let i = 0; i < this.projects.length; i++) {
+            if (this.projects[i].id == lastProject.id) {
+              this.currentProject = lastProject;
+              hasCurrentProject = true;
+              break;
+            }
+          }
+          if (!hasCurrentProject) {
+            this.setCurrentProject(this.projects[0]);
           }
-          let caseId = this.$route.params.caseId;
-          this.openRecentTestCaseEditDialog(caseId);
-          this.$router.push('/track/case/all');
-        } else if (route.params.projectId){
-          this.getProjects();
-          this.getProjectById(route.params.projectId);
-        }
-      },
-      getProjects() {
-          this.$get("/project/listAll", (response) => {
-            this.projects = response.data;
-            let lastProject = JSON.parse(localStorage.getItem(CURRENT_PROJECT));
-            if (lastProject) {
-              let hasCurrentProject = false;
-              for (let i = 0; i < this.projects.length; i++) {
-                if (this.projects[i].id == lastProject.id) {
-                  this.currentProject = lastProject;
-                  hasCurrentProject = true;
-                  break;
-                }
-              }
-              if (!hasCurrentProject) {
-                this.setCurrentProject(this.projects[0]);
-              }
-            } else {
-              if(this.projects.length > 0){
-                this.setCurrentProject(this.projects[0]);
-              }
-            }
-            // this.checkProject();
-          });
-      },
-      checkProject() {
-        if(this.currentProject === null) {
-          this.$alert(this.$t('test_track.case.no_project'), {
-            confirmButtonText: this.$t('project.create'),
-            callback: action => {
-              this.$router.push("/track/project/create");
-            }
-          });
-        }
-      },
-      changeProject(project) {
-        this.setCurrentProject(project);
-      },
-      nodeChange(nodeIds, pNodes) {
-        this.selectNodeIds = nodeIds;
-        this.selectParentNodes = pNodes;
-      },
-      refreshTable() {
-        this.$refs.testCaseList.initTableData();
-      },
-      editTestCase(testCase) {
-        this.testCaseReadOnly = false;
-        if (this.treeNodes.length < 1) {
-          this.$warning(this.$t('test_track.case.create_module_first'));
-          return;
-        }
-        this.$refs.testCaseEditDialog.open(testCase);
-      },
-      copyTestCase(testCase) {
-        this.testCaseReadOnly = false;
-        let item = {};
-        Object.assign(item, testCase);
-        item.name = '';
-        item.isCopy = true;
-        this.$refs.testCaseEditDialog.open(item);
-      },
-      showTestCaseDetail(testCase) {
-        this.testCaseReadOnly = true;
-        this.$refs.testCaseEditDialog.open(testCase);
-      },
-      getProjectByCaseId(caseId) {
-        return this.$get('/test/case/project/' + caseId, async response => {
-          this.setCurrentProject(response.data);
-        });
-      },
-      refresh() {
-        this.selectNodeIds = [];
-        this.selectParentNodes = [];
-        this.selectNode = {};
-        this.$refs.testCaseList.initTableData();
-        this.getNodeTree();
-      },
-      openRecentTestCaseEditDialog(caseId) {
-        if (caseId) {
-          this.getProjectByCaseId(caseId);
-          this.$get('/test/case/get/' + caseId, response => {
-            if (response.data) {
-              this.$refs.testCaseEditDialog.open(response.data);
-            }
-          });
         } else {
-          this.$refs.testCaseEditDialog.open();
+          if (this.projects.length > 0) {
+            this.setCurrentProject(this.projects[0]);
+          }
         }
-      },
-      getProjectById(id) {
-        if (id && id != 'all') {
-          this.$get('/project/get/' + id, response => {
-            let project = response.data;
-            this.setCurrentProject(project);
-            // this.$router.push('/track/case/all');
-          });
-        }
-        if (id === 'all') {
-          this.refresh();
-        }
-      },
-      setCurrentProject(project) {
-        if (project) {
-          this.currentProject = project;
-          localStorage.setItem(CURRENT_PROJECT, JSON.stringify(project));
-        }
-        this.refresh();
-      },
-      getNodeTree() {
-        if (!hasRoles(ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
-          this.nodeTreeDraggable = false;
-        }
-        if (this.currentProject) {
-          this.result = this.$get("/case/node/list/" + this.currentProject.id, response => {
-            this.treeNodes = response.data;
-          });
-        }
-      },
-      moveToNode(selectIds) {
-        if (selectIds.size < 1) {
-          this.$warning(this.$t('test_track.plan_view.select_manipulate'));
-          return;
-        }
-        this.$refs.testCaseEditDialog.getModuleOptions();
-        this.$refs.testCaseMove.open(this.$refs.testCaseEditDialog.moduleOptions, selectIds);
-      },
-      batchMove(selectIds) {
-        this.$refs.testBatchMove.open(this.treeNodes, selectIds,this.$refs.testCaseEditDialog.moduleOptions);
+        // this.checkProject();
+      });
+    },
+    checkProject() {
+      if (this.currentProject === null) {
+        this.$alert(this.$t('test_track.case.no_project'), {
+          confirmButtonText: this.$t('project.create'),
+          callback: action => {
+            this.$router.push("/track/project/create");
+          }
+        });
       }
+    },
+    changeProject(project) {
+      this.setCurrentProject(project);
+    },
+    nodeChange(nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+      this.selectParentNodes = pNodes;
+    },
+    refreshTable() {
+      this.$refs.testCaseList.initTableData();
+    },
+    editTestCase(testCase) {
+      this.testCaseReadOnly = false;
+      if (this.treeNodes.length < 1) {
+        this.$warning(this.$t('test_track.case.create_module_first'));
+        return;
+      }
+      this.$refs.testCaseEditDialog.open(testCase);
+    },
+    copyTestCase(testCase) {
+      this.testCaseReadOnly = false;
+      let item = {};
+      Object.assign(item, testCase);
+      item.name = '';
+      item.isCopy = true;
+      this.$refs.testCaseEditDialog.open(item);
+    },
+    showTestCaseDetail(testCase) {
+      this.testCaseReadOnly = true;
+      this.$refs.testCaseEditDialog.open(testCase);
+    },
+    getProjectByCaseId(caseId) {
+      return this.$get('/test/case/project/' + caseId, async response => {
+        this.setCurrentProject(response.data);
+      });
+    },
+    refresh() {
+      this.selectNodeIds = [];
+      this.selectParentNodes = [];
+      this.selectNode = {};
+      this.$refs.testCaseList.initTableData();
+      this.getNodeTree();
+    },
+    openRecentTestCaseEditDialog(caseId) {
+      if (caseId) {
+        this.getProjectByCaseId(caseId);
+        this.$get('/test/case/get/' + caseId, response => {
+          if (response.data) {
+            this.$refs.testCaseEditDialog.open(response.data);
+          }
+        });
+      } else {
+        this.$refs.testCaseEditDialog.open();
+      }
+    },
+    getProjectById(id) {
+      if (id && id != 'all') {
+        this.$get('/project/get/' + id, response => {
+          let project = response.data;
+          this.setCurrentProject(project);
+          // this.$router.push('/track/case/all');
+        });
+      }
+      if (id === 'all') {
+        this.refresh();
+      }
+    },
+    setCurrentProject(project) {
+      if (project) {
+        this.currentProject = project;
+        localStorage.setItem(CURRENT_PROJECT, JSON.stringify(project));
+      }
+      this.refresh();
+    },
+    getNodeTree() {
+      if (!hasRoles(ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
+        this.nodeTreeDraggable = false;
+      }
+      if (this.currentProject) {
+        this.result = this.$get("/case/node/list/" + this.currentProject.id, response => {
+          this.treeNodes = response.data;
+        });
+      }
+    },
+    moveToNode(selectIds) {
+      if (selectIds.size < 1) {
+        this.$warning(this.$t('test_track.plan_view.select_manipulate'));
+        return;
+      }
+      this.$refs.testCaseEditDialog.getModuleOptions();
+      this.$refs.testCaseMove.open(this.$refs.testCaseEditDialog.moduleOptions, selectIds);
+    },
+    batchMove(selectIds) {
+      this.$refs.testBatchMove.open(this.treeNodes, selectIds, this.$refs.testCaseEditDialog.moduleOptions);
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .el-main {
-    padding: 15px;
-  }
+.el-main {
+  padding: 15px;
+}
 
 </style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseDetail.vue b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
index cbc3742ee1..3fad9f2c17 100644
--- a/frontend/src/business/components/track/case/components/TestCaseDetail.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
@@ -161,6 +161,7 @@ export default {
   data() {
     return {
       result: {},
+      testCase: {},
       dialogFormVisible: false,
       readOnly: true,
       form: {
@@ -190,9 +191,15 @@ export default {
       ]
     };
   },
+  mounted() {
+    this.$get('test/case/get/' + this.testCaseId, response => {
+      this.testCase = response.data;
+    });
+  },
+  methods: {},
   props: {
-    testCase: {
-      type: Object
+    testCaseId: {
+      type: String
     }
   },
 }
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 3a186c0287..1b4a005605 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -256,9 +256,9 @@
 
 <script>
 
-import {TokenKey, WORKSPACE_ID} from '../../../../../common/js/constants';
+import {TokenKey, WORKSPACE_ID} from '@/common/js/constants';
 import MsDialogFooter from '../../../common/components/MsDialogFooter'
-import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {Message} from "element-ui";
 import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index f7b5d998e2..619243e6ef 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -35,6 +35,7 @@
         @filter-change="filter"
         @select-all="handleSelectAll"
         @select="handleSelectionChange"
+        @cell-mouse-enter="showPopover"
         row-key="id"
         class="test-content adjust-table">
         <el-table-column
@@ -65,7 +66,7 @@
               width="60%"
               trigger="hover"
             >
-              <test-case-detail :test-case="scope.row"/>
+              <test-case-detail v-if="currentCaseId === scope.row.id" :test-case-id="currentCaseId"/>
               <span slot="reference">{{ scope.row.name }}</span>
             </el-popover>
           </template>
@@ -166,11 +167,11 @@ import MethodTableItem from "../../common/tableItems/planview/MethodTableItem";
 import MsTableOperator from "../../../common/components/MsTableOperator";
 import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
 import MsTableButton from "../../../common/components/MsTableButton";
-import {_filter, _sort} from "../../../../../common/js/utils";
+import {_filter, _sort} from "@/common/js/utils";
 import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-components";
 import ShowMoreBtn from "./ShowMoreBtn";
 import BatchEdit from "./BatchEdit";
-import {WORKSPACE_ID} from "../../../../../common/js/constants";
+import {WORKSPACE_ID} from "@/common/js/constants";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
 import TestCaseDetail from "./TestCaseDetail";
@@ -187,329 +188,342 @@ export default {
     PriorityTableItem,
     MsCreateBox,
     TestCaseImport,
-      TestCaseExport,
-      MsTablePagination,
-      NodeBreadcrumb,
-      MsTableHeader,
-      ShowMoreBtn,
-      BatchEdit,
-      StatusTableItem,
-      TestCaseDetail,
-      ReviewStatus
-    },
-    data() {
-      return {
-        result: {},
-        deletePath: "/test/case/delete",
-        condition: {
-          components: TEST_CASE_CONFIGS
-        },
-        tableData: [],
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        selectRows: new Set(),
-        priorityFilters: [
-          {text: 'P0', value: 'P0'},
-          {text: 'P1', value: 'P1'},
-          {text: 'P2', value: 'P2'},
-          {text: 'P3', value: 'P3'}
-        ],
-        methodFilters: [
-          {text: this.$t('test_track.case.manual'), value: 'manual'},
-          {text: this.$t('test_track.case.auto'), value: 'auto'}
-        ],
-        typeFilters: [
-          {text: this.$t('commons.functional'), value: 'functional'},
-          {text: this.$t('commons.performance'), value: 'performance'},
-          {text: this.$t('commons.api'), value: 'api'}
-        ],
-        statusFilters: [
-          {text: this.$t('test_track.case.status_prepare'), value: 'Prepare'},
-          {text: this.$t('test_track.case.status_pass'), value: 'Pass'},
-          {text: this.$t('test_track.case.status_un_pass'), value: 'UnPass'},
-        ],
-        showMore: false,
-        buttons: [
-          {
-            name: this.$t('test_track.case.batch_edit_case'), handleClick: this.handleBatchEdit
-          }, {
-            name: this.$t('test_track.case.batch_move_case'), handleClick: this.handleBatchMove
-          }, {
-            name: this.$t('test_track.case.batch_delete_case'), handleClick: this.handleDeleteBatch
-          }
-        ],
-        typeArr: [
-          {id: 'priority', name: this.$t('test_track.case.priority')},
-          {id: 'type', name: this.$t('test_track.case.type')},
-          {id: 'method', name: this.$t('test_track.case.method')},
-          {id: 'maintainer', name: this.$t('test_track.case.maintainer')},
-        ],
-        valueArr: {
-          priority: [
-            {name: 'P0', id: 'P0'},
-            {name: 'P1', id: 'P1'},
-            {name: 'P2', id: 'P2'},
-            {name: 'P3', id: 'P3'}
-          ],
-          type: [
-            {name: this.$t('commons.functional'), id: 'functional'},
-            {name: this.$t('commons.performance'), id: 'performance'},
-            {name: this.$t('commons.api'), id: 'api'}
-          ],
-          method: [
-            {name: this.$t('test_track.case.manual'), id: 'manual'},
-            {name: this.$t('test_track.case.auto'), id: 'auto'}
-          ],
-          maintainer: [],
+    TestCaseExport,
+    MsTablePagination,
+    NodeBreadcrumb,
+    MsTableHeader,
+    ShowMoreBtn,
+    BatchEdit,
+    StatusTableItem,
+    TestCaseDetail,
+    ReviewStatus
+  },
+  data() {
+    return {
+      result: {},
+      deletePath: "/test/case/delete",
+      condition: {
+        components: TEST_CASE_CONFIGS
+      },
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      selectRows: new Set(),
+      priorityFilters: [
+        {text: 'P0', value: 'P0'},
+        {text: 'P1', value: 'P1'},
+        {text: 'P2', value: 'P2'},
+        {text: 'P3', value: 'P3'}
+      ],
+      methodFilters: [
+        {text: this.$t('test_track.case.manual'), value: 'manual'},
+        {text: this.$t('test_track.case.auto'), value: 'auto'}
+      ],
+      typeFilters: [
+        {text: this.$t('commons.functional'), value: 'functional'},
+        {text: this.$t('commons.performance'), value: 'performance'},
+        {text: this.$t('commons.api'), value: 'api'}
+      ],
+      statusFilters: [
+        {text: this.$t('test_track.case.status_prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.case.status_pass'), value: 'Pass'},
+        {text: this.$t('test_track.case.status_un_pass'), value: 'UnPass'},
+      ],
+      showMore: false,
+      buttons: [
+        {
+          name: this.$t('test_track.case.batch_edit_case'), handleClick: this.handleBatchEdit
+        }, {
+          name: this.$t('test_track.case.batch_move_case'), handleClick: this.handleBatchMove
+        }, {
+          name: this.$t('test_track.case.batch_delete_case'), handleClick: this.handleDeleteBatch
         }
-      }
-    },
-    props: {
-      currentProject: {
-        type: Object
+      ],
+      typeArr: [
+        {id: 'priority', name: this.$t('test_track.case.priority')},
+        {id: 'type', name: this.$t('test_track.case.type')},
+        {id: 'method', name: this.$t('test_track.case.method')},
+        {id: 'maintainer', name: this.$t('test_track.case.maintainer')},
+      ],
+      valueArr: {
+        priority: [
+          {name: 'P0', id: 'P0'},
+          {name: 'P1', id: 'P1'},
+          {name: 'P2', id: 'P2'},
+          {name: 'P3', id: 'P3'}
+        ],
+        type: [
+          {name: this.$t('commons.functional'), id: 'functional'},
+          {name: this.$t('commons.performance'), id: 'performance'},
+          {name: this.$t('commons.api'), id: 'api'}
+        ],
+        method: [
+          {name: this.$t('test_track.case.manual'), id: 'manual'},
+          {name: this.$t('test_track.case.auto'), id: 'auto'}
+        ],
+        maintainer: [],
       },
-      selectNodeIds: {
-        type: Array
-      },
-      selectParentNodes: {
-        type: Array
-      }
+      currentCaseId: null
+    }
+  },
+  props: {
+    currentProject: {
+      type: Object
     },
-    created: function () {
+    selectNodeIds: {
+      type: Array
+    },
+    selectParentNodes: {
+      type: Array
+    }
+  },
+  created: function () {
+    this.initTableData();
+  },
+  watch: {
+    currentProject() {
       this.initTableData();
     },
-    watch: {
-      currentProject() {
-        this.initTableData();
-      },
-      selectNodeIds() {
-        this.currentPage = 1;
-        this.initTableData();
+    selectNodeIds() {
+      this.currentPage = 1;
+      this.initTableData();
+    }
+  },
+  methods: {
+    initTableData() {
+      if (this.planId) {
+        // param.planId = this.planId;
+        this.condition.planId = this.planId;
+      }
+      if (this.selectNodeIds && this.selectNodeIds.length > 0) {
+        // param.nodeIds = this.selectNodeIds;
+        this.condition.nodeIds = this.selectNodeIds;
+      }
+      if (this.currentProject) {
+        this.condition.projectId = this.currentProject.id;
+        this.result = this.$post(this.buildPagePath('/test/case/list'), this.condition, response => {
+          let data = response.data;
+          this.total = data.itemCount;
+          this.tableData = data.listObject;
+          // this.selectIds.clear();
+          this.selectRows.clear();
+        });
       }
     },
-    methods: {
-      initTableData() {
-        if (this.planId) {
-          // param.planId = this.planId;
-          this.condition.planId = this.planId;
-        }
-        if (this.selectNodeIds && this.selectNodeIds.length > 0) {
-          // param.nodeIds = this.selectNodeIds;
-          this.condition.nodeIds = this.selectNodeIds;
-        }
-        if (this.currentProject) {
-          this.condition.projectId = this.currentProject.id;
-          this.result = this.$post(this.buildPagePath('/test/case/list'), this.condition, response => {
-            let data = response.data;
-            this.total = data.itemCount;
-            this.tableData = data.listObject;
-            // this.selectIds.clear();
-            this.selectRows.clear();
-          });
-        }
-      },
-      search() {
-        this.initTableData();
-      },
-      buildPagePath(path) {
-        return path + "/" + this.currentPage + "/" + this.pageSize;
-      },
-      testCaseCreate() {
-        this.$emit('testCaseEdit');
-      },
-      handleEdit(testCase) {
+    search() {
+      this.initTableData();
+    },
+    buildPagePath(path) {
+      return path + "/" + this.currentPage + "/" + this.pageSize;
+    },
+    testCaseCreate() {
+      this.$emit('testCaseEdit');
+    },
+    handleEdit(testCase) {
+      this.$get('test/case/get/' + testCase.id, response => {
+        let testCase = response.data;
         this.$emit('testCaseEdit', testCase);
-      },
-      handleCopy(testCase) {
+      });
+    },
+    handleCopy(testCase) {
+      this.$get('test/case/get/' + testCase.id, response => {
+        let testCase = response.data;
         this.$emit('testCaseCopy', testCase);
-      },
-      handleDelete(testCase) {
-        this.$alert(this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'' + "？", '', {
-          confirmButtonText: this.$t('commons.confirm'),
-          callback: (action) => {
-            if (action === 'confirm') {
-              this._handleDelete(testCase);
-            }
+      });
+    },
+    handleDelete(testCase) {
+      this.$alert(this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'' + "？", '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        callback: (action) => {
+          if (action === 'confirm') {
+            this._handleDelete(testCase);
           }
-        });
-      },
-      handleDeleteBatch() {
-        this.$alert(this.$t('test_track.case.delete_confirm') + "？", '', {
-          confirmButtonText: this.$t('commons.confirm'),
-          callback: (action) => {
-            if (action === 'confirm') {
-              let ids = Array.from(this.selectRows).map(row => row.id);
-              this.$post('/test/case/batch/delete', {ids: ids}, () => {
-                this.selectRows.clear();
-                this.$emit("refresh");
-                this.$success(this.$t('commons.delete_success'));
-                // 发送广播，刷新 head 上的最新列表
-                TrackEvent.$emit(LIST_CHANGE);
-              });
-            }
+        }
+      });
+    },
+    handleDeleteBatch() {
+      this.$alert(this.$t('test_track.case.delete_confirm') + "？", '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        callback: (action) => {
+          if (action === 'confirm') {
+            let ids = Array.from(this.selectRows).map(row => row.id);
+            this.$post('/test/case/batch/delete', {ids: ids}, () => {
+              this.selectRows.clear();
+              this.$emit("refresh");
+              this.$success(this.$t('commons.delete_success'));
+              // 发送广播，刷新 head 上的最新列表
+              TrackEvent.$emit(LIST_CHANGE);
+            });
           }
+        }
+      });
+    },
+    _handleDelete(testCase) {
+      let testCaseId = testCase.id;
+      this.$post('/test/case/delete/' + testCaseId, {}, () => {
+        this.initTableData();
+        this.$success(this.$t('commons.delete_success'));
+        // 发送广播，刷新 head 上的最新列表
+        TrackEvent.$emit(LIST_CHANGE);
+      });
+    },
+    refresh() {
+      this.condition = {components: TEST_CASE_CONFIGS};
+      // this.selectIds.clear();
+      this.selectRows.clear();
+      this.$emit('refresh');
+    },
+    showDetail(row, event, column) {
+      this.$emit('testCaseDetail', row);
+    },
+    handleSelectAll(selection) {
+      if (selection.length > 0) {
+        this.tableData.forEach(item => {
+          this.$set(item, "showMore", true);
+          this.selectRows.add(item);
         });
-      },
-      _handleDelete(testCase) {
-        let testCaseId = testCase.id;
-        this.$post('/test/case/delete/' + testCaseId, {}, () => {
-          this.initTableData();
-          this.$success(this.$t('commons.delete_success'));
-          // 发送广播，刷新 head 上的最新列表
-          TrackEvent.$emit(LIST_CHANGE);
-        });
-      },
-      refresh() {
-        this.condition = {components: TEST_CASE_CONFIGS};
-        // this.selectIds.clear();
+      } else {
         this.selectRows.clear();
-        this.$emit('refresh');
-      },
-      showDetail(row, event, column) {
-        this.$emit('testCaseDetail', row);
-      },
-      handleSelectAll(selection) {
-        if (selection.length > 0) {
-          this.tableData.forEach(item => {
-            this.$set(item, "showMore", true);
-            this.selectRows.add(item);
-          });
-        } else {
-          this.selectRows.clear();
-          this.tableData.forEach(row => {
-            this.$set(row, "showMore", false);
-          })
-        }
-      },
-      handleSelectionChange(selection, row) {
-        if (this.selectRows.has(row)) {
+        this.tableData.forEach(row => {
           this.$set(row, "showMore", false);
-          this.selectRows.delete(row);
+        })
+      }
+    },
+    handleSelectionChange(selection, row) {
+      if (this.selectRows.has(row)) {
+        this.$set(row, "showMore", false);
+        this.selectRows.delete(row);
+      } else {
+        this.$set(row, "showMore", true);
+        this.selectRows.add(row);
+      }
+    },
+    importTestCase() {
+      this.$refs.testCaseImport.open();
+    },
+    exportTestCase() {
+      let ids = Array.from(this.selectRows).map(row => row.id);
+      let config = {
+        url: '/test/case/export/testcase',
+        method: 'post',
+        responseType: 'blob',
+        // data: {ids: [...this.selectIds]}
+        data: {ids: ids, projectId: this.currentProject.id}
+      };
+      this.result = this.$request(config).then(response => {
+        const filename = this.$t('test_track.case.test_case') + ".xlsx";
+        const blob = new Blob([response.data]);
+        if ("download" in document.createElement("a")) {
+          let aTag = document.createElement('a');
+          aTag.download = filename;
+          aTag.href = URL.createObjectURL(blob);
+          aTag.click();
+          URL.revokeObjectURL(aTag.href)
         } else {
-          this.$set(row, "showMore", true);
-          this.selectRows.add(row);
+          navigator.msSaveBlob(blob, filename);
         }
-      },
-      importTestCase() {
-        this.$refs.testCaseImport.open();
-      },
-      exportTestCase() {
-        let ids = Array.from(this.selectRows).map(row => row.id);
-        let config = {
-          url: '/test/case/export/testcase',
-          method: 'post',
-          responseType: 'blob',
-          // data: {ids: [...this.selectIds]}
-          data: {ids: ids, projectId: this.currentProject.id}
-        };
-        this.result = this.$request(config).then(response => {
-          const filename = this.$t('test_track.case.test_case') + ".xlsx";
-          const blob = new Blob([response.data]);
-          if ("download" in document.createElement("a")) {
-            let aTag = document.createElement('a');
-            aTag.download = filename;
-            aTag.href = URL.createObjectURL(blob);
-            aTag.click();
-            URL.revokeObjectURL(aTag.href)
-          } else {
-            navigator.msSaveBlob(blob, filename);
-          }
-        });
-      },
-      handleBatch(type) {
+      });
+    },
+    handleBatch(type) {
 
-        if (this.selectRows.size < 1) {
-          if (type === 'export') {
-            this.$alert(this.$t('test_track.case.export_all_cases'), '', {
-              confirmButtonText: this.$t('commons.confirm'),
-              callback: (action) => {
-                if (action === 'confirm') {
-                  this.exportTestCase();
-                }
+      if (this.selectRows.size < 1) {
+        if (type === 'export') {
+          this.$alert(this.$t('test_track.case.export_all_cases'), '', {
+            confirmButtonText: this.$t('commons.confirm'),
+            callback: (action) => {
+              if (action === 'confirm') {
+                this.exportTestCase();
               }
-            })
-            return;
-          } else {
-            this.$warning(this.$t('test_track.plan_view.select_manipulate'));
-            return;
-          }
-        }
-        if (type === 'move') {
-          let ids = Array.from(this.selectRows).map(row => row.id);
-          this.$emit('moveToNode', ids);
-        } else if (type === 'delete') {
-          this.handleDeleteBatch();
+            }
+          })
+          return;
         } else {
-          this.exportTestCase();
+          this.$warning(this.$t('test_track.plan_view.select_manipulate'));
+          return;
         }
-      },
-      batchEdit(form) {
-        let arr = Array.from(this.selectRows);
-        let ids = arr.map(row => row.id);
-        let param = {};
-        param[form.type] = form.value;
-        param.ids = ids;
-        this.$post('/test/case/batch/edit', param, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.refresh();
-          // 发送广播，刷新 head 上的最新列表
-          TrackEvent.$emit(LIST_CHANGE);
-        });
-      },
-      filter(filters) {
-        _filter(filters, this.condition);
-        this.initTableData();
-      },
-      sort(column) {
-        // 每次只对一个字段排序
-        if (this.condition.orders) {
-          this.condition.orders = [];
-        }
-        _sort(column, this.condition);
-        this.initTableData();
-      },
-      handleBatchEdit() {
-        this.getMaintainerOptions();
-        this.$refs.batchEdit.open();
-      },
-      handleBatchMove() {
-        this.$emit("batchMove", Array.from(this.selectRows).map(row => row.id));
-      },
-      getMaintainerOptions() {
-        let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-          this.valueArr.maintainer = response.data;
-        });
+      }
+      if (type === 'move') {
+        let ids = Array.from(this.selectRows).map(row => row.id);
+        this.$emit('moveToNode', ids);
+      } else if (type === 'delete') {
+        this.handleDeleteBatch();
+      } else {
+        this.exportTestCase();
+      }
+    },
+    batchEdit(form) {
+      let arr = Array.from(this.selectRows);
+      let ids = arr.map(row => row.id);
+      let param = {};
+      param[form.type] = form.value;
+      param.ids = ids;
+      this.$post('/test/case/batch/edit', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.refresh();
+        // 发送广播，刷新 head 上的最新列表
+        TrackEvent.$emit(LIST_CHANGE);
+      });
+    },
+    filter(filters) {
+      _filter(filters, this.condition);
+      this.initTableData();
+    },
+    sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
+      _sort(column, this.condition);
+      this.initTableData();
+    },
+    handleBatchEdit() {
+      this.getMaintainerOptions();
+      this.$refs.batchEdit.open();
+    },
+    handleBatchMove() {
+      this.$emit("batchMove", Array.from(this.selectRows).map(row => row.id));
+    },
+    getMaintainerOptions() {
+      let workspaceId = localStorage.getItem(WORKSPACE_ID);
+      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.valueArr.maintainer = response.data;
+      });
+    },
+    showPopover(row, column, cell) {
+      if (column.property === 'name') {
+        console.log(row, column);
+        this.currentCaseId = row.id;
       }
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
+.table-page {
+  padding-top: 20px;
+  margin-right: -9px;
+  float: right;
+}
 
-  .operate-button {
-    float: right;
-  }
+.operate-button {
+  float: right;
+}
 
-  .operate-button > div {
-    display: inline-block;
-    margin-left: 10px;
-  }
+.operate-button > div {
+  display: inline-block;
+  margin-left: 10px;
+}
 
-  .search {
-    margin-left: 10px;
-    width: 240px;
-  }
+.search {
+  margin-left: 10px;
+  width: 240px;
+}
 
-  .el-table {
-    cursor: pointer;
-  }
+.el-table {
+  cursor: pointer;
+}
 
 </style>

From a1b37a3c5375d149bb6638bd33862b53bd8b8b41 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 24 Nov 2020 10:50:03 +0800
Subject: [PATCH 02/52] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E6=AF=8F=E9=A1=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                 | 2 +-
 .../components/track/case/components/TestCaseList.vue      | 7 +++++++
 frontend/src/business/components/xpack                     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 57d6f78efa..419c75bca6 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
+Subproject commit 419c75bca64b7c5bfbd1194d7f0fd9919f0caa04
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index c2fc825b9c..2475415a15 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -300,6 +300,9 @@ export default {
         // param.nodeIds = this.selectNodeIds;
         this.condition.nodeIds = this.selectNodeIds;
       }
+      this.getData();
+    },
+    getData() {
       if (this.currentProject) {
         this.condition.projectId = this.currentProject.id;
         this.result = this.$post(this.buildPagePath('/test/case/list'), this.condition, response => {
@@ -374,6 +377,10 @@ export default {
       this.selectRows.clear();
       this.$emit('refresh');
     },
+    showAll() {
+      this.condition = {components: TEST_CASE_CONFIGS};
+      this.getData();
+    },
     showDetail(row, event, column) {
       this.$emit('testCaseDetail', row);
     },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 71d57ae5d7..33bbdb3f52 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 71d57ae5d7f8bb5c93a29504ac6f2300dc189ce9
+Subproject commit 33bbdb3f528c914bf333b2c1839dd6d3bbd9b569

From 7be21db324b6a8b66fcf4cc62118e1617670a4b0 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 24 Nov 2020 13:28:55 +0800
Subject: [PATCH 03/52] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E7=BA=BF=E7=A8=8B=E6=95=B0=E4=B8=8D=E8=83=BD=E5=B0=8F?=
 =?UTF-8?q?=E4=BA=8E=E8=B5=84=E6=BA=90=E6=B1=A0=E8=8A=82=E7=82=B9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TestResourcePoolController.java     |  4 ++--
 .../resourcepool/QueryResourcePoolRequest.java     |  1 +
 .../service/TestResourcePoolService.java           | 14 ++++++++------
 .../test/components/PerformancePressureConfig.vue  |  8 +++++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java b/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
index 48f461b56c..3088b617b8 100644
--- a/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
+++ b/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
@@ -53,13 +53,13 @@ public class TestResourcePoolController {
 
     @GetMapping("list/all/valid")
     @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
-    public List<TestResourcePool> listValidResourcePools() {
+    public List<TestResourcePoolDTO> listValidResourcePools() {
         return testResourcePoolService.listValidResourcePools();
     }
 
     @GetMapping("list/quota/valid")
     @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
-    public List<TestResourcePool> listValidQuotaResourcePools() {
+    public List<TestResourcePoolDTO> listValidQuotaResourcePools() {
         return testResourcePoolService.listValidQuotaResourcePools();
     }
 
diff --git a/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java b/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java
index 718622d243..cf00ed9e39 100644
--- a/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java
@@ -7,4 +7,5 @@ import lombok.Setter;
 @Setter
 public class QueryResourcePoolRequest {
     private String name;
+    private String status;
 }
diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
index 6f487a37dd..d43ae6759d 100644
--- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
+++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
@@ -145,6 +145,9 @@ public class TestResourcePoolService {
         if (StringUtils.isNotBlank(request.getName())) {
             criteria.andNameLike(StringUtils.wrapIfMissing(request.getName(), "%"));
         }
+        if (StringUtils.isNotBlank(request.getStatus())) {
+            criteria.andStatusEqualTo(request.getStatus());
+        }
         example.setOrderByClause("update_time desc");
         List<TestResourcePool> testResourcePools = testResourcePoolMapper.selectByExample(example);
         List<TestResourcePoolDTO> testResourcePoolDTOS = new ArrayList<>();
@@ -232,7 +235,7 @@ public class TestResourcePoolService {
         return testResourcePoolMapper.selectByPrimaryKey(resourcePoolId);
     }
 
-    public List<TestResourcePool> listValidResourcePools() {
+    public List<TestResourcePoolDTO> listValidResourcePools() {
         QueryResourcePoolRequest request = new QueryResourcePoolRequest();
         List<TestResourcePoolDTO> testResourcePools = listResourcePools(request);
         // 重新校验 pool
@@ -249,16 +252,15 @@ public class TestResourcePoolService {
                 testResourcePoolMapper.updateByPrimaryKeySelective(pool);
             }
         }
-        TestResourcePoolExample example = new TestResourcePoolExample();
-        example.createCriteria().andStatusEqualTo(ResourceStatusEnum.VALID.name());
-        return testResourcePoolMapper.selectByExample(example);
+        request.setStatus(VALID.name());
+        return listResourcePools(request);
     }
 
-    public List<TestResourcePool> listValidQuotaResourcePools() {
+    public List<TestResourcePoolDTO> listValidQuotaResourcePools() {
         return filterQuota(listValidResourcePools());
     }
 
-    private List<TestResourcePool> filterQuota(List<TestResourcePool> list) {
+    private List<TestResourcePoolDTO> filterQuota(List<TestResourcePoolDTO> list) {
         QuotaService quotaService = CommonBeanFactory.getBean(QuotaService.class);
         if (quotaService != null) {
             Set<String> pools = quotaService.getQuotaResourcePools();
diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index d94e02c8dc..7d51c4f387 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -30,7 +30,7 @@
                   :placeholder="$t('load_test.input_thread_num')"
                   v-model="threadGroup.threadNumber"
                   @change="calculateChart(threadGroup)"
-                  :min="1"
+                  :min="resourcePoolResourceLength"
                   size="mini"/>
               </el-form-item>
               <br>
@@ -141,6 +141,7 @@ export default {
       activeNames: ["0"],
       threadGroups: [],
       serializeThreadgroups: false,
+      resourcePoolResourceLength: 1
     }
   },
   mounted() {
@@ -368,6 +369,11 @@ export default {
       if (handler.rampUpTime < handler.step) {
         handler.step = handler.rampUpTime;
       }
+      // 线程数不能小于资源池节点的数量
+      let resourcePool = this.resourcePools.filter(v => v.id === this.resourcePool)[0];
+      if (resourcePool) {
+        this.resourcePoolResourceLength = resourcePool.resources.length;
+      }
       handler.options = {
         xAxis: {
           type: 'category',

From 848a9481f8a925d8091a760c4418202733574f76 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 24 Nov 2020 13:28:55 +0800
Subject: [PATCH 04/52] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E7=BA=BF=E7=A8=8B=E6=95=B0=E4=B8=8D=E8=83=BD=E5=B0=8F?=
 =?UTF-8?q?=E4=BA=8E=E8=B5=84=E6=BA=90=E6=B1=A0=E8=8A=82=E7=82=B9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TestResourcePoolController.java     |  4 ++--
 .../resourcepool/QueryResourcePoolRequest.java     |  1 +
 .../service/TestResourcePoolService.java           | 14 ++++++++------
 .../test/components/PerformancePressureConfig.vue  |  8 +++++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java b/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
index 48f461b56c..3088b617b8 100644
--- a/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
+++ b/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
@@ -53,13 +53,13 @@ public class TestResourcePoolController {
 
     @GetMapping("list/all/valid")
     @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
-    public List<TestResourcePool> listValidResourcePools() {
+    public List<TestResourcePoolDTO> listValidResourcePools() {
         return testResourcePoolService.listValidResourcePools();
     }
 
     @GetMapping("list/quota/valid")
     @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
-    public List<TestResourcePool> listValidQuotaResourcePools() {
+    public List<TestResourcePoolDTO> listValidQuotaResourcePools() {
         return testResourcePoolService.listValidQuotaResourcePools();
     }
 
diff --git a/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java b/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java
index 718622d243..cf00ed9e39 100644
--- a/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/resourcepool/QueryResourcePoolRequest.java
@@ -7,4 +7,5 @@ import lombok.Setter;
 @Setter
 public class QueryResourcePoolRequest {
     private String name;
+    private String status;
 }
diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
index 6f487a37dd..d43ae6759d 100644
--- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
+++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
@@ -145,6 +145,9 @@ public class TestResourcePoolService {
         if (StringUtils.isNotBlank(request.getName())) {
             criteria.andNameLike(StringUtils.wrapIfMissing(request.getName(), "%"));
         }
+        if (StringUtils.isNotBlank(request.getStatus())) {
+            criteria.andStatusEqualTo(request.getStatus());
+        }
         example.setOrderByClause("update_time desc");
         List<TestResourcePool> testResourcePools = testResourcePoolMapper.selectByExample(example);
         List<TestResourcePoolDTO> testResourcePoolDTOS = new ArrayList<>();
@@ -232,7 +235,7 @@ public class TestResourcePoolService {
         return testResourcePoolMapper.selectByPrimaryKey(resourcePoolId);
     }
 
-    public List<TestResourcePool> listValidResourcePools() {
+    public List<TestResourcePoolDTO> listValidResourcePools() {
         QueryResourcePoolRequest request = new QueryResourcePoolRequest();
         List<TestResourcePoolDTO> testResourcePools = listResourcePools(request);
         // 重新校验 pool
@@ -249,16 +252,15 @@ public class TestResourcePoolService {
                 testResourcePoolMapper.updateByPrimaryKeySelective(pool);
             }
         }
-        TestResourcePoolExample example = new TestResourcePoolExample();
-        example.createCriteria().andStatusEqualTo(ResourceStatusEnum.VALID.name());
-        return testResourcePoolMapper.selectByExample(example);
+        request.setStatus(VALID.name());
+        return listResourcePools(request);
     }
 
-    public List<TestResourcePool> listValidQuotaResourcePools() {
+    public List<TestResourcePoolDTO> listValidQuotaResourcePools() {
         return filterQuota(listValidResourcePools());
     }
 
-    private List<TestResourcePool> filterQuota(List<TestResourcePool> list) {
+    private List<TestResourcePoolDTO> filterQuota(List<TestResourcePoolDTO> list) {
         QuotaService quotaService = CommonBeanFactory.getBean(QuotaService.class);
         if (quotaService != null) {
             Set<String> pools = quotaService.getQuotaResourcePools();
diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index d94e02c8dc..7d51c4f387 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -30,7 +30,7 @@
                   :placeholder="$t('load_test.input_thread_num')"
                   v-model="threadGroup.threadNumber"
                   @change="calculateChart(threadGroup)"
-                  :min="1"
+                  :min="resourcePoolResourceLength"
                   size="mini"/>
               </el-form-item>
               <br>
@@ -141,6 +141,7 @@ export default {
       activeNames: ["0"],
       threadGroups: [],
       serializeThreadgroups: false,
+      resourcePoolResourceLength: 1
     }
   },
   mounted() {
@@ -368,6 +369,11 @@ export default {
       if (handler.rampUpTime < handler.step) {
         handler.step = handler.rampUpTime;
       }
+      // 线程数不能小于资源池节点的数量
+      let resourcePool = this.resourcePools.filter(v => v.id === this.resourcePool)[0];
+      if (resourcePool) {
+        this.resourcePoolResourceLength = resourcePool.resources.length;
+      }
       handler.options = {
         xAxis: {
           type: 'category',

From 6bdb76d7193f898e02753bba1b1a10cea5b5ad2d Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 24 Nov 2020 13:32:03 +0800
Subject: [PATCH 05/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/jmeter/APIBackendListenerClient.java | 9 +++++++--
 .../java/io/metersphere/api/jmeter/ScenarioResult.java   | 2 +-
 2 files changed, 8 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 d12ed264c4..eb66714e05 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -99,7 +99,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
 
         // 一个脚本里可能包含多个场景(ThreadGroup)，所以要区分开，key: 场景Id
         final Map<String, ScenarioResult> scenarios = new LinkedHashMap<>();
-        queue.forEach(result -> {
+            queue.forEach(result -> {
             // 线程名称: <场景名> <场景Index>-<请求Index>, 例如：Scenario 2-1
             String scenarioName = StringUtils.substringBeforeLast(result.getThreadName(), THREAD_SPLIT);
             String index = StringUtils.substringAfterLast(result.getThreadName(), THREAD_SPLIT);
@@ -107,7 +107,12 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
             ScenarioResult scenarioResult;
             if (!scenarios.containsKey(scenarioId)) {
                 scenarioResult = new ScenarioResult();
-                scenarioResult.setId(scenarioId);
+                try {
+                    scenarioResult.setId(Integer.parseInt(scenarioId));
+                } catch (Exception e) {
+                    scenarioResult.setId(0);
+                    LogUtil.error("场景ID转换异常: " + e.getMessage());
+                }
                 scenarioResult.setName(scenarioName);
                 scenarios.put(scenarioId, scenarioResult);
             } else {
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java b/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java
index 331b9b8ab1..33b06b957c 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java
@@ -8,7 +8,7 @@ import java.util.List;
 @Data
 public class ScenarioResult {
 
-    private String id;
+    private Integer id;
 
     private String name;
 

From de786f42f96a5baac1e30964e9fc0519fc7eb423 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 24 Nov 2020 14:35:19 +0800
Subject: [PATCH 06/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=97=B6=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=8F=90=E4=BA=A4=EF=BC=8C=E6=88=90=E5=8A=9F=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=A4=9A=E4=B8=AA=E7=9B=B8=E5=90=8C=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/service/TestPlanService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 ee5a113fbc..4aab152552 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -96,7 +96,7 @@ public class TestPlanService {
     @Resource
     UserMapper userMapper;
 
-    public void addTestPlan(AddTestPlanRequest testPlan) {
+    public synchronized void addTestPlan(AddTestPlanRequest testPlan) {
         if (getTestPlanByName(testPlan.getName()).size() > 0) {
             MSException.throwException(Translator.get("plan_name_already_exists"));
         }
@@ -141,7 +141,7 @@ public class TestPlanService {
         }
     }
 
-    public synchronized List<TestPlan> getTestPlanByName(String name) {
+    public List<TestPlan> getTestPlanByName(String name) {
         TestPlanExample example = new TestPlanExample();
         example.createCriteria().andWorkspaceIdEqualTo(SessionUtils.getCurrentWorkspaceId())
                 .andNameEqualTo(name);

From d02f5305382bc2e016947ee2eb20ffb6f4df0c52 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 24 Nov 2020 14:36:15 +0800
Subject: [PATCH 07/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E8=AF=B7=E6=B1=82=E4=BD=93=E5=8F=96=E6=B6=88=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../api/test/components/body/ApiBody.vue      |  2 +-
 .../common/components/MsCodeEdit.vue          | 38 ++++++++++++-------
 frontend/src/business/components/xpack        |  2 +-
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 419c75bca6..57d6f78efa 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 419c75bca64b7c5bfbd1194d7f0fd9919f0caa04
+Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
diff --git a/frontend/src/business/components/api/test/components/body/ApiBody.vue b/frontend/src/business/components/api/test/components/body/ApiBody.vue
index e8a0161a37..ce63d08e89 100644
--- a/frontend/src/business/components/api/test/components/body/ApiBody.vue
+++ b/frontend/src/business/components/api/test/components/body/ApiBody.vue
@@ -20,7 +20,7 @@
                      :description="$t('api_test.request.parameters_desc')"
                      v-if="body.isKV()"/>
     <div class="body-raw" v-if="body.type == 'Raw'">
-      <ms-code-edit :mode="body.format" :read-only="isReadOnly" :data.sync="body.raw" :modes="modes" ref="codeEdit"/>
+      <ms-code-edit :mode="body.format" :enable-format="false" :read-only="isReadOnly" :data.sync="body.raw" :modes="modes" ref="codeEdit"/>
     </div>
 
   </div>
diff --git a/frontend/src/business/components/common/components/MsCodeEdit.vue b/frontend/src/business/components/common/components/MsCodeEdit.vue
index afbe57255c..2f443ee120 100644
--- a/frontend/src/business/components/common/components/MsCodeEdit.vue
+++ b/frontend/src/business/components/common/components/MsCodeEdit.vue
@@ -28,6 +28,12 @@
         init: {
           type: Function
         },
+        enableFormat: {
+          type: Boolean,
+          default() {
+            return true;
+          }
+        },
         readOnly: {
           type: Boolean,
           default() {
@@ -74,20 +80,24 @@
           }
         },
         format() {
-          switch (this.mode) {
-            case 'json':
-              this.formatData = formatJson(this.data);
-              break;
-            case 'html':
-              this.formatData = toDiffableHtml(this.data);
-              break;
-            case 'xml':
-              this.formatData = formatXml(this.data);
-              break;
-            default:
-              if (this.data) {
-                this.formatData = this.data;
-              }
+          if (this.enableFormat) {
+            switch (this.mode) {
+              case 'json':
+                this.formatData = formatJson(this.data);
+                break;
+              case 'html':
+                this.formatData = toDiffableHtml(this.data);
+                break;
+              case 'xml':
+                this.formatData = formatXml(this.data);
+                break;
+              default:
+                if (this.data) {
+                  this.formatData = this.data;
+                }
+            }
+          } else {
+            this.formatData = this.data;
           }
         }
       }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 33bbdb3f52..71d57ae5d7 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 33bbdb3f528c914bf333b2c1839dd6d3bbd9b569
+Subproject commit 71d57ae5d7f8bb5c93a29504ac6f2300dc189ce9

From d3ceb8ff5f4ff13fb79341dac6d668bc44fde02a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 24 Nov 2020 15:48:34 +0800
Subject: [PATCH 08/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20jar=E5=8C=85=E6=8F=8F=E8=BF=B0=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh-CN.js | 2 +-
 frontend/src/i18n/zh-TW.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index fe6852309f..37f986f25c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -470,7 +470,7 @@ export default {
       title: "jar包管理",
       jar_file: "jar包",
       delete_tip: "删除需重启服务后生效",
-      file_exist: "该项目下已存在改jar包",
+      file_exist: "该项目下已存在该jar包",
       upload_limit_size: "上传文件大小不能超过 30MB!",
     },
     environment: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 8429bff9f6..3b96d205ea 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -472,7 +472,7 @@ export default {
       title: "jar包管理",
       jar_file: "jar包",
       delete_tip: "刪除需重啟服務後生效",
-      file_exist: "該項目下已存在改jar包",
+      file_exist: "該項目下已存在該jar包",
       upload_limit_size: "上傳文件大小不能超過 30MB!",
     },
     environment: {

From ed26d25ac75e9d0be4718e1f62ce401e92575334 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 24 Nov 2020 17:14:29 +0800
Subject: [PATCH 09/52] =?UTF-8?q?refacotr(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsDeleteConfirm.vue         | 15 +++++++++++++++
 .../track/plan/components/TestPlanList.vue        |  6 +++++-
 frontend/src/i18n/en-US.js                        |  1 +
 frontend/src/i18n/zh-CN.js                        |  1 +
 frontend/src/i18n/zh-TW.js                        |  1 +
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/common/components/MsDeleteConfirm.vue b/frontend/src/business/components/common/components/MsDeleteConfirm.vue
index 3bc4874816..0c083a332a 100644
--- a/frontend/src/business/components/common/components/MsDeleteConfirm.vue
+++ b/frontend/src/business/components/common/components/MsDeleteConfirm.vue
@@ -11,6 +11,11 @@
         <br/>
       </el-col>
     </el-row>
+    <el-row class="tip" v-if="withTip">
+      <span>
+       <slot class="tip"></slot>
+      </span>
+    </el-row>
     <el-row>
       <el-col :span="15">
         <el-input v-model="value" :placeholder="$t('commons.input_content')"/>
@@ -41,6 +46,12 @@
           default() {
             return this.$t('commons.title')
           }
+        },
+        withTip: {
+          type: Boolean,
+          default() {
+            return false
+          }
         }
       },
       methods: {
@@ -80,5 +91,9 @@
     font-weight: bold;
   }
 
+  .tip {
+    margin-bottom: 20px;
+    color: red;
+  }
 
 </style>
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 3f9d82821d..66763e9b36 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -137,7 +137,9 @@
 
     <test-report-template-list @openReport="openReport" ref="testReportTemplateList"/>
     <test-case-report-view @refresh="initTableData" ref="testCaseReportView"/>
-    <ms-delete-confirm :title="$t('test_track.plan.plan_delete')" @delete="_handleDelete" ref="deleteConfirm"/>
+    <ms-delete-confirm :title="$t('test_track.plan.plan_delete')" @delete="_handleDelete" ref="deleteConfirm" :with-tip="enableDeleteTip">
+      {{$t('test_track.plan.plan_delete_tip')}}
+    </ms-delete-confirm>
 
   </el-card>
 </template>
@@ -171,6 +173,7 @@ export default {
   data() {
     return {
       result: {},
+      enableDeleteTip: false,
       queryPath: "/test/plan/list",
       deletePath: "/test/plan/delete",
       condition: {
@@ -249,6 +252,7 @@ export default {
       });
     },
     handleDelete(testPlan) {
+      this.enableDeleteTip = testPlan.status === 'Underway' ? true : false;
       this.$refs.deleteConfirm.open(testPlan);
     },
     _handleDelete(testPlan) {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index df5d4e7636..bfc2f4a616 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -837,6 +837,7 @@ export default {
       actual_start_time: "Actual Start Time",
       actual_end_time: "Actual End Time",
       plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
+      plan_delete_tip: "The test plan is under way, please confirm and delete it!",
       plan_delete: "Delete test plan",
     },
     review: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 37f986f25c..f5994b2f9f 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -839,6 +839,7 @@ export default {
       actual_start_time: "实际开始",
       actual_end_time: "实际结束",
       plan_delete_confirm: "将删除该测试计划下所有用例，确认删除测试计划: ",
+      plan_delete_tip: "该测试计划正在进行中，请确认再删除！",
       plan_delete: "删除计划",
     },
     review: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 3b96d205ea..1c6d9722a9 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -840,6 +840,7 @@ export default {
       actual_start_time: "實際開始",
       actual_end_time: "實際結束",
       plan_delete_confirm: "將刪除該測試計劃下所有用例，確認刪除測試計劃: ",
+      plan_delete_tip: "該測試計劃正在進行中，請確認再刪除！",
       plan_delete: "刪除計劃",
     },
     review: {

From fa517ea34d569d85f02f3472ea4eff0eb5b56f3b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 24 Nov 2020 17:51:21 +0800
Subject: [PATCH 10/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20jsonpath=20=E6=8E=A8=E8=8D=90=E7=BC=BA=E5=B0=91=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/commons/utils/JsonPathUtils.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java b/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java
index d978056402..239c7c09a0 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java
@@ -48,10 +48,6 @@ public class JsonPathUtils {
             String o_json_path = "$" + jsonPath.next().replaceAll("/", ".");
             String value = JSONPath.eval(jsonObject, o_json_path).toString();
 
-            if(o_json_path.toLowerCase().contains("id")) {
-                continue;
-            }
-
             if(value.equals("") || value.equals("[]") || o_json_path.equals("")) {
                 continue;
             }

From a1aced743557d18dd8e126327f96a3b10d7de7a5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 24 Nov 2020 17:53:03 +0800
Subject: [PATCH 11/52] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/track/issue/ZentaoUtils.java  | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 backend/src/main/java/io/metersphere/track/issue/ZentaoUtils.java

diff --git a/backend/src/main/java/io/metersphere/track/issue/ZentaoUtils.java b/backend/src/main/java/io/metersphere/track/issue/ZentaoUtils.java
deleted file mode 100644
index fa34a39224..0000000000
--- a/backend/src/main/java/io/metersphere/track/issue/ZentaoUtils.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.metersphere.track.issue;
-
-import io.metersphere.commons.utils.EncryptUtils;
-
-public class ZentaoUtils {
-
-    /**
-     * @param code Zentao 应用代号
-     * @param key Zentao 密钥
-     * @return token
-     */
-    public static String getToken(String code, String key, String time) {
-        return (String) EncryptUtils.md5Encrypt(code + key + time);
-    }
-
-    /**
-     * @param url Zentao url
-     * @param code Zentao 应用代号
-     * @param key Zentao 密钥
-     * @return url
-     */
-    public static String getUrl(String url, String code, String key) {
-        String time = String.valueOf(System.currentTimeMillis());;
-        return url + "api.php?" + "code=" + code + "&time=" + time + "&token=" + getToken(code, key, time);
-    }
-}

From a9ff93841b1ecfdd791f0b5444faa052ba4c4b13 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 24 Nov 2020 18:04:59 +0800
Subject: [PATCH 12/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DMailService?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E9=9D=9ESSL=E7=9A=84SMTP=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=8D=E5=8A=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #768
---
 .../notice/service/MailService.java           | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java
index 0cc1c5e44e..e5e0261284 100644
--- a/backend/src/main/java/io/metersphere/notice/service/MailService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java
@@ -22,6 +22,7 @@ import io.metersphere.track.request.testreview.SaveTestCaseReviewRequest;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.mail.MailException;
@@ -340,13 +341,13 @@ public class MailService {
     }
 
 
-
-
     private JavaMailSenderImpl getMailSender() {
+        Properties props = new Properties();
         JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
         List<SystemParameter> paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue());
         javaMailSender.setDefaultEncoding("UTF-8");
-        javaMailSender.setProtocol("smtps");
+        javaMailSender.setProtocol("smtp");
+
         for (SystemParameter p : paramList) {
             switch (p.getParamKey()) {
                 case "smtp.host":
@@ -361,14 +362,24 @@ public class MailService {
                 case "smtp.password":
                     javaMailSender.setPassword(EncryptUtils.aesDecrypt(p.getParamValue()).toString());
                     break;
+                case "smtp.ssl":
+                    javaMailSender.setProtocol("smtps");
+                    if (BooleanUtils.toBoolean(p.getParamValue())) {
+                        props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+                    }
+                    break;
+                case "smtp.tls":
+                    String result = BooleanUtils.toString(BooleanUtils.toBoolean(p.getParamValue()), "true", "false");
+                    props.put("mail.smtp.starttls.enable", result);
+                    props.put("mail.smtp.starttls.required", result);
+                    break;
                 default:
                     break;
             }
         }
-        Properties props = new Properties();
+
         props.put("mail.smtp.auth", "true");
-        props.put("mail.smtp.starttls.enable", "true");
-        props.put("mail.smtp.starttls.required", "true");
+
         props.put("mail.smtp.timeout", "30000");
         props.put("mail.smtp.connectiontimeout", "5000");
         javaMailSender.setJavaMailProperties(props);

From 4a0c640aeecaf545a63ef468bb3a243801cc97e2 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 24 Nov 2020 18:33:22 +0800
Subject: [PATCH 13/52] =?UTF-8?q?refactor:=20=E9=82=AE=E4=BB=B6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8C=BF=E5=90=8D=E6=94=B9=E6=88=90=E5=85=8D=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/commons/constants/ParamConstants.java |  3 +--
 .../io/metersphere/notice/service/MailService.java    | 11 +++++++++--
 .../metersphere/service/SystemParameterService.java   |  9 ++++++++-
 .../components/settings/system/EmailSetting.vue       |  8 ++++----
 frontend/src/i18n/zh-CN.js                            |  2 +-
 frontend/src/i18n/zh-TW.js                            |  2 +-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java b/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java
index 430b703312..c775fc7889 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java
@@ -95,8 +95,7 @@ public interface ParamConstants {
         PASSWORD("smtp.password", 4),
         SSL("smtp.ssl", 5),
         TLS("smtp.tls", 6),
-        SMTP("smtp.smtp", 7);
-        /* ANON("smtp.anon", 7);*/
+        ANON("smtp.anon", 7);
 
         private String key;
         private Integer value;
diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java
index e5e0261284..22321658ce 100644
--- a/backend/src/main/java/io/metersphere/notice/service/MailService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java
@@ -347,6 +347,7 @@ public class MailService {
         List<SystemParameter> paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue());
         javaMailSender.setDefaultEncoding("UTF-8");
         javaMailSender.setProtocol("smtp");
+        props.put("mail.smtp.auth", "true");
 
         for (SystemParameter p : paramList) {
             switch (p.getParamKey()) {
@@ -373,13 +374,19 @@ public class MailService {
                     props.put("mail.smtp.starttls.enable", result);
                     props.put("mail.smtp.starttls.required", result);
                     break;
+                case "smtp.anon":
+                    boolean isAnon = BooleanUtils.toBoolean(p.getParamValue());
+                    if (isAnon) {
+                        props.put("mail.smtp.auth", "false");
+                        javaMailSender.setUsername(null);
+                        javaMailSender.setPassword(null);
+                    }
+                    break;
                 default:
                     break;
             }
         }
 
-        props.put("mail.smtp.auth", "true");
-
         props.put("mail.smtp.timeout", "30000");
         props.put("mail.smtp.connectiontimeout", "5000");
         javaMailSender.setJavaMailProperties(props);
diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 680a0886e0..255d6159ce 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -86,7 +86,14 @@ public class SystemParameterService {
         javaMailSender.setUsername(hashMap.get(ParamConstants.MAIL.ACCOUNT.getKey()));
         javaMailSender.setPassword(hashMap.get(ParamConstants.MAIL.PASSWORD.getKey()));
         Properties props = new Properties();
-        props.put("mail.smtp.auth", "true");
+        boolean isAnon = Boolean.parseBoolean(hashMap.get(ParamConstants.MAIL.ANON.getKey()));
+        if (isAnon) {
+            props.put("mail.smtp.auth", "false");
+            javaMailSender.setUsername(null);
+            javaMailSender.setPassword(null);
+        } else {
+            props.put("mail.smtp.auth", "true");
+        }
         if (BooleanUtils.toBoolean(hashMap.get(ParamConstants.MAIL.SSL.getKey()))) {
             props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
         }
diff --git a/frontend/src/business/components/settings/system/EmailSetting.vue b/frontend/src/business/components/settings/system/EmailSetting.vue
index 47d845993f..8de498081d 100644
--- a/frontend/src/business/components/settings/system/EmailSetting.vue
+++ b/frontend/src/business/components/settings/system/EmailSetting.vue
@@ -45,7 +45,7 @@
         <el-checkbox v-model="formInline.TLS" :label="$t('system_parameter_setting.TLS')"></el-checkbox>
       </div>
       <div style="border: 0px;margin-bottom: 20px">
-        <el-checkbox v-model="formInline.SMTP" :label="$t('system_parameter_setting.SMTP')"></el-checkbox>
+        <el-checkbox v-model="formInline.ANON" :label="$t('system_parameter_setting.SMTP')"></el-checkbox>
       </div>
       <template v-slot:footer>
       </template>
@@ -120,7 +120,7 @@ export default {
         this.$set(this.formInline, "password", response.data[3].paramValue);
         this.$set(this.formInline, "SSL", JSON.parse(response.data[4].paramValue));
         this.$set(this.formInline, "TLS", JSON.parse(response.data[5].paramValue));
-        this.$set(this.formInline, "SMTP", JSON.parse(response.data[6].paramValue));
+        this.$set(this.formInline, "ANON", JSON.parse(response.data[6].paramValue));
         this.$nextTick(() => {
           this.$refs.formInline.clearValidate();
         })
@@ -143,7 +143,7 @@ export default {
         "smtp.password": this.formInline.password,
         "smtp.ssl": this.formInline.SSL,
         "smtp.tls": this.formInline.TLS,
-        "smtp.smtp": this.formInline.SMTP,
+        "smtp.anon": this.formInline.ANON,
       };
       this.$refs[formInline].validate((valid) => {
         if (valid) {
@@ -173,7 +173,7 @@ export default {
         {paramKey: "smtp.password", paramValue: this.formInline.password, type: "password", sort: 4},
         {paramKey: "smtp.ssl", paramValue: this.formInline.SSL, type: "text", sort: 5},
         {paramKey: "smtp.tls", paramValue: this.formInline.TLS, type: "text", sort: 6},
-        {paramKey: "smtp.smtp", paramValue: this.formInline.SMTP, type: "text", sort: 7}
+        {paramKey: "smtp.anon", paramValue: this.formInline.ANON, type: "text", sort: 7}
       ]
 
       this.$refs[formInline].validate(valid => {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index d237a3a018..7bffa63843 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1005,7 +1005,7 @@ export default {
     SMTP_password: 'SMTP密码',
     SSL: '开启SSL(如果SMTP端口是465，通常需要启用SSL)',
     TLS: '开启TLS(如果SMTP端口是587，通常需要启用TLS)',
-    SMTP: '是否匿名 SMTP',
+    SMTP: '是否免密 SMTP',
     host: '主机号不能为空',
     port: '端口号不能为空',
     account: '账户不能为空',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 7b78e3a37b..989eecbb43 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1006,7 +1006,7 @@ export default {
     SMTP_password: 'SMTP密碼',
     SSL: '開啟SSL(如果SMTP端口是465，通常需要啟用SSL)',
     TLS: '開啟TLS(如果SMTP端口是587，通常需要啟用TLS)',
-    SMTP: '是否匿名 SMTP',
+    SMTP: '是否免密 SMTP',
     host: '主機號不能為空',
     port: '端口號不能為空',
     account: '賬戶不能為空',

From cbf889831b080473e788abc1f14af2bcd69f9750 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 24 Nov 2020 19:01:55 +0800
Subject: [PATCH 14/52] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/request/database/DatabaseFrom.vue     | 2 +-
 .../src/business/components/api/test/model/ScenarioModel.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue b/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue
index a6a179f034..deb09fbaa9 100644
--- a/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue
+++ b/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue
@@ -29,7 +29,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('api_test.request.sql.pool_max')" prop="poolMax">
-        <el-input-number size="small" :disabled="isReadOnly" v-model="currentConfig.poolMax" :placeholder="$t('commons.please_select')" :max="1000*10000000" :min="0"/>
+        <el-input-number size="small" :disabled="isReadOnly" v-model="currentConfig.poolMax" :placeholder="$t('commons.please_select')" :max="100" :min="0"/>
       </el-form-item>
 
 
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index d6a29fdf21..96d546833f 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -609,8 +609,8 @@ export class DatabaseConfig extends BaseConfig {
     super();
     this.id = undefined;
     this.name = undefined;
-    this.poolMax = undefined;
-    this.timeout = undefined;
+    this.poolMax = 1;
+    this.timeout = 100000;
     this.driver = undefined;
     this.dbUrl = undefined;
     this.username = undefined;

From fbf6b59425435ee72044ee2f064d2324991b52e4 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 24 Nov 2020 19:44:04 +0800
Subject: [PATCH 15/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B8=A6?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E7=9A=84=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/css/main.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 1f587bda9d..85ae6dcfd5 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -108,3 +108,11 @@ body {
   margin: 5px 0;
   border-radius: 5px;
 }
+
+/* 修复带长度限制的文本框，内容太长造成的无法查看内容的问题 */
+/*.el-input-padding-fix .el-input__inner {*/
+  /*padding-right: 60px ;*/
+/*}*/
+.el-input__inner[maxlength] {
+  padding-right: 60px ;
+}

From 18c810178a6e45d5ccd9df2355580f8030fe2544 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 25 Nov 2020 10:13:05 +0800
Subject: [PATCH 16/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=91=E9=80=81=EF=BC=8C=E6=97=B6=E9=97=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/service/MailService.java           | 28 ++++++++---
 .../track/service/TestCaseReviewService.java  | 50 +++++++++++--------
 .../track/service/TestPlanService.java        | 30 +++++++----
 .../main/resources/mail/ReviewComments.html   |  2 +-
 .../src/main/resources/mail/ReviewEnd.html    |  4 +-
 .../src/main/resources/mail/TestPlanEnd.html  |  4 +-
 6 files changed, 74 insertions(+), 44 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java
index 6abefde70d..bbfa83826f 100644
--- a/backend/src/main/java/io/metersphere/notice/service/MailService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java
@@ -2,10 +2,7 @@ package io.metersphere.notice.service;
 
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.UserMapper;
-import io.metersphere.commons.constants.APITestStatus;
-import io.metersphere.commons.constants.NoticeConstants;
-import io.metersphere.commons.constants.ParamConstants;
-import io.metersphere.commons.constants.PerformanceTestStatus;
+import io.metersphere.commons.constants.*;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.EncryptUtils;
 import io.metersphere.commons.utils.LogUtil;
@@ -321,6 +318,15 @@ public class MailService {
         context.put("start", start);
         context.put("end", end);
         context.put("id", reviewRequest.getId());
+        String status = "";
+        if (StringUtils.equals(TestPlanStatus.Underway.name(), reviewRequest.getStatus())) {
+            status = "进行中";
+        } else if (StringUtils.equals(TestPlanStatus.Prepare.name(), reviewRequest.getStatus())) {
+            status = "未开始";
+        } else if (StringUtils.equals(TestPlanStatus.Completed.name(), reviewRequest.getStatus())) {
+            status = "已完成";
+        }
+        context.put("status", status);
         return context;
     }
 
@@ -347,14 +353,21 @@ public class MailService {
         context.put("start", start);
         context.put("end", end);
         context.put("id", testPlan.getId());
+        String status = "";
+        if (StringUtils.equals(TestPlanStatus.Underway.name(), testPlan.getStatus())) {
+            status = "进行中";
+        } else if (StringUtils.equals(TestPlanStatus.Prepare.name(), testPlan.getStatus())) {
+            status = "未开始";
+        } else if (StringUtils.equals(TestPlanStatus.Completed.name(), testPlan.getStatus())) {
+            status = "已完成";
+        }
+        context.put("status", status);
         User user = userMapper.selectByPrimaryKey(testPlan.getCreator());
         context.put("creator", user.getName());
         return context;
     }
 
 
-
-
     private JavaMailSenderImpl getMailSender() {
         JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
         List<SystemParameter> paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue());
@@ -396,6 +409,7 @@ public class MailService {
                 } else {
                     template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", "未设置");
                 }
+
             }
         }
         return template;
@@ -405,7 +419,7 @@ public class MailService {
         List<String> addresseeIdList = new ArrayList<>();
         if (StringUtils.equals(eventType, messageDetail.getEvent())) {
             messageDetail.getUserIds().forEach(u -> {
-                if (!StringUtils.equals(NoticeConstants.EXECUTOR, u) && !StringUtils.equals(NoticeConstants.EXECUTOR, u) && !StringUtils.equals(NoticeConstants.MAINTAINER, u)) {
+                if (!StringUtils.equals(NoticeConstants.EXECUTOR, u) && !StringUtils.equals(NoticeConstants.FOUNDER, u) && !StringUtils.equals(NoticeConstants.MAINTAINER, u)) {
                     addresseeIdList.add(u);
                 }
                 if (StringUtils.equals(NoticeConstants.CREATE, eventType) && StringUtils.equals(NoticeConstants.EXECUTOR, u)) {
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 13d75cb5d7..a955e9c6c6 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -187,27 +187,25 @@ public class TestCaseReviewService {
         testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview);
         List<String> userIds = new ArrayList<>();
         userIds.addAll(testCaseReview.getUserIds());
-        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);
-            }
+        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.sendEndNotice(r, userIds, testCaseReview, NoticeConstants.UPDATE);
+                        break;
+                }
+            });
+        } catch (Exception e) {
+            LogUtil.error(e);
         }
 
     }
@@ -585,7 +583,15 @@ public class TestCaseReviewService {
         if (StringUtils.equals(NoticeConstants.CREATE, type)) {
             context = "测试评审任务通知：" + user.getName() + "发起的" + "'" + reviewRequest.getName() + "'" + "待开始，计划开始时间是" + start + "计划结束时间为" + end + "请跟进";
         } else if (StringUtils.equals(NoticeConstants.UPDATE, type)) {
-            context = "测试评审任务通知：" + user.getName() + "发起的" + "'" + reviewRequest.getName() + "'" + "已完成，计划开始时间是" + start + "计划结束时间为" + end + "已完成";
+            String status = "";
+            if (StringUtils.equals(TestPlanStatus.Underway.name(), reviewRequest.getStatus())) {
+                status = "进行中";
+            } else if (StringUtils.equals(TestPlanStatus.Prepare.name(), reviewRequest.getStatus())) {
+                status = "未开始";
+            } else if (StringUtils.equals(TestPlanStatus.Completed.name(), reviewRequest.getStatus())) {
+                status = "已完成";
+            }
+            context = "测试评审任务通知：" + user.getName() + "发起的" + "'" + reviewRequest.getName() + "'" + "计划开始时间是" + start + "计划结束时间为" + end + status;
         } else if (StringUtils.equals(NoticeConstants.DELETE, type)) {
             context = "测试评审任务通知：" + user.getName() + "发起的" + "'" + reviewRequest.getName() + "'" + "计划开始时间是" + start + "计划结束时间为" + end + "已删除";
         }
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 c6ab04e11b..853da23611 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -159,13 +159,16 @@ public class TestPlanService {
         //进行中状态，写入实际开始时间
         if (TestPlanStatus.Underway.name().equals(testPlan.getStatus())) {
             testPlan.setActualStartTime(System.currentTimeMillis());
-
         } else if (TestPlanStatus.Completed.name().equals(testPlan.getStatus())) {
-            List<String> userIds = new ArrayList<>();
-            userIds.add(testPlan.getPrincipal());
-            AddTestPlanRequest testPlans = new AddTestPlanRequest();
             //已完成，写入实际完成时间
             testPlan.setActualEndTime(System.currentTimeMillis());
+
+        }
+        List<String> userIds = new ArrayList<>();
+        userIds.add(testPlan.getPrincipal());
+        AddTestPlanRequest testPlans = new AddTestPlanRequest();
+        int i = testPlanMapper.updateByPrimaryKeySelective(testPlan);
+        if (!StringUtils.isBlank(testPlan.getStatus())) {
             try {
                 BeanUtils.copyBean(testPlans, getTestPlan(testPlan.getId()));
                 String context = getTestPlanContext(testPlans, NoticeConstants.UPDATE);
@@ -180,7 +183,7 @@ public class TestPlanService {
                             wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.UPDATE);
                             break;
                         case NoticeConstants.EMAIL:
-                            mailService.sendTestPlanStartNotice(r, userIds, testPlans, NoticeConstants.UPDATE);
+                            mailService.sendTestPlanEndNotice(r, userIds, testPlans, NoticeConstants.UPDATE);
                             break;
                     }
                 });
@@ -188,8 +191,7 @@ public class TestPlanService {
                 LogUtil.error(e);
             }
         }
-
-        return testPlanMapper.updateByPrimaryKeySelective(testPlan);
+        return i;
     }
 
     private void editTestPlanProject(TestPlanDTO testPlan) {
@@ -557,11 +559,19 @@ public class TestPlanService {
         }
         String context = "";
         if (StringUtils.equals(NoticeConstants.CREATE, type)) {
-            context = "测试计划任务通知：" + user.getName() + "创建的" + "'" + testPlan.getName() + "'" + "待开始，计划开始时间是" + start + "计划结束时间为" + end + "请跟进";
+            context = "测试计划任务通知：" + user.getName() + "创建的" + "'" + testPlan.getName() + "'" + "待开始，计划开始时间是:" + "'" + start + "'" + ";" + "计划结束时间是:" + "'" + end + "'" + " " + "请跟进";
         } else if (StringUtils.equals(NoticeConstants.UPDATE, type)) {
-            context = "测试计划任务通知：" + user.getName() + "创建的" + "'" + testPlan.getName() + "'" + "已完成，计划开始时间是" + start + "计划结束时间为" + end + "已完成";
+            String status = "";
+            if (StringUtils.equals(TestPlanStatus.Underway.name(), testPlan.getStatus())) {
+                status = "进行中";
+            } else if (StringUtils.equals(TestPlanStatus.Prepare.name(), testPlan.getStatus())) {
+                status = "未开始";
+            } else if (StringUtils.equals(TestPlanStatus.Completed.name(), testPlan.getStatus())) {
+                status = "已完成";
+            }
+            context = "测试计划任务通知：" + user.getName() + "创建的" + "'" + testPlan.getName() + "'" + "计划开始时间是:" + "'" + start + "'" + ";" + "计划结束时间是:" + "'" + end + "'" + " " + status;
         } else if (StringUtils.equals(NoticeConstants.DELETE, type)) {
-            context = "测试计划任务通知：" + user.getName() + "创建的" + "'" + testPlan.getName() + "'" + "计划开始时间是" + start + "计划结束时间为" + end + "已删除";
+            context = "测试计划任务通知：" + user.getName() + "创建的" + "'" + testPlan.getName() + "'" + "计划开始时间是:" + "'" + start + "'" + ";" + "计划结束时间是:" + "'" + end + "'" + " " + "已删除";
         }
         return context;
     }
diff --git a/backend/src/main/resources/mail/ReviewComments.html b/backend/src/main/resources/mail/ReviewComments.html
index c9f0514a57..feeef01250 100644
--- a/backend/src/main/resources/mail/ReviewComments.html
+++ b/backend/src/main/resources/mail/ReviewComments.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div>
-    <p style="text-align: left"> ${maintainer} 维护的<br/>
+    <p style="text-align: left"> ${maintainer}为 <br/>
         ${testCaseName}<br/>
         添加评论：${description}<br/>
         点击下面链接进入用例评审页面</p>
diff --git a/backend/src/main/resources/mail/ReviewEnd.html b/backend/src/main/resources/mail/ReviewEnd.html
index a324c7f1fb..38e4751bac 100644
--- a/backend/src/main/resources/mail/ReviewEnd.html
+++ b/backend/src/main/resources/mail/ReviewEnd.html
@@ -7,10 +7,10 @@
 <body>
 <div>
     <p style="text-align: left">${creator} 发起的:<br>
-        ${reviewName}已完成<br>
+        ${reviewName}<br>
         计划开始时间是:${start}<br>
         计划结束时间为:${end}<br>
-        已完成<br>
+        ${status}<br>
         点击下面链接进入用例评审页面</p>
     <a href="${url}/#/track/review/view">${url}/#/track/review/view</a>
 </div>
diff --git a/backend/src/main/resources/mail/TestPlanEnd.html b/backend/src/main/resources/mail/TestPlanEnd.html
index a4557adca9..455d69ccfb 100644
--- a/backend/src/main/resources/mail/TestPlanEnd.html
+++ b/backend/src/main/resources/mail/TestPlanEnd.html
@@ -7,10 +7,10 @@
 <body>
 <div>
     <p style="text-align: left">${creator} 创建的:<br>
-        ${testPlanName}已完成<br>
+        ${testPlanName}<br>
         计划开始时间是:${start}<br>
         计划结束时间为:${end}<br>
-        已完成！<br>
+        ${status}！<br>
         点击下面链接进入测试计划页面</p>
     <a href="${url}/#/track/plan/view/${id}">${url}/#/track/plan/view</a>
 </div>

From 76e09910677261a4a6cde385a5aaf070fbe4e9a6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 10:17:57 +0800
Subject: [PATCH 17/52] =?UTF-8?q?fix:=20=E7=99=BB=E5=85=A5=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js
index b7dc6bff95..c285fe0655 100644
--- a/frontend/src/common/js/ajax.js
+++ b/frontend/src/common/js/ajax.js
@@ -43,7 +43,7 @@ export default {
         success(response.data);
       } else {
         window.console.warn(response.data);
-        Message.warning(response.data.message);
+        Message.warning(response.data.message || response.data);
       }
       result.loading = false;
     }

From 754f067cddeb72da0c0e67116716250a77dc7b40 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 10:36:30 +0800
Subject: [PATCH 18/52] =?UTF-8?q?refactor:=20=E5=AE=8C=E5=96=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/jmeter/APIBackendListenerClient.java  |  4 ++--
 .../api/parse/JmeterDocumentParser.java       |  2 +-
 .../api/service/APITestService.java           |  6 ++---
 .../commons/utils/CompressUtils.java          |  4 ++--
 .../commons/utils/ScriptEngineUtils.java      |  4 ++--
 .../notice/service/DingTaskService.java       |  2 +-
 .../notice/service/MailService.java           | 22 +++++++++----------
 .../notice/service/WxChatTaskService.java     |  2 +-
 .../performance/engine/EngineFactory.java     |  4 ++--
 .../engine/docker/DockerTestEngine.java       |  4 ++--
 .../notice/PerformanceNoticeTask.java         |  2 +-
 .../service/PerformanceTestService.java       |  4 ++--
 .../metersphere/service/JarConfigService.java |  2 +-
 .../service/SystemParameterService.java       |  2 +-
 .../service/TestResourcePoolService.java      |  6 ++---
 .../track/service/IssuesService.java          |  2 +-
 .../track/service/TestCaseCommentService.java |  2 +-
 .../track/service/TestCaseReviewService.java  |  8 +++----
 .../track/service/TestPlanService.java        |  8 +++----
 .../websocket/ReportWebSocket.java            |  2 +-
 20 files changed, 46 insertions(+), 46 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 eb66714e05..026b1fb1f6 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -161,13 +161,13 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
                     testPlanTestCaseService.updateTestCaseStates(ids, TestPlanTestCaseStatus.Failure.name());
                 }
             } catch (Exception e) {
-                LogUtil.error(e);
+                LogUtil.error(e.getMessage(), e);
             }
         }
         try {
             sendTask(report, testResult);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
 
     }
diff --git a/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java
index efa1771c8c..3e6b191bfd 100644
--- a/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java
@@ -50,7 +50,7 @@ public class JmeterDocumentParser {
             }
             return documentToBytes(document);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             return source;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 85da5303d1..9dcac1c29f 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -131,7 +131,7 @@ public class APITestService {
                 file.createNewFile();
                 FileUtil.copyStream(in, out);
             } catch (IOException e) {
-                LogUtil.error(e);
+                LogUtil.error(e.getMessage(), e);
                 MSException.throwException(Translator.get("upload_fail"));
             }
         }
@@ -174,7 +174,7 @@ public class APITestService {
             try {
                 FileUtil.copyDir(sourceFile, new File(targetDir));
             } catch (IOException e) {
-                LogUtil.error(e);
+                LogUtil.error(e.getMessage(), e);
                 MSException.throwException(Translator.get("upload_fail"));
             }
         }
@@ -437,7 +437,7 @@ public class APITestService {
             bytes = JmeterDocumentParser.parse(bytes);
             is = new ByteArrayInputStream(bytes);
         } catch (IOException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
 
         jMeterService.run(request.getId(), reportId, is);
diff --git a/backend/src/main/java/io/metersphere/commons/utils/CompressUtils.java b/backend/src/main/java/io/metersphere/commons/utils/CompressUtils.java
index 04017e0fb4..24490d1f97 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/CompressUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/CompressUtils.java
@@ -88,7 +88,7 @@ public class CompressUtils {
             gzip.finish();
             return obj.toByteArray();
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             return data;
         }
     }
@@ -116,7 +116,7 @@ public class CompressUtils {
             baos.flush();
             return baos.toByteArray();
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             return data;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java
index 138d01c655..599d1b5234 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java
@@ -18,7 +18,7 @@ public class ScriptEngineUtils {
             String script = IOUtils.toString(ScriptEngineUtils.class.getResource("/javascript/func.js"), StandardCharsets.UTF_8);
             engine.eval(script);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -26,7 +26,7 @@ public class ScriptEngineUtils {
         try {
             return engine.eval("calculate('" + input + "')").toString();
         } catch (ScriptException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             return input;
         }
     }
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 c2d56193ba..9f2047f6ce 100644
--- a/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java
@@ -66,7 +66,7 @@ public class DingTaskService {
         try {
             response = client.execute(request);
         } catch (ApiException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
         System.out.println(response.getErrcode());
     }
diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java
index aa353c816e..1dea8d0ea8 100644
--- a/backend/src/main/java/io/metersphere/notice/service/MailService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java
@@ -65,7 +65,7 @@ public class MailService {
             }
             sendApiOrLoadNotification(addresseeIdList(messageDetail, userIds, eventType), context, performanceTemplate, loadTestReport.getTriggerMode());
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -86,7 +86,7 @@ public class MailService {
             }
             sendApiOrLoadNotification(addresseeIdList(messageDetail, userIds, eventType), context, apiTemplate, apiTestReport.getTriggerMode());
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -118,7 +118,7 @@ public class MailService {
         try {
             javaMailSender.send(mimeMessage);
         } catch (MailException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
     //测试评审
@@ -129,7 +129,7 @@ public class MailService {
             String endTemplate = IOUtils.toString(this.getClass().getResource("/mail/ReviewEnd.html"), StandardCharsets.UTF_8);
             sendReviewNotice(addresseeIdList(messageDetail, userIds, eventType), context, endTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -139,7 +139,7 @@ public class MailService {
             String endTemplate = IOUtils.toString(this.getClass().getResource("/mail/ReviewDelete.html"), StandardCharsets.UTF_8);
             sendReviewNotice(addresseeIdList(messageDetail, userIds, eventType), context, endTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -156,7 +156,7 @@ public class MailService {
             String commentTemplate = IOUtils.toString(this.getClass().getResource("/mail/ReviewComments.html"), StandardCharsets.UTF_8);
             sendReviewNotice(addresseeIdList(messageDetail, userIds, eventType), context, commentTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -166,7 +166,7 @@ public class MailService {
             String reviewerTemplate = IOUtils.toString(this.getClass().getResource("/mail/ReviewInitiate.html"), StandardCharsets.UTF_8);
             sendReviewNotice(addresseeIdList(messageDetail, userIds, eventType), context, reviewerTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -205,7 +205,7 @@ public class MailService {
             String endTemplate = IOUtils.toString(this.getClass().getResource("/mail/TestPlanStart.html"), StandardCharsets.UTF_8);
             sendTestPlanNotice(addresseeIdList(messageDetail, userIds, eventType), context, endTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -217,7 +217,7 @@ public class MailService {
             String endTemplate = IOUtils.toString(this.getClass().getResource("/mail/TestPlanEnd.html"), StandardCharsets.UTF_8);
             sendTestPlanNotice(addresseeIdList(messageDetail, userIds, eventType), context, endTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -229,7 +229,7 @@ public class MailService {
             String endTemplate = IOUtils.toString(this.getClass().getResource("/mail/TestPlanDelete.html"), StandardCharsets.UTF_8);
             sendTestPlanNotice(addresseeIdList(messageDetail, userIds, eventType), context, endTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -266,7 +266,7 @@ public class MailService {
             String endTemplate = IOUtils.toString(this.getClass().getResource("/mail/IssuesCreate.html"), StandardCharsets.UTF_8);
             sendIssuesNotice(addresseeIdList(messageDetail, userIds, eventType), context, endTemplate);
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
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 2de762ead7..89249b2b43 100644
--- a/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java
@@ -59,7 +59,7 @@ public class WxChatTaskService {
             SendResult result = WxChatbotClient.send(Webhook, message);
             System.out.println(result);
         } catch (IOException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
index 97a14aee04..4b2d6040b3 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
@@ -139,10 +139,10 @@ public class EngineFactory {
             String content = engineSourceParser.parse(engineContext, source);
             engineContext.setContent(content);
         } catch (MSException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             throw e;
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             MSException.throwException(e);
         }
 
diff --git a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
index 1db5e194ae..3afd797fd7 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
@@ -64,10 +64,10 @@ public class DockerTestEngine extends AbstractEngine {
         try {
             context = EngineFactory.createContext(loadTest, resource.getId(), ratio, this.getStartTime(), this.getReportId(), resourceIndex);
         } catch (MSException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             throw e;
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             MSException.throwException(e);
         }
 
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 db8cbbd74a..b3ca8d57c4 100644
--- a/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java
+++ b/backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java
@@ -65,7 +65,7 @@ public class PerformanceNoticeTask {
                     //查询定时任务是否关闭
                     Thread.sleep(1000 * 30);// 每分钟检查 loadtest 的状态
                 } catch (InterruptedException e) {
-                    LogUtil.error(e);
+                    LogUtil.error(e.getMessage(), e);
                 }
             }
         });
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 fe338d2858..544a2eaefd 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -258,7 +258,7 @@ public class PerformanceTestService {
                 soc.close();
             }
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             MSException.throwException(Translator.get("load_test_kafka_invalid"));
         }
     }
@@ -304,7 +304,7 @@ public class PerformanceTestService {
         } catch (MSException e) {
             // 启动失败之后清理任务
             engine.stop();
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             loadTest.setStatus(PerformanceTestStatus.Error.name());
             loadTest.setDescription(e.getMessage());
             loadTestMapper.updateByPrimaryKeySelective(loadTest);
diff --git a/backend/src/main/java/io/metersphere/service/JarConfigService.java b/backend/src/main/java/io/metersphere/service/JarConfigService.java
index f278fbd069..fe3f499458 100644
--- a/backend/src/main/java/io/metersphere/service/JarConfigService.java
+++ b/backend/src/main/java/io/metersphere/service/JarConfigService.java
@@ -119,7 +119,7 @@ public class JarConfigService {
             file.createNewFile();
             FileUtil.copyStream(in, out);
         } catch (IOException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             MSException.throwException(Translator.get("upload_fail"));
         }
         return filePath;
diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 7a9a42e66c..e58e268726 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -107,7 +107,7 @@ public class SystemParameterService {
         try {
             javaMailSender.testConnection();
         } catch (MessagingException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             MSException.throwException(Translator.get("connection_failed"));
         }
     }
diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
index d43ae6759d..ce6aef6ac0 100644
--- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
+++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
@@ -135,7 +135,7 @@ public class TestResourcePoolService {
                 MSException.throwException("Resource Pool is invalid.");
             }
         } catch (IllegalAccessException | InvocationTargetException e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -161,7 +161,7 @@ public class TestResourcePoolService {
                 testResourcePoolDTO.setResources(testResources);
                 testResourcePoolDTOS.add(testResourcePoolDTO);
             } catch (IllegalAccessException | InvocationTargetException e) {
-                LogUtil.error(e);
+                LogUtil.error(e.getMessage(), e);
             }
         });
         return testResourcePoolDTOS;
@@ -210,7 +210,7 @@ public class TestResourcePoolService {
             ResponseEntity<String> entity = restTemplateWithTimeOut.getForEntity(String.format(nodeControllerUrl, node.getIp(), node.getPort()), String.class);
             return HttpStatus.OK.equals(entity.getStatusCode());
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
             return false;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index dc84ad5bf8..fbe799157f 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -116,7 +116,7 @@ public class IssuesService {
                 }
             });
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
 
     }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java
index 2ed274c442..b51e6716c4 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java
@@ -84,7 +84,7 @@ public class TestCaseCommentService {
                 }
             });
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), 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 a955e9c6c6..617295d1f9 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -127,7 +127,7 @@ public class TestCaseReviewService {
                 }
             });
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
 
     }
@@ -205,7 +205,7 @@ public class TestCaseReviewService {
                 }
             });
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
 
     }
@@ -316,7 +316,7 @@ public class TestCaseReviewService {
                 }
             });
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
 
     }
@@ -466,7 +466,7 @@ public class TestCaseReviewService {
                     }
                 });
             } catch (Exception e) {
-                LogUtil.error(e);
+                LogUtil.error(e.getMessage(), e);
             }
         }
     }
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 b4cb1346c3..35827a7299 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -137,7 +137,7 @@ public class TestPlanService {
                 }
             });
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
     }
 
@@ -188,7 +188,7 @@ public class TestPlanService {
                     }
                 });
             } catch (Exception e) {
-                LogUtil.error(e);
+                LogUtil.error(e.getMessage(), e);
             }
         }
         return i;
@@ -272,7 +272,7 @@ public class TestPlanService {
                 }
             });
         } catch (Exception e) {
-            LogUtil.error(e);
+            LogUtil.error(e.getMessage(), e);
         }
         return num;
     }
@@ -513,7 +513,7 @@ public class TestPlanService {
                     }
                 });
             } catch (Exception e) {
-                LogUtil.error(e);
+                LogUtil.error(e.getMessage(), e);
             }
         }
 
diff --git a/backend/src/main/java/io/metersphere/websocket/ReportWebSocket.java b/backend/src/main/java/io/metersphere/websocket/ReportWebSocket.java
index 33c072fadf..b34c38d67c 100644
--- a/backend/src/main/java/io/metersphere/websocket/ReportWebSocket.java
+++ b/backend/src/main/java/io/metersphere/websocket/ReportWebSocket.java
@@ -106,7 +106,7 @@ public class ReportWebSocket {
                     }
                     Thread.sleep(20 * 1000L);
                 } catch (Exception e) {
-                    LogUtil.error(e);
+                    LogUtil.error(e.getMessage(), e);
                 }
             }
         }

From 7b5dd9c14f6b5a8ff5e8caecb4e971c6f90133d2 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Wed, 25 Nov 2020 11:15:29 +0800
Subject: [PATCH 19/52] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                                    | 4 ++--
 backend/pom.xml                                               | 2 +-
 frontend/pom.xml                                              | 2 +-
 .../src/business/components/api/test/model/ScenarioModel.js   | 2 +-
 pom.xml                                                       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 07f9e02988..162115dbac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ ARG MS_VERSION=dev
 
 RUN mkdir -p /opt/apps && mkdir -p /opt/jmeter
 
-COPY backend/target/backend-1.4.jar /opt/apps
+COPY backend/target/backend-1.5.jar /opt/apps
 
 COPY backend/target/classes/jmeter/ /opt/jmeter/
 
-ENV JAVA_APP_JAR=/opt/apps/backend-1.4.jar
+ENV JAVA_APP_JAR=/opt/apps/backend-1.5.jar
 
 ENV AB_OFF=true
 
diff --git a/backend/pom.xml b/backend/pom.xml
index 5df379de4c..6f47ee07c7 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>metersphere-server</artifactId>
         <groupId>io.metersphere</groupId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index f246001960..8a9a98a84a 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>metersphere-server</artifactId>
     <groupId>io.metersphere</groupId>
-    <version>1.4</version>
+    <version>1.5</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index d6a29fdf21..84c8982ea6 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -157,7 +157,7 @@ export class Test extends BaseConfig {
   constructor(options) {
     super();
     this.type = "MS API CONFIG";
-    this.version = '1.4.0';
+    this.version = '1.5.0';
     this.id = uuid();
     this.name = undefined;
     this.projectId = undefined;
diff --git a/pom.xml b/pom.xml
index 27f82b6fa6..3277873249 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.metersphere</groupId>
     <artifactId>metersphere-server</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
     <packaging>pom</packaging>
 
     <parent>

From e43ce4fa0a9af235a98ee0cbd2709dae3a2dd331 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 25 Nov 2020 11:26:09 +0800
Subject: [PATCH 20/52] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81199=E6=AE=B5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes 818
---
 .../business/components/settings/personal/PersonSetting.vue    | 3 ++-
 frontend/src/business/components/settings/system/User.vue      | 3 ++-
 frontend/src/common/js/regex.js                                | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/common/js/regex.js

diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index bff2281cf7..89b15fa6d3 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -86,6 +86,7 @@
   import MsDialogFooter from "../../common/components/MsDialogFooter";
   import {getCurrentUser, listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
   import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
+  import {PHONE_REGEX} from "@/common/js/regex";
 
   export default {
     name: "MsPersonSetting",
@@ -115,7 +116,7 @@
           phone: [
             {
               required: false,
-              pattern: '^1(3|4|5|7|8)\\d{9}$',
+              pattern: PHONE_REGEX,
               message: this.$t('member.mobile_number_format_is_incorrect'),
               trigger: 'blur'
             }
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 4fc1069521..5be7dcc5ae 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -338,6 +338,7 @@ import {hasRole, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import MsRolesTag from "../../common/components/MsRolesTag";
 import {ROLE_ADMIN} from "@/common/js/constants";
 import {getCurrentUser} from "../../../../common/js/utils";
+import {PHONE_REGEX} from "@/common/js/regex";
 
 export default {
   name: "MsUser",
@@ -401,7 +402,7 @@ export default {
           {required: true, message: this.$t('user.input_phone'), trigger: 'blur'},
           {
             required: true,
-            pattern: '^1(3|4|5|7|8)\\d{9}$',
+            pattern: PHONE_REGEX,
             message: this.$t('user.mobile_number_format_is_incorrect'),
             trigger: 'blur'
           }
diff --git a/frontend/src/common/js/regex.js b/frontend/src/common/js/regex.js
new file mode 100644
index 0000000000..9320e4d0c0
--- /dev/null
+++ b/frontend/src/common/js/regex.js
@@ -0,0 +1 @@
+export const PHONE_REGEX = '^1(3|4|5|7|8|9)\\d{9}$';

From f4a3900439070871634101c8a798f319b4064e64 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Wed, 25 Nov 2020 13:44:29 +0800
Subject: [PATCH 21/52] =?UTF-8?q?docs:=20=E4=BF=AE=E6=94=B9=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=20readme=20=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README-EN.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README-EN.md b/README-EN.md
index 9d0d82f374..a949f3fc9a 100644
--- a/README-EN.md
+++ b/README-EN.md
@@ -17,8 +17,8 @@ MeterSphere is a one-stop open-source enterprise-class continuous testing platfo
 Only need two steps to install MeterSphere：
 
 What you need:
- 1. Prepare a 64-bit Linux host with no less than 8 G RAM
- 2. Log into root user and execute the command down below to install MeterSphere
+1.  Prepare a 64-bit Linux host with no less than 8 G RAM
+2.  Log into root user and execute the command down below to install MeterSphere
 
 ```sh
 curl -sSL https://github.com/metersphere/metersphere/releases/latest/download/quick_start.sh | sh

From b4a517c4ffe24a64fcbc465e5ecb2b51268e29db Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Wed, 25 Nov 2020 13:48:40 +0800
Subject: [PATCH 22/52] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/comonents/report/TestCaseReportTemplateEdit.vue    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
index d5a022954b..001917f1f2 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
@@ -127,7 +127,7 @@
           this.listenGoBack();
         },
         initComponents() {
-          this.componentMap.forEach((value, key) =>{
+          this.componentMap.forEach((value, key) => {
             if (this.template.content.components.indexOf(key) < 0 && this.components.indexOf(key) < 0) {
               this.components.push(key);
             }
@@ -205,7 +205,7 @@
           if (this.isReport) {
             url = '/case/report/get/';
           }
-          this.$get(url + id, (response) =>{
+          this.$get(url + id, (response) => {
             this.template = response.data;
             this.template.content = JSON.parse(response.data.content);
             if (this.template.content.customComponent) {
@@ -238,7 +238,7 @@
           if (this.isReport) {
             url = '/case/report/';
           }
-          this.$post(url + this.type, param, () =>{
+          this.$post(url + this.type, param, () => {
             this.$success(this.$t('commons.save_success'));
             this.handleClose();
             this.$emit('refresh');

From 4122a81100a838aad43ab682685d7a8aa5b3742f Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Wed, 25 Nov 2020 14:09:29 +0800
Subject: [PATCH 23/52] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E4=B8=8D?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/css/main.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 85ae6dcfd5..fe69992221 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -110,9 +110,7 @@ body {
 }
 
 /* 修复带长度限制的文本框，内容太长造成的无法查看内容的问题 */
-/*.el-input-padding-fix .el-input__inner {*/
-  /*padding-right: 60px ;*/
-/*}*/
+
 .el-input__inner[maxlength] {
-  padding-right: 60px ;
+  padding-right: 60px;
 }

From 1c635c4617489d27fb3c628696abe2f86a5d7c80 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 25 Nov 2020 15:04:19 +0800
Subject: [PATCH 24/52] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7ID=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/settings/system/User.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 5be7dcc5ae..402b4413b1 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -381,7 +381,7 @@ export default {
       rule: {
         id: [
           {required: true, message: this.$t('user.input_id'), trigger: 'blur'},
-          {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
+          {min: 1, max: 50, message: this.$t('commons.input_limit', [1, 50]), trigger: 'blur'},
           {
             required: true,
             pattern: '^[^\u4e00-\u9fa5]+$',

From dcfb7a687a48cdc9661cbccaabd0809f89d7c8f8 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 25 Nov 2020 15:26:15 +0800
Subject: [PATCH 25/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E7=BD=AE=E5=AD=97=E6=95=B0=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 33bbdb3f52..13907bd5ff 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 33bbdb3f528c914bf333b2c1839dd6d3bbd9b569
+Subproject commit 13907bd5ff621214ae81e42098df382916c503ce

From 4bd6c8ec71c4978d8947f0e455fe576a8745661c Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 25 Nov 2020 15:38:58 +0800
Subject: [PATCH 26/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BBenter=E9=94=AE=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=9B=E5=BB=BA=E6=88=90=E5=8A=9F=EF=BC=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=20Closes=20819?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/project/MsProject.vue  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index 147a478df8..54c45b8e19 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -204,6 +204,7 @@ export default {
         });
       }
     },
+
     submit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -282,7 +283,18 @@ export default {
     },
     openEnvironmentConfig(project) {
       this.$refs.environmentConfig.open(project.id);
-    }
+    },
+    handleEvent(event) {
+      if (event.keyCode === 13) {
+       this.submit('form')
+      }
+    },
+  },
+  created() {
+    document.addEventListener('keydown', this.handleEvent)
+  },
+  beforeDestroy() {
+    document.removeEventListener('keydown', this.handleEvent);
   }
 }
 </script>

From 9d1350a97b0ca4751062ee29475e05e18a870436 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 25 Nov 2020 15:45:52 +0800
Subject: [PATCH 27/52] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=20xmind=20=E5=AF=BC=E5=85=A5=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/xmind/XmindCaseParser.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index 7406ffec73..d08eea9ab3 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -231,7 +231,7 @@ public class XmindCaseParser {
                 JSONObject step = new JSONObject(true);
                 step.put("num", i + 1);
                 step.put("desc", attacheds.get(i).getTitle());
-                if (attacheds.get(i) != null && attacheds.get(i).getChildren() != null &&  attacheds.get(i).getChildren().getAttached()!=null) {
+                if (attacheds.get(i) != null && attacheds.get(i).getChildren() != null && attacheds.get(i).getChildren().getAttached() != null) {
                     step.put("result", attacheds.get(i).getChildren().getAttached().get(0).getTitle());
                 }
                 jsonArray.add(step);
@@ -283,17 +283,20 @@ public class XmindCaseParser {
 
         // 测试步骤处理
         List<Attached> steps = new LinkedList<>();
+        StringBuilder rc = new StringBuilder();
         if (attacheds != null && !attacheds.isEmpty()) {
             attacheds.forEach(item -> {
                 if (isAvailable(item.getTitle(), PC_REGEX)) {
                     testCase.setPrerequisite(replace(item.getTitle(), PC_REGEX));
                 } else if (isAvailable(item.getTitle(), RC_REGEX)) {
-                    testCase.setRemark(replace(item.getTitle(), RC_REGEX));
+                    rc.append(replace(item.getTitle(), RC_REGEX));
+                    rc.append("\n");
                 } else {
                     steps.add(item);
                 }
             });
         }
+        testCase.setRemark(rc.toString());
         testCase.setSteps(this.getSteps(steps));
         testCases.add(testCase);
         // 校验合规性

From 45a7a05c143b3b90e478d8f5138f29dbdf7bbc7c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 25 Nov 2020 16:23:53 +0800
Subject: [PATCH 28/52] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=8F=AA=E8=AF=BB=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=BB=99=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=84=E8=AE=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/review/commom/ReviewComment.vue      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index c8901d7269..c849f11adc 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -23,9 +23,10 @@
         resize="none"
         :autosize="{ minRows: 4, maxRows: 4}"
         @keyup.ctrl.enter.native="sendComment"
+        :disabled="isReadOnly"
       >
       </el-input>
-      <el-button type="primary" size="mini" class="send-btn" @click="sendComment">
+      <el-button type="primary" size="mini" class="send-btn" @click="sendComment" :disabled="isReadOnly">
         {{ $t('test_track.comment.send') }}
       </el-button>
     </div>
@@ -34,6 +35,7 @@
 
 <script>
 import ReviewCommentItem from "./ReviewCommentItem";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 
 export default {
   name: "ReviewComment",
@@ -47,8 +49,12 @@ export default {
     return {
       result: {},
       textarea: '',
+      isReadOnly: false
     }
   },
+  created() {
+    this.isReadOnly = !checkoutTestManagerOrTestUser();
+  },
   methods: {
     sendComment() {
       let comment = {};

From 17142dc4b309c666515a22b2669984760c36e7b9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 25 Nov 2020 16:38:31 +0800
Subject: [PATCH 29/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/metersphere/config/ShiroConfig.java  | 2 +-
 frontend/src/business/App.vue                             | 3 +--
 frontend/src/business/components/xpack                    | 2 +-
 frontend/src/login/Login.vue                              | 8 ++------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/config/ShiroConfig.java b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
index 54505fc49b..ddc9ad8e2c 100644
--- a/backend/src/main/java/io/metersphere/config/ShiroConfig.java
+++ b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
@@ -44,7 +44,7 @@ public class ShiroConfig implements EnvironmentAware {
         Map<String, String> filterChainDefinitionMap = shiroFilterFactoryBean.getFilterChainDefinitionMap();
         ShiroUtils.loadBaseFilterChain(filterChainDefinitionMap);
         filterChainDefinitionMap.put("/display/info", "anon");
-        filterChainDefinitionMap.put("/display/file/*", "anon");
+        filterChainDefinitionMap.put("/display/file/**", "anon");
         filterChainDefinitionMap.put("/**", "apikey, authc");
         return shiroFilterFactoryBean;
     }
diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index 41cb26562f..aff282cd88 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -7,8 +7,7 @@
     </el-row>
     <el-row id="header-top" type="flex" justify="space-between" align="middle">
       <el-col :span="12">
-        <img v-if="logoId" :src="'/display/file/' + logoId" style="width: 156px;height: 37px;" alt="">
-        <a v-else class="logo"/>
+        <img :src="'/display/file/svg/logo'" style="width: 156px;height: 37px;" alt="">
         <ms-top-menus/>
       </el-col>
 
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 13907bd5ff..8a972a1987 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 13907bd5ff621214ae81e42098df382916c503ce
+Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8
diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 02f61856a8..78a418c1b7 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -4,8 +4,7 @@
       <el-col :span="12">
         <el-form :model="form" :rules="rules" ref="form">
           <div class="logo">
-            <img v-if="loginLogoId" :src="'/display/file/' + loginLogoId" style="width: 224px;height: 45px;" alt="">
-            <img v-else src="../assets/logo-dark-MeterSphere.svg" style="width: 224px; " alt="">
+            <img :src="'/display/file/svg/loginLogo'" style="width: 224px;height: 45px;" alt="">
           </div>
           <div class="title">
             <span id="s1">{{ loginTitle }}</span>
@@ -41,8 +40,7 @@
         </el-form>
       </el-col>
       <el-col :span="12">
-        <img v-if="loginImageId" :src="'/display/file/' + loginImageId" style="height: 560px; width: 100%">
-        <img v-else src="../assets/info.png" style="height: 560px; width: 100%">
+        <img :src="'/display/file/png/loginImage'" style="height: 560px; width: 100%">
       </el-col>
     </el-row>
   </div>
@@ -86,8 +84,6 @@ export default {
       msg: '',
       ready: false,
       openLdap: false,
-      loginLogoId: '_blank',
-      loginImageId: '_blank',
       loginTitle: this.$t("commons.login") + " MeterSphere"
     }
   },

From ae1b31bbfcd19e63a3667cebe8e259e4a68e8070 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 25 Nov 2020 16:40:39 +0800
Subject: [PATCH 30/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
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 419c75bca6..e9ce6f1732 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 419c75bca64b7c5bfbd1194d7f0fd9919f0caa04
+Subproject commit e9ce6f1732eed17f1b249a6b863264e0ea04e52c

From 245da1d1ca729dbfd986404966928bfc1246e06e Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 25 Nov 2020 16:48:37 +0800
Subject: [PATCH 31/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/App.vue              | 2 +-
 frontend/src/login/Login.vue               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index e9ce6f1732..bb494fc68a 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit e9ce6f1732eed17f1b249a6b863264e0ea04e52c
+Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index aff282cd88..b3bd049661 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -7,7 +7,7 @@
     </el-row>
     <el-row id="header-top" type="flex" justify="space-between" align="middle">
       <el-col :span="12">
-        <img :src="'/display/file/svg/logo'" style="width: 156px;height: 37px;" alt="">
+        <img :src="'/display/file/logo'" style="width: 156px;height: 37px;" alt="">
         <ms-top-menus/>
       </el-col>
 
diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 78a418c1b7..30ede5c36e 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -4,7 +4,7 @@
       <el-col :span="12">
         <el-form :model="form" :rules="rules" ref="form">
           <div class="logo">
-            <img :src="'/display/file/svg/loginLogo'" style="width: 224px;height: 45px;" alt="">
+            <img :src="'/display/file/loginLogo'" style="width: 224px;height: 45px;" alt="">
           </div>
           <div class="title">
             <span id="s1">{{ loginTitle }}</span>
@@ -40,7 +40,7 @@
         </el-form>
       </el-col>
       <el-col :span="12">
-        <img :src="'/display/file/png/loginImage'" style="height: 560px; width: 100%">
+        <img :src="'/display/file/loginImage'" style="height: 560px; width: 100%">
       </el-col>
     </el-row>
   </div>

From 2b4f8266fbda0f23f14df9152f5818793a632c84 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 25 Nov 2020 17:24:30 +0800
Subject: [PATCH 32/52] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/view/comonents/TestCaseRelevance.vue    | 10 ++++++++++
 .../review/view/components/TestReviewRelevance.vue     |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
index 9f7b8bfa66..d1dc718c3b 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
@@ -215,6 +215,16 @@
               item.checked = false;
             });
             flag ? this.testCases = tableData : this.testCases = this.testCases.concat(tableData);
+            // 去重处理
+            let hash = {}
+            this.testCases = this.testCases.reduce((item, next) => {
+              if (!hash[next.id]) {
+                hash[next.id] = true
+                item.push(next)
+              }
+              return item
+            }, [])
+
             this.lineStatus = tableData.length === 50 && this.testCases.length < this.total;
           });
         }
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
index 9c965c1fb1..d232be36e1 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -219,6 +219,15 @@
               item.checked = false;
             });
             flag ? this.testReviews = tableData : this.testReviews = this.testReviews.concat(tableData);
+            // 去重处理
+            let hash = {}
+            this.testReviews = this.testReviews.reduce((item, next) => {
+              if (!hash[next.id]) {
+                hash[next.id] = true
+                item.push(next)
+              }
+              return item
+            }, [])
             this.lineStatus = tableData.length === 50 && this.testReviews.length < this.total;
 
           });

From 5bf126fa2e2612cde0da4fb8228471c51a93fb13 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 17:31:55 +0800
Subject: [PATCH 33/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/report/ApiReportViewDetail.vue        | 20 ++++++-------------
 .../components/report/MsReportTitle.vue       |  4 +---
 .../report/PerformanceReportView.vue          |  2 +-
 .../comonents/report/TestCaseReportView.vue   |  4 ++--
 frontend/src/common/js/utils.js               | 14 +++++++++++++
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/frontend/src/business/components/api/report/ApiReportViewDetail.vue b/frontend/src/business/components/api/report/ApiReportViewDetail.vue
index a00b2b446a..5685063904 100644
--- a/frontend/src/business/components/api/report/ApiReportViewDetail.vue
+++ b/frontend/src/business/components/api/report/ApiReportViewDetail.vue
@@ -46,10 +46,9 @@ import MsScenarioResults from "./components/ScenarioResults";
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 import MsApiReportExport from "./ApiReportExport";
-import {exportPdf} from "@/common/js/utils";
-import html2canvas from "html2canvas";
 import MsApiReportViewHeader from "./ApiReportViewHeader";
 import {RequestFactory} from "../test/model/ScenarioModel";
+import {windowPrint} from "../../../../common/js/utils";
 
 export default {
   name: "MsApiReportViewDetail",
@@ -154,23 +153,16 @@ export default {
         this.scenarioName = requestResult.scenarioName;
       });
     },
-    handleExport(name) {
-      this.loading = true;
+    handleExport() {
       this.reportExportVisible = true;
       let reset = this.exportReportReset;
-
-      this.$nextTick(function () {
-        html2canvas(document.getElementById('apiTestReport'), {
-          // scale: 2,
-        }).then(function (canvas) {
-          exportPdf(name, [canvas]);
-          reset();
-        });
+      this.$nextTick(() => {
+        windowPrint('apiTestReport', 0.57);
+        reset();
       });
     },
     exportReportReset() {
-      this.reportExportVisible = false;
-      this.loading = false;
+      this.$router.go(0);
     }
   },
 
diff --git a/frontend/src/business/components/common/components/report/MsReportTitle.vue b/frontend/src/business/components/common/components/report/MsReportTitle.vue
index 8b58a77e22..fc661d81ba 100644
--- a/frontend/src/business/components/common/components/report/MsReportTitle.vue
+++ b/frontend/src/business/components/common/components/report/MsReportTitle.vue
@@ -9,9 +9,7 @@
       </div>
     </div>
     <div class="report-right">
-      <div class="test">
-        <img class="logo" src="@/assets/logo-MeterSphere.png">
-      </div>
+      <img class="logo" src="@/assets/logo-MeterSphere.png">
     </div>
 
   </div>
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 0d105c2879..106a75fb54 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -272,7 +272,7 @@ export default {
 
       this.$nextTick(function () {
         html2canvas(document.getElementById('performanceReportExport'), {
-          // scale: 2
+          scale: 2
         }).then(function (canvas) {
           exportPdf(name, [canvas]);
           reset();
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
index d4d0f49b29..04fdb70864 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
@@ -211,7 +211,7 @@
 
         this.$nextTick(function () {
           html2canvas(document.getElementById('testCaseReportExport'), {
-            // scale: 2
+            scale: 2
           }).then(function(canvas) {
             exportPdf(name, [canvas]);
             reset();
@@ -225,7 +225,7 @@
       },
     }
   }
-</script>
+</script>cd
 
 <style scoped>
 
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 2c1c631826..7d3f85caea 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -259,3 +259,17 @@ export function exportPdf(name, canvasList) {
 
 }
 
+export function windowPrint(id, zoom) {
+  //根据div标签ID拿到div中的局部内容
+  let bdhtml=window.document.body.innerHTML;
+  let el = document.getElementById(id);
+  var jubuData = el.innerHTML;
+  document.getElementsByTagName('body')[0].style.zoom=zoom;
+  //把获取的 局部div内容赋给body标签, 相当于重置了 body里的内容
+  window.document.body.innerHTML= jubuData;
+  //调用打印功能
+  window.print();
+  window.document.body.innerHTML=bdhtml;//重新给页面内容赋值；
+  return false;
+}
+

From e56c42dcc4a0a0914988560d8835156f22ae858a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 17:43:08 +0800
Subject: [PATCH 34/52] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=94=A8=E4=BE=8B=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                | 2 +-
 .../components/track/case/components/TestCaseList.vue     | 8 +++-----
 frontend/src/business/components/xpack                    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index bb494fc68a..57d6f78efa 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
+Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 2475415a15..cf6c9bcc7d 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -8,7 +8,7 @@
                          :tip="$t('commons.search_by_name_or_id')"
                          :create-tip="$t('test_track.case.create')" @create="testCaseCreate">
           <template v-slot:title>
-            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="showAll"/>
+            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"/>
           </template>
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" icon="el-icon-download"
@@ -292,6 +292,8 @@ export default {
   },
   methods: {
     initTableData() {
+      this.condition.planId = "";
+      this.condition.nodeIds = [];
       if (this.planId) {
         // param.planId = this.planId;
         this.condition.planId = this.planId;
@@ -377,10 +379,6 @@ export default {
       this.selectRows.clear();
       this.$emit('refresh');
     },
-    showAll() {
-      this.condition = {components: TEST_CASE_CONFIGS};
-      this.getData();
-    },
     showDetail(row, event, column) {
       this.$emit('testCaseDetail', row);
     },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 8a972a1987..71d57ae5d7 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8
+Subproject commit 71d57ae5d7f8bb5c93a29504ac6f2300dc189ce9

From e440d36ead4c0a5ebde20b8d36b89c78fbe37b94 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 25 Nov 2020 18:51:34 +0800
Subject: [PATCH 35/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/login/Login.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 30ede5c36e..1a802e9d2c 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -260,6 +260,10 @@ export default {
   background: url(../assets/info.png);
   height: 560px;
 }
+
+.login-logo {
+  background: url(../assets/logo-dark-MeterSphere.svg);
+}
 </style>
 
 <style>

From 3843f0b420ccce63530d295657eaacaa64416db2 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 25 Nov 2020 19:21:07 +0800
Subject: [PATCH 36/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B5=8B=E8=AF=95=E5=A4=84=E7=90=86=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=BD=AC=E4=B9=89=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/parse/JmeterDocumentParser.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java
index efa1771c8c..15b6f198bf 100644
--- a/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java
@@ -161,7 +161,9 @@ public class JmeterDocumentParser {
                 break;
             case "Argument.value":
                 String textContent = ele.getTextContent();
-                ele.setTextContent(ScriptEngineUtils.calculate(textContent));
+                if (StringUtils.startsWith(textContent, "@")) {
+                    ele.setTextContent(ScriptEngineUtils.calculate(textContent));
+                }
                 break;
             default:
                 break;

From b5d926e264bd1995dd3434c02969e7643fe21805 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 19:48:04 +0800
Subject: [PATCH 37/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E5=8F=AA=E8=AF=BB=E7=94=A8=E6=88=B7=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2=E8=87=AA=E5=8A=A8=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsScheduleEdit.vue        | 17 +++++++++++++----
 .../components/ScheduleTaskNotification.vue     | 11 +++++++++--
 .../track/case/components/TestCaseList.vue      |  1 -
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index 499b7c45d5..9cb5eed4a8 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -31,7 +31,7 @@
             </el-dialog>
           </el-tab-pane>
           <el-tab-pane :label="$t('schedule.task_notification')" name="second">
-          <schedule-task-notification :test-id="testId" :schedule-receiver-options="scheduleReceiverOptions"></schedule-task-notification>
+          <schedule-task-notification :is-tester-permission="isTesterPermission" :test-id="testId" :schedule-receiver-options="scheduleReceiverOptions"></schedule-task-notification>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -46,6 +46,7 @@ import CrontabResult from "../cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import ScheduleTaskNotification from "../../settings/organization/components/ScheduleTaskNotification";
+import {checkoutTestManagerOrTestUser} from "../../../../common/js/utils";
 function defaultCustomValidate() {
   return {pass: true};
 }
@@ -113,10 +114,13 @@ export default {
         name: '',
         organizationId: this.currentUser().lastOrganizationId
       };
-      this.result = this.$post('user/org/member/list/all', param, response => {
-        this.scheduleReceiverOptions = response.data
 
-      });
+      if (this.isTesterPermission) {
+        this.result = this.$post('user/org/member/list/all', param, response => {
+          this.scheduleReceiverOptions = response.data
+        });
+      }
+
     },
    /* handleClick() {
       if (this.activeName === "second") {
@@ -188,6 +192,11 @@ export default {
       let time1 = new Date(resultList[0]);
       let time2 = new Date(resultList[1]);
       return time2 - time1;
+    },
+  },
+  computed: {
+    isTesterPermission() {
+      return checkoutTestManagerOrTestUser();
     }
   }
 }
diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
index 2cf7f9b523..7df26ff04d 100644
--- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
@@ -2,7 +2,7 @@
   <div>
     <el-row>
       <el-col :span="10">
-        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel('scheduleTask')">
+        <el-button :disabled="!isTesterPermission" icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel('scheduleTask')">
           {{ $t('organization.message.create_new_notification') }}
         </el-button>
       </el-col>
@@ -69,12 +69,14 @@
                 type="primary"
                 size="mini"
                 v-show="scope.row.isSet"
+                :disabled="!isTesterPermission"
                 @click="handleAddTask(scope.$index,scope.row)"
               >{{ $t('commons.add') }}
               </el-button>
               <el-button
                 size="mini"
                 v-show="scope.row.isSet"
+                :disabled="!isTesterPermission"
                 @click.native.prevent="removeRowTask(scope.$index,form.scheduleTask)"
               >{{ $t('commons.cancel') }}
               </el-button>
@@ -82,6 +84,7 @@
                 type="primary"
                 size="mini"
                 v-show="!scope.row.isSet"
+                :disabled="!isTesterPermission"
                 @click="handleEditTask(scope.$index,scope.row)"
               >{{ $t('commons.edit') }}</el-button>
               <el-button
@@ -89,6 +92,7 @@
                 icon="el-icon-delete"
                 size="mini"
                 v-show="!scope.row.isSet"
+                :disabled="!isTesterPermission"
                 @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
               ></el-button>
             </template>
@@ -106,6 +110,10 @@ export default {
   props: {
     testId:String,
     scheduleReceiverOptions:Array,
+    isTesterPermission: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -120,7 +128,6 @@ export default {
           identification: "",
           isReadOnly: false,
           testId:this.testId,
-
         }],
       },
       scheduleEventOptions: [
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index cf6c9bcc7d..96b14c79ff 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -497,7 +497,6 @@ export default {
     },
     showPopover(row, column, cell) {
       if (column.property === 'name') {
-        console.log(row, column);
         this.currentCaseId = row.id;
       }
     }

From 8656fa36bfa06a4adc4a1acb1c817410e191e6fa Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 20:45:34 +0800
Subject: [PATCH 38/52] =?UTF-8?q?fi(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20python=20=E8=84=9A=E6=9C=AC=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                  |  2 +-
 .../metersphere/listener/AppStartListener.java   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 2cf6adf908..0353064d0f 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -509,7 +509,7 @@
                         <artifactItem>
                             <groupId>org.python</groupId>
                             <artifactId>jython-standalone</artifactId>
-                            <version>2.7.0</version>
+                            <version>2.7.2</version>
                             <type>jar</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>src/main/resources/jmeter/lib/ext</outputDirectory>
diff --git a/backend/src/main/java/io/metersphere/listener/AppStartListener.java b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
index 0b55a6cd91..1b408c2ba4 100644
--- a/backend/src/main/java/io/metersphere/listener/AppStartListener.java
+++ b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
@@ -72,13 +72,15 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
      */
     private void loadJars() {
         List<JarConfig> jars = jarConfigService.list();
-        try {
-            jars.forEach(jarConfig -> {
+
+        jars.forEach(jarConfig -> {
+            try {
                 NewDriverManager.loadJar(jarConfig.getPath());
-            });
-        } catch (Exception e) {
-            e.printStackTrace();
-            LogUtil.error(e.getMessage(), e);
-        }
+            } catch (Exception e) {
+                e.printStackTrace();
+                LogUtil.error(e.getMessage(), e);
+            }
+        });
+
     }
 }

From 5de10c5a5cc8fd43b4d10fa9fa5db3cf4bd5e490 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 21:04:35 +0800
Subject: [PATCH 39/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20python=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 0353064d0f..6f47ee07c7 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -156,7 +156,7 @@
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>
-            <version>2.7.2</version>
+            <version>2.7.0</version>
         </dependency>
 
         <dependency>
@@ -509,7 +509,7 @@
                         <artifactItem>
                             <groupId>org.python</groupId>
                             <artifactId>jython-standalone</artifactId>
-                            <version>2.7.2</version>
+                            <version>2.7.0</version>
                             <type>jar</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>src/main/resources/jmeter/lib/ext</outputDirectory>

From cea611a783789663f2428c4fafc12de25f552a5c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 Nov 2020 21:08:22 +0800
Subject: [PATCH 40/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E5=8E=BB=E6=8E=89body=E8=AF=B7=E6=B1=82=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/test/components/body/ApiBody.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/components/body/ApiBody.vue b/frontend/src/business/components/api/test/components/body/ApiBody.vue
index ce63d08e89..4f52b04f58 100644
--- a/frontend/src/business/components/api/test/components/body/ApiBody.vue
+++ b/frontend/src/business/components/api/test/components/body/ApiBody.vue
@@ -17,7 +17,6 @@
                      :scenario="scenario"
                      :extract="extract"
                      type="body"
-                     :description="$t('api_test.request.parameters_desc')"
                      v-if="body.isKV()"/>
     <div class="body-raw" v-if="body.type == 'Raw'">
       <ms-code-edit :mode="body.format" :enable-format="false" :read-only="isReadOnly" :data.sync="body.raw" :modes="modes" ref="codeEdit"/>

From ab31922cb7b751d1bc76af62b7d0b9ad30dbdaa4 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 26 Nov 2020 09:53:30 +0800
Subject: [PATCH 41/52] =?UTF-8?q?fix:=20session=E5=88=B0=E6=9C=9F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/ajax.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js
index c285fe0655..3482f67ebd 100644
--- a/frontend/src/common/js/ajax.js
+++ b/frontend/src/common/js/ajax.js
@@ -43,7 +43,9 @@ export default {
         success(response.data);
       } else {
         window.console.warn(response.data);
-        Message.warning(response.data.message || response.data);
+        if (response.data.message) {
+          Message.warning(response.data.message);
+        }
       }
       result.loading = false;
     }

From 479beca2092d0d7f94ed625d88bf1c2a0ab71e5d Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 26 Nov 2020 10:34:38 +0800
Subject: [PATCH 42/52] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/components/TestPlanEdit.vue         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index 3ac4fc0864..71fe3ec801 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -193,8 +193,7 @@ export default {
           let param = {};
           Object.assign(param, this.form);
           param.name = param.name.trim();
-          if (param.name === '') {
-            this.$warning(this.$t('test_track.plan.input_plan_name'));
+          if (!this.validate(param)) {
             return;
           }
           param.workspaceId = localStorage.getItem(WORKSPACE_ID);
@@ -227,6 +226,17 @@ export default {
         }
       });
     },
+    validate(param) {
+      if (param.name === '') {
+        this.$warning(this.$t('test_track.plan.input_plan_name'));
+        return false;
+      }
+      if (param.plannedStartTime > param.plannedEndTime) {
+        this.$warning(this.$t('commons.date.data_time_error'));
+        return false;
+      }
+      return true;
+    },
     editTestPlan(param) {
       this.$post('/test/plan/' + this.operationType, param, () => {
         this.$success(this.$t('commons.save_success'));

From 23a450119e0fdffe4e12a2c19777304f0b151f19 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 26 Nov 2020 10:56:04 +0800
Subject: [PATCH 43/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E6=8E=A5=E5=8F=A3=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=8D=E5=B1=95=E7=A4=BA=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
index d7c92408b0..5cbc729bf8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
@@ -133,6 +133,7 @@
         LEFT JOIN user ON user.id = r.user_id
         <where>
             r.test_id = #{testId}
+            and r.status != 'Debug'
         </where>
         ORDER BY r.update_time DESC
     </select>

From 9e62022ae909037edb2161eceb190dccb3b494e4 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 26 Nov 2020 11:52:43 +0800
Subject: [PATCH 44/52] =?UTF-8?q?chore:=20=E5=90=8C=E6=AD=A5=20submodule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 57d6f78efa..bb494fc68a 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
+Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 71d57ae5d7..8a972a1987 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 71d57ae5d7f8bb5c93a29504ac6f2300dc189ce9
+Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8

From 0941dc971ea5f99afa9c535034d2b8bb024fc1fe Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 26 Nov 2020 12:11:36 +0800
Subject: [PATCH 45/52] =?UTF-8?q?fix:=E5=AE=9A=E6=97=B6=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BA=BA=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/notice/service/NoticeService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
index af3257e0cc..c6299cad34 100644
--- a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
@@ -70,7 +70,7 @@ public class NoticeService {
 
     private void checkUserIdExist(String userId, MessageDetail list) {
         MessageTaskExample example = new MessageTaskExample();
-        example.createCriteria().andUserIdEqualTo(userId).andEventEqualTo(list.getEvent()).andTypeEqualTo(list.getType()).andTaskTypeEqualTo(list.getTaskType()).andWebhookEqualTo(list.getWebhook());
+        example.createCriteria().andUserIdEqualTo(userId).andEventEqualTo(list.getEvent()).andTypeEqualTo(list.getType()).andTaskTypeEqualTo(list.getTaskType()).andWebhookEqualTo(list.getWebhook()).andTestIdEqualTo(list.getTestId()).andOrganizationIdEqualTo(list.getOrganizationId());
         if (messageTaskMapper.countByExample(example) > 0) {
             MSException.throwException(Translator.get("message_task_already_exists"));
         }
@@ -151,4 +151,4 @@ public class NoticeService {
         example.createCriteria().andIdentificationEqualTo(identification);
         return messageTaskMapper.deleteByExample(example);
     }
-}
\ No newline at end of file
+}

From 5b2b7fd32225bd11e4effa423ad1be345b6d8a83 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 26 Nov 2020 12:35:52 +0800
Subject: [PATCH 46/52] fix:

---
 .../java/io/metersphere/notice/service/NoticeService.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
index c6299cad34..0ea8427b8e 100644
--- a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
@@ -51,7 +51,7 @@ public class NoticeService {
         long time = System.currentTimeMillis();
         String identification = UUID.randomUUID().toString();
         list.getUserIds().forEach(m -> {
-            checkUserIdExist(m, list);
+            checkUserIdExist(m, list,orgId);
             MessageTask message = new MessageTask();
             message.setId(UUID.randomUUID().toString());
             message.setEvent(list.getEvent());
@@ -68,9 +68,9 @@ public class NoticeService {
         });
     }
 
-    private void checkUserIdExist(String userId, MessageDetail list) {
+    private void checkUserIdExist(String userId, MessageDetail list,String orgId) {
         MessageTaskExample example = new MessageTaskExample();
-        example.createCriteria().andUserIdEqualTo(userId).andEventEqualTo(list.getEvent()).andTypeEqualTo(list.getType()).andTaskTypeEqualTo(list.getTaskType()).andWebhookEqualTo(list.getWebhook()).andTestIdEqualTo(list.getTestId()).andOrganizationIdEqualTo(list.getOrganizationId());
+        example.createCriteria().andUserIdEqualTo(userId).andEventEqualTo(list.getEvent()).andTypeEqualTo(list.getType()).andTaskTypeEqualTo(list.getTaskType()).andWebhookEqualTo(list.getWebhook()).andTestIdEqualTo(list.getTestId()).andOrganizationIdEqualTo(orgId);
         if (messageTaskMapper.countByExample(example) > 0) {
             MSException.throwException(Translator.get("message_task_already_exists"));
         }

From 48684262415b487e368aa62cbcdbf8b305cfd561 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 26 Nov 2020 13:01:07 +0800
Subject: [PATCH 47/52] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/report/PerformanceReportView.vue   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 106a75fb54..1257af30cd 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -271,12 +271,14 @@ export default {
       let reset = this.exportReportReset;
 
       this.$nextTick(function () {
-        html2canvas(document.getElementById('performanceReportExport'), {
-          scale: 2
-        }).then(function (canvas) {
-          exportPdf(name, [canvas]);
-          reset();
-        });
+        setTimeout(() => {
+          html2canvas(document.getElementById('performanceReportExport'), {
+            scale: 2
+          }).then(function (canvas) {
+            exportPdf(name, [canvas]);
+            reset();
+          });
+        }, 1000);
       });
     },
     exportReportReset() {

From a2e7e0ae883914e9b44a717d02e5f93753c1622e Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 26 Nov 2020 13:55:29 +0800
Subject: [PATCH 48/52] fix:

---
 .../organization/components/ScheduleTaskNotification.vue         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
index 7df26ff04d..42002779e3 100644
--- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
@@ -200,7 +200,6 @@ export default {
     },
     addTask(data) {
       let list = [];
-      data.isSet = false;
       list.push(data);
       let param = {};
       param.messageDetail = list;

From d3386b748a4bf892021c4ef0b7a9df8294b6bcc6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 26 Nov 2020 15:04:10 +0800
Subject: [PATCH 49/52] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack        |  2 +-
 .../view/comonents/report/TestCaseReportView.vue  | 15 ++++++++-------
 frontend/src/business/components/xpack            |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index bb494fc68a..57d6f78efa 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
+Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
index 04fdb70864..4e0cec0520 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
@@ -210,14 +210,15 @@
         let reset = this.exportReportReset;
 
         this.$nextTick(function () {
-          html2canvas(document.getElementById('testCaseReportExport'), {
-            scale: 2
-          }).then(function(canvas) {
-            exportPdf(name, [canvas]);
-            reset();
-          });
+          setTimeout(() => {
+            html2canvas(document.getElementById('testCaseReportExport'), {
+              scale: 2
+            }).then(function(canvas) {
+              exportPdf(name, [canvas]);
+              reset();
+            });
+          }, 1000);
         });
-
       },
       exportReportReset() {
         this.reportExportVisible = false;
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 8a972a1987..71d57ae5d7 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8
+Subproject commit 71d57ae5d7f8bb5c93a29504ac6f2300dc189ce9

From 977db2fdb2e3495c7b24ec8f2e4db5c45f649cbe Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 26 Nov 2020 15:35:05 +0800
Subject: [PATCH 50/52] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEtestId=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/notice/service/NoticeService.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
index 0ea8427b8e..dd0a6237b1 100644
--- a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
@@ -13,6 +13,7 @@ import io.metersphere.notice.controller.request.MessageRequest;
 import io.metersphere.notice.domain.MessageDetail;
 import io.metersphere.notice.domain.MessageSettingDetail;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -70,7 +71,11 @@ public class NoticeService {
 
     private void checkUserIdExist(String userId, MessageDetail list,String orgId) {
         MessageTaskExample example = new MessageTaskExample();
-        example.createCriteria().andUserIdEqualTo(userId).andEventEqualTo(list.getEvent()).andTypeEqualTo(list.getType()).andTaskTypeEqualTo(list.getTaskType()).andWebhookEqualTo(list.getWebhook()).andTestIdEqualTo(list.getTestId()).andOrganizationIdEqualTo(orgId);
+        if (StringUtils.isBlank(list.getTestId())) {
+            example.createCriteria().andUserIdEqualTo(userId).andEventEqualTo(list.getEvent()).andTypeEqualTo(list.getType()).andTaskTypeEqualTo(list.getTaskType()).andWebhookEqualTo(list.getWebhook()).andOrganizationIdEqualTo(orgId);
+        } else {
+            example.createCriteria().andUserIdEqualTo(userId).andEventEqualTo(list.getEvent()).andTypeEqualTo(list.getType()).andTaskTypeEqualTo(list.getTaskType()).andWebhookEqualTo(list.getWebhook()).andTestIdEqualTo(list.getTestId()).andOrganizationIdEqualTo(orgId);
+        }
         if (messageTaskMapper.countByExample(example) > 0) {
             MSException.throwException(Translator.get("message_task_already_exists"));
         }

From 3e9767ef88a6161bde0604c1fbbc58c5908793de Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 26 Nov 2020 15:38:47 +0800
Subject: [PATCH 51/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E5=BC=95=E7=94=A8=E7=8E=AF=E5=A2=83=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=A1=B9=E7=9B=AE=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/components/ApiScenarioSelect.vue         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue b/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue
index 45d2fa98d5..9397384d6d 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue
@@ -72,6 +72,7 @@ export default {
   methods: {
     search() {
       this.condition.excludeId = this.excludeId;
+      this.condition.projectId = this.projectId;
       let url = "/api/list/" + this.currentPage + "/" + this.pageSize;
       this.result = this.$post(url, this.condition, response => {
         let data = response.data;

From 7659f1d11b3d668b14bc6e1a9e37036b267a0b71 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 26 Nov 2020 15:54:18 +0800
Subject: [PATCH 52/52] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E9=81=BF=E5=85=8D=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=B7=E6=96=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/components/MsScheduleConfig.vue         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/common/components/MsScheduleConfig.vue b/frontend/src/business/components/common/components/MsScheduleConfig.vue
index e78c3f3a38..9cb5093e99 100644
--- a/frontend/src/business/components/common/components/MsScheduleConfig.vue
+++ b/frontend/src/business/components/common/components/MsScheduleConfig.vue
@@ -73,7 +73,9 @@
         this.$emit('scheduleChange');
       },
       flashResultList() {
-        this.$refs.crontabResult.expressionChange();
+        if (this.$refs.crontabResult) {
+          this.$refs.crontabResult.expressionChange();
+        }
       },
       cancelRefresh() {
         if (this.refreshScheduler) {