From f569412165decd75ebace6425f864f8a486229c3 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 1 Jul 2020 13:56:21 +0800
Subject: [PATCH 01/31] =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
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 f8ec130ecf..04c19ebdf2 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -9,7 +9,7 @@
 
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="id" label="ID"/>
-        <el-table-column prop="name" :label="$t('commons.username')" width="200"/>
+        <el-table-column prop="name" :label="$t('commons.name')" width="200"/>
         <el-table-column :label="$t('commons.role')" width="120">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.roles"/>

From 25f7063b3747e4b27589904e7832506f0da24de0 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 1 Jul 2020 14:38:59 +0800
Subject: [PATCH 02/31] smtp

---
 .../components/settings/system/SystemParameterSetting.vue   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index cb35f98613..7fab04bb4b 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -115,6 +115,7 @@
 
     activated() {
       this.query()
+      this.change()
     },
     methods: {
       changeType() {
@@ -161,6 +162,7 @@
         })
       },
       edit() {
+        this.change()
         this.showEdit = false;
         this.showSave = true;
         this.showCancel = true;
@@ -197,11 +199,13 @@
         })
       },
       cancel() {
+        this.query();
         this.showEdit = true;
         this.showCancel = false;
         this.showSave = false;
         this.show = true;
-        this.query();
+        this.change()
+
       }
 
     }

From 6a1168a187da46d89548b3c9e2dd0b76e299be10 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 2 Jul 2020 11:42:52 +0800
Subject: [PATCH 03/31] =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/system/SystemParameterSetting.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index 7fab04bb4b..8c30d63387 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -95,7 +95,7 @@
           host: [
             {
               required: true,
-              message: ''
+              message: ' '
             },
           ],
           port: [

From 6ea67253565457661c348257719ac1f9713861a8 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 2 Jul 2020 18:21:28 +0800
Subject: [PATCH 04/31] =?UTF-8?q?fix=20=E7=BC=96=E8=BE=91=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=AC=A1=E6=98=BE=E7=A4=BA=E7=9A=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/project/MsProject.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index f2640e214d..6ff67f70e2 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -39,7 +39,7 @@
       </el-card>
     </ms-main-container>
 
-    <el-dialog :title="title" :visible.sync="createVisible">
+    <el-dialog :title="title" :visible.sync="createVisible" destroy-on-close>
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"></el-input>

From 9cfaa9ab73094be1a1b233899c8a6d7c6ee8e56a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 3 Jul 2020 15:31:10 +0800
Subject: [PATCH 05/31] =?UTF-8?q?fix=20=E6=96=B0=E5=BB=BA=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=8B=BE=E9=80=89=E4=BF=9D=E5=AD=98=E5=B9=B6=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E5=88=9B=E5=BB=BA=E5=90=8E=EF=BC=8C=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/case/components/TestCaseEdit.vue      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 811a5e328e..e33534999b 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -355,6 +355,13 @@
                 this.$success(this.$t('commons.save_success'));
                 if (this.operationType == 'add' && this.isCreateContinue) {
                   this.form.name = '';
+                  this.form.prerequisite = '';
+                  this.form.steps = [{
+                    num: 1,
+                    desc: '',
+                    result: ''
+                  }];
+                  this.form.remark = '';
                   this.$emit("refresh");
                   return;
                 }

From 785705e69e1d261bf9e410cb25f2a15fe5e93c89 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 6 Jul 2020 11:53:36 +0800
Subject: [PATCH 06/31] =?UTF-8?q?api=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/dto/scenario/Request.java |   2 +
 .../api/dto/scenario/Scenario.java            |   1 +
 .../components/api/test/ApiTestConfig.vue     |   2 +-
 .../test/components/ApiEnvironmentConfig.vue  |   5 +-
 .../api/test/components/ApiRequestConfig.vue  |  22 ++--
 .../api/test/components/ApiRequestForm.vue    | 123 ++++++++++++------
 .../api/test/components/ApiScenarioConfig.vue |   7 +-
 .../api/test/components/ApiScenarioForm.vue   |  76 ++++++++++-
 .../collapse/ApiRequestMethodSelect.vue       |  28 ++++
 .../business/components/api/test/model/JMX.js |  12 +-
 .../api/test/model/ScenarioModel.js           |  50 ++++++-
 11 files changed, 264 insertions(+), 64 deletions(-)
 create mode 100644 frontend/src/business/components/api/test/components/collapse/ApiRequestMethodSelect.vue

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/Request.java b/backend/src/main/java/io/metersphere/api/dto/scenario/Request.java
index ce55174015..ccd1e0ec95 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/Request.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/Request.java
@@ -11,6 +11,8 @@ public class Request {
     private String name;
     private String url;
     private String method;
+    private Boolean useEnvironment;
+    private String path;
     private List<KeyValue> parameters;
     private List<KeyValue> headers;
     private Body body;
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java b/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
index df60feb3b6..960702d351 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
@@ -8,6 +8,7 @@ import java.util.List;
 public class Scenario {
     private String name;
     private String url;
+    private String environmentId;
     private List<KeyValue> variables;
     private List<KeyValue> headers;
     private List<Request> requests;
diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 997d32852e..a2e4eef886 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -50,7 +50,7 @@
               <ms-schedule-config :schedule="test.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule" :check-open="checkScheduleEdit"/>
             </el-row>
           </el-header>
-          <ms-api-scenario-config :is-read-only="isReadOnly" :scenarios="test.scenarioDefinition" ref="config"/>
+          <ms-api-scenario-config :is-read-only="isReadOnly" :scenarios="test.scenarioDefinition" :project-id="test.projectId" ref="config"/>
         </el-container>
       </el-card>
     </div>
diff --git a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
index fb042867e1..369539926f 100644
--- a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="'环境配置'" :visible.sync="visible" class="environment-dialog">
+  <el-dialog :title="'环境配置'" :visible.sync="visible" class="environment-dialog" @close="close">
     <el-container v-loading="result.loading">
       <ms-aside-item :title="'环境列表'" :data="environments" :item-operators="environmentOperators" :add-fuc="addEnvironment"
                      :delete-fuc="deleteEnvironment" @itemSelected="environmentSelected" ref="environmentItems"/>
@@ -93,6 +93,9 @@
         },
         getDefaultEnvironment() {
           return {variables: [{}], headers: [{}], protocol: 'https', projectId: this.projectId};
+        },
+        close() {
+          this.$emit('close');
         }
       }
     }
diff --git a/frontend/src/business/components/api/test/components/ApiRequestConfig.vue b/frontend/src/business/components/api/test/components/ApiRequestConfig.vue
index 201847a40e..ba10a02d7a 100644
--- a/frontend/src/business/components/api/test/components/ApiRequestConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiRequestConfig.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="request-container">
-    <draggable :list="requests" group="Request" class="request-draggable" ghost-class="request-ghost">
-      <div class="request-item" v-for="(request, index) in requests" :key="index" @click="select(request)"
+    <draggable :list="this.scenario.requests" group="Request" class="request-draggable" ghost-class="request-ghost">
+      <div class="request-item" v-for="(request, index) in this.scenario.requests" :key="index" @click="select(request)"
            :class="{'selected': isSelected(request)}">
         <el-row type="flex">
           <div class="request-method">
@@ -40,7 +40,7 @@
     components: {draggable},
 
     props: {
-      requests: Array,
+      scenario: Object,
       open: Function,
       isReadOnly: {
         type: Boolean,
@@ -65,15 +65,15 @@
     methods: {
       createRequest: function () {
         let request = new Request();
-        this.requests.push(request);
+        this.scenario.requests.push(request);
       },
       copyRequest: function (index) {
-        let request = this.requests[index];
-        this.requests.push(new Request(request));
+        let request = this.scenario.requests[index];
+        this.scenario.requests.push(new Request(request));
       },
       deleteRequest: function (index) {
-        this.requests.splice(index, 1);
-        if (this.requests.length === 0) {
+        this.scenario.requests.splice(index, 1);
+        if (this.scenario.requests.length === 0) {
           this.createRequest();
         }
       },
@@ -88,13 +88,17 @@
         }
       },
       select: function (request) {
+        request.environment = this.scenario.environment;
+        if (!request.useEnvironment) {
+          request.useEnvironment = false;
+        }
         this.selected = request;
         this.open(request);
       }
     },
 
     created() {
-      this.select(this.requests[0]);
+      this.select(this.scenario.requests[0]);
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/test/components/ApiRequestForm.vue b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
index 83184a8476..6b5c052f4b 100644
--- a/frontend/src/business/components/api/test/components/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
@@ -1,30 +1,47 @@
 <template>
   <el-form :model="request" :rules="rules" ref="request" label-width="100px">
+
     <el-form-item :label="$t('api_test.request.name')" prop="name">
       <el-input :disabled="isReadOnly" v-model="request.name" maxlength="100" show-word-limit/>
     </el-form-item>
 
-    <el-form-item :label="$t('api_test.request.url')" prop="url">
+    <el-form-item v-if="!request.useEnvironment" :label="$t('api_test.request.url')" prop="url" class="adjust-margin-bottom">
       <el-input :disabled="isReadOnly" v-model="request.url" maxlength="500"
                 :placeholder="$t('api_test.request.url_description')" @change="urlChange" clearable>
-        <el-select :disabled="isReadOnly" v-model="request.method" slot="prepend" class="request-method-select"
-                   @change="methodChange">
-          <el-option label="GET" value="GET"/>
-          <el-option label="POST" value="POST"/>
-          <el-option label="PUT" value="PUT"/>
-          <el-option label="PATCH" value="PATCH"/>
-          <el-option label="DELETE" value="DELETE"/>
-          <el-option label="OPTIONS" value="OPTIONS"/>
-          <el-option label="HEAD" value="HEAD"/>
-          <el-option label="CONNECT" value="CONNECT"/>
-        </el-select>
+        <template  v-slot:prepend>
+          <ApiRequestMethodSelect :is-read-only="isReadOnly" :request="request" @change="methodChange"/>
+        </template>
       </el-input>
     </el-form-item>
 
+    <el-form-item v-if="request.useEnvironment" :label="'请求路径'" prop="path">
+      <el-input :disabled="isReadOnly" v-model="request.path" maxlength="500"
+                :placeholder="'例如：/login'" @change="pathChange" clearable>
+        <template  v-slot:prepend>
+          <ApiRequestMethodSelect :is-read-only="isReadOnly" :request="request" @change="methodChange"/>
+        </template>
+      </el-input>
+    </el-form-item>
+
+    <el-form-item v-if="request.useEnvironment" :label="'请求地址'" class="adjust-margin-bottom">
+      <el-tag class="environment-display">
+        <span class="environment-name">{{request.environment ? request.environment.name + ': ' : ''}}</span>
+        <span class="environment-url">{{displayUrl}}</span>
+        <span v-if="!displayUrl" class="environment-url-tip">请在场景中配置环境</span>
+      </el-tag>
+    </el-form-item>
+
+    <el-form-item>
+      <el-switch
+        v-model="request.useEnvironment"
+        active-text="引用环境" @change="useEnvironmentChange">
+      </el-switch>
+    </el-form-item>
+
     <el-tabs v-model="activeName">
       <el-tab-pane :label="$t('api_test.request.parameters')" name="parameters">
         <ms-api-key-value :is-read-only="isReadOnly" :items="request.parameters"
-                          :description="$t('api_test.request.parameters_desc')" @change="parametersChange"/>
+                          :description="$t('api_test.request.parameters_desc')"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('api_test.request.headers')" name="headers">
         <ms-api-key-value :is-read-only="isReadOnly" :items="request.headers"/>
@@ -48,10 +65,11 @@
   import MsApiAssertions from "./assertion/ApiAssertions";
   import {KeyValue, Request} from "../model/ScenarioModel";
   import MsApiExtract from "./extract/ApiExtract";
+  import ApiRequestMethodSelect from "./collapse/ApiRequestMethodSelect";
 
   export default {
     name: "MsApiRequestForm",
-    components: {MsApiExtract, MsApiAssertions, MsApiBody, MsApiKeyValue},
+    components: {ApiRequestMethodSelect, MsApiExtract, MsApiAssertions, MsApiBody, MsApiKeyValue},
     props: {
       request: Request,
       isReadOnly: {
@@ -77,6 +95,9 @@
           url: [
             {max: 500, required: true, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
             {validator: validateURL, trigger: 'blur'}
+          ],
+          path: [
+            {max: 500, required: true, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
           ]
         }
       }
@@ -85,39 +106,43 @@
     methods: {
       urlChange() {
         if (!this.request.url) return;
-
-        let parameters = [];
+        let url = this.getURL(this.addProtocol(this.request.url));
+        if (url) {
+          this.request.url = decodeURIComponent(url.origin + url.pathname);
+        }
+      },
+      pathChange() {
+        if (!this.request.path) return;
+        if (!this.request.path.startsWith('/')) {
+          this.request.path = '/' + this.request.path;
+        }
+        let url = this.getURL(this.displayUrl);
+        this.request.path = decodeURIComponent(url.pathname);
+        this.request.urlWirhEnv = decodeURIComponent(url.origin + url.pathname);
+      },
+      getURL(urlStr) {
         try {
-          let url = new URL(this.addProtocol(this.request.url));
+          let url = new URL(urlStr);
           url.searchParams.forEach((value, key) => {
             if (key && value) {
-              parameters.push(new KeyValue(key, value));
+              this.request.parameters.splice(0, 0, new KeyValue(key, value));
             }
           });
-          // 添加一个空的，用于填写
-          parameters.push(new KeyValue());
-          this.request.parameters = parameters;
-          this.request.url = this.getURL(url);
+          return url;
         } catch (e) {
-          this.$error(this.$t('api_test.request.url_invalid'), 2000)
+          this.$error(this.$t('api_test.request.url_invalid'), 2000);
         }
-
       },
       methodChange(value) {
         if (value === 'GET' && this.activeName === 'body') {
           this.activeName = 'parameters';
         }
       },
-      parametersChange(parameters) {
-        if (!this.request.url) return;
-        let url = new URL(this.addProtocol(this.request.url));
-        url.search = "";
-        parameters.forEach(function (parameter) {
-          if (parameter.name && parameter.value) {
-            url.searchParams.append(parameter.name, parameter.value);
-          }
-        })
-        this.request.url = this.getURL(url);
+      useEnvironmentChange(value) {
+        if (value && !this.request.environment) {
+          this.$error('请先在场景中添加环境配置！' , 2000);
+          this.request.useEnvironment = false;
+        }
       },
       addProtocol(url) {
         if (url) {
@@ -126,15 +151,15 @@
           }
         }
         return url;
-      },
-      getURL(url) {
-        return decodeURIComponent(url.origin + url.pathname) + "?" + url.searchParams.toString();
       }
     },
 
     computed: {
       isNotGet() {
         return this.request.method !== "GET";
+      },
+      displayUrl() {
+        return this.request.environment ? this.request.environment.protocol + '://' + this.request.environment.socket + (this.request.path ? this.request.path : '') : '';
       }
     }
   }
@@ -144,4 +169,28 @@
   .request-method-select {
     width: 110px;
   }
+
+  .el-tag {
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+  }
+
+  .environment-display {
+    font-size: 14px;
+  }
+
+  .environment-name {
+    font-weight: bold;
+    font-style: italic;
+  }
+
+  .adjust-margin-bottom {
+    margin-bottom: 10px;
+  }
+
+  .environment-url-tip {
+    color: #F56C6C;
+  }
+
 </style>
diff --git a/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue b/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
index 4f23a49b9c..ac4c55851f 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
@@ -25,7 +25,7 @@
                   </el-dropdown-menu>
                 </el-dropdown>
               </template>
-              <ms-api-request-config :is-read-only="isReadOnly" :requests="scenario.requests" :open="select"/>
+              <ms-api-request-config :is-read-only="isReadOnly" :scenario="scenario" :open="select"/>
             </ms-api-collapse-item>
           </draggable>
         </ms-api-collapse>
@@ -35,8 +35,8 @@
 
     <el-main class="scenario-main">
       <div class="scenario-form">
-        <ms-api-scenario-form :is-read-only="isReadOnly" :scenario="selected" v-if="isScenario"/>
-        <ms-api-request-form :is-read-only="isReadOnly" :request="selected" v-if="isRequest"/>
+        <ms-api-scenario-form :is-read-only="isReadOnly" :scenario="selected" :project-id="projectId" v-if="isScenario"/>
+        <ms-api-request-form :is-read-only="isReadOnly" :request="selected" :project-id="projectId" v-if="isRequest"/>
       </div>
     </el-main>
   </el-container>
@@ -66,6 +66,7 @@
 
     props: {
       scenarios: Array,
+      projectId: String,
       isReadOnly: {
         type: Boolean,
         default: false
diff --git a/frontend/src/business/components/api/test/components/ApiScenarioForm.vue b/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
index 32522275ea..ebcea5b6fa 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
@@ -1,12 +1,19 @@
 <template>
-  <el-form :model="scenario" :rules="rules" ref="scenario" label-width="100px">
+  <el-form :model="scenario" :rules="rules" ref="scenario" label-width="100px" v-loading="result.loading">
     <el-form-item :label="$t('api_test.scenario.name')" prop="name">
       <el-input :disabled="isReadOnly" v-model="scenario.name" maxlength="100" show-word-limit/>
     </el-form-item>
 
-    <!--    <el-form-item :label="$t('api_test.scenario.base_url')" prop="url">-->
-    <!--      <el-input :placeholder="$t('api_test.scenario.base_url_description')" v-model="scenario.url" maxlength="100"/>-->
-    <!--    </el-form-item>-->
+      <el-form-item :label="'环境'">
+        <el-select :disabled="isReadOnly" v-model="scenario.environmentId" class="environment-select" @change="environmentChange" clearable>
+          <el-option v-for="(environment, index) in environments" :key="index" :label="environment.name + ': ' + environment.protocol + '://' + environment.socket" :value="environment.id"/>
+          <el-button class="environment-button" size="mini" type="primary" @click="openEnvironmentConfig">环境配置</el-button>
+        </el-select>
+      </el-form-item>
+
+<!--      <el-form-item :label="$t('api_test.scenario.base_url')" prop="url">-->
+<!--        <el-input :placeholder="$t('api_test.scenario.base_url_description')" v-model="scenario.url" maxlength="200"/>-->
+<!--      </el-form-item>-->
 
     <el-tabs v-model="activeName">
       <el-tab-pane :label="$t('api_test.scenario.variables')" name="parameters">
@@ -16,28 +23,38 @@
         <ms-api-key-value :is-read-only="isReadOnly" :items="scenario.headers" :description="$t('api_test.scenario.kv_description')"/>
       </el-tab-pane>
     </el-tabs>
+
+    <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
+
   </el-form>
+
 </template>
 
 <script>
   import MsApiKeyValue from "./ApiKeyValue";
   import {Scenario} from "../model/ScenarioModel";
   import MsApiScenarioVariables from "./ApiScenarioVariables";
+  import ApiEnvironmentConfig from "./ApiEnvironmentConfig";
 
   export default {
     name: "MsApiScenarioForm",
-    components: {MsApiScenarioVariables, MsApiKeyValue},
+    components: {ApiEnvironmentConfig, MsApiScenarioVariables, MsApiKeyValue},
     props: {
       scenario: Scenario,
+      projectId: String,
       isReadOnly: {
         type: Boolean,
         default: false
       }
     },
-
+    created() {
+      this.getEnvironments();
+    },
     data() {
       return {
+        result: {},
         activeName: "parameters",
+        environments: [],
         rules: {
           name: [
             {max: 100, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'}
@@ -47,10 +64,57 @@
           ]
         }
       }
+    },
+    methods: {
+      getEnvironments() {
+        if (this.projectId) {
+          this.result = this.$get('/api/environment/list/' + this.projectId, response => {
+            this.environments = response.data;
+            for (let i in this.environments) {
+              if (this.environments[i].id === this.scenario.environmentId) {
+                this.scenario.environment = this.environments[i];
+                break;
+              }
+            }
+          });
+        }
+      },
+      environmentChange(value) {
+        for (let i in this.environments) {
+          if (this.environments[i].id === value) {
+            this.scenario.environment = this.environments[i];
+            this.scenario.requests.forEach(request => {
+              request.environment = this.environments[i];
+            });
+            break;
+          }
+        }
+        if (!value) {
+          this.scenario.environment = undefined;
+          this.scenario.requests.forEach(request => {
+            request.environment = undefined;
+          });
+        }
+      },
+      openEnvironmentConfig() {
+        this.$refs.environmentConfig.open(this.projectId);
+      },
+      environmentConfigClose() {
+        this.getEnvironments();
+      }
     }
   }
 </script>
 
 <style scoped>
 
+  .environment-select {
+    width: 100%;
+  }
+
+  .environment-button {
+    margin-left: 20px;
+    padding: 7px;
+  }
+
 </style>
diff --git a/frontend/src/business/components/api/test/components/collapse/ApiRequestMethodSelect.vue b/frontend/src/business/components/api/test/components/collapse/ApiRequestMethodSelect.vue
new file mode 100644
index 0000000000..dc62dd8ed0
--- /dev/null
+++ b/frontend/src/business/components/api/test/components/collapse/ApiRequestMethodSelect.vue
@@ -0,0 +1,28 @@
+<template>
+  <el-select :disabled="isReadOnly" v-model="request.method" class="request-method-select" @change="change">
+    <el-option label="GET" value="GET"/>
+    <el-option label="POST" value="POST"/>
+    <el-option label="PUT" value="PUT"/>
+    <el-option label="PATCH" value="PATCH"/>
+    <el-option label="DELETE" value="DELETE"/>
+    <el-option label="OPTIONS" value="OPTIONS"/>
+    <el-option label="HEAD" value="HEAD"/>
+    <el-option label="CONNECT" value="CONNECT"/>
+  </el-select>
+</template>
+
+<script>
+    export default {
+      name: "ApiRequestMethodSelect",
+      props: ['isReadOnly', 'request'],
+      methods: {
+        change(value) {
+          this.$emit('change', value);
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/api/test/model/JMX.js b/frontend/src/business/components/api/test/model/JMX.js
index 0df2cad08f..2d82c1facb 100644
--- a/frontend/src/business/components/api/test/model/JMX.js
+++ b/frontend/src/business/components/api/test/model/JMX.js
@@ -225,9 +225,15 @@ export class HTTPSamplerProxy extends DefaultTestElement {
     super('HTTPSamplerProxy', 'HttpTestSampleGui', 'HTTPSamplerProxy', testName);
     this.request = request || {};
 
-    this.stringProp("HTTPSampler.domain", this.request.hostname);
-    this.stringProp("HTTPSampler.protocol", this.request.protocol.split(":")[0]);
-    this.stringProp("HTTPSampler.path", this.request.pathname);
+    if (request.useEnvironment) {
+      this.stringProp("HTTPSampler.domain", this.request.environment.domain);
+      this.stringProp("HTTPSampler.protocol", this.request.environment.protocol);
+      this.stringProp("HTTPSampler.path", this.request.path);
+    } else {
+      this.stringProp("HTTPSampler.domain", this.request.hostname);
+      this.stringProp("HTTPSampler.protocol", this.request.protocol.split(":")[0]);
+      this.stringProp("HTTPSampler.path", this.request.pathname);
+    }
     this.stringProp("HTTPSampler.method", this.request.method);
     this.stringProp("HTTPSampler.contentEncoding", this.request.encoding, "UTF-8");
     if (!this.request.port) {
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 3932e5a099..58938aa5e1 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -147,6 +147,7 @@ export class Scenario extends BaseConfig {
     this.variables = [];
     this.headers = [];
     this.requests = [];
+    this.environmentId = undefined;
 
     this.set(options);
     this.sets({variables: KeyValue, headers: KeyValue, requests: Request}, options);
@@ -164,11 +165,14 @@ export class Scenario extends BaseConfig {
 
   isValid() {
     for (let i = 0; i < this.requests.length; i++) {
-      if (this.requests[i].isValid()) {
-        return true;
+      if (!this.requests[i].isValid()) {
+        return false;
       }
     }
-    return false;
+    if (!this.name) {
+      return false;
+    }
+    return true;
   }
 }
 
@@ -177,12 +181,15 @@ export class Request extends BaseConfig {
     super();
     this.name = undefined;
     this.url = undefined;
+    this.path = undefined;
     this.method = undefined;
     this.parameters = [];
     this.headers = [];
     this.body = undefined;
     this.assertions = undefined;
     this.extract = undefined;
+    this.environment = undefined;
+    this.useEnvironment = undefined;
 
     this.set(options);
     this.sets({parameters: KeyValue, headers: KeyValue}, options);
@@ -198,7 +205,7 @@ export class Request extends BaseConfig {
   }
 
   isValid() {
-    return !!this.url && !!this.method
+    return ((!this.useEnvironment && !!this.url) || (this.useEnvironment && !!this.path && this.environment)) && !!this.method
   }
 }
 
@@ -392,6 +399,9 @@ class JMXRequest {
       this.method = request.method;
       this.hostname = decodeURIComponent(url.hostname);
       this.pathname = decodeURIComponent(url.pathname);
+      this.path = decodeURIComponent(request.path);
+      this.useEnvironment = request.useEnvironment;
+      this.environment = request.environment;
       this.port = url.port;
       this.protocol = url.protocol.split(":")[0];
       if (this.method.toUpperCase() !== "GET") {
@@ -463,6 +473,22 @@ class JMXGenerator {
   }
 
   addScenarioVariables(threadGroup, scenario) {
+    let scenarioVariableKeys = new Set();
+    scenario.variables.forEach(item => {
+      scenarioVariableKeys.add(item.name);
+    });
+    let environment = scenario.environment;
+    if (environment) {
+      let envVariables = environment.variables;
+      if (!(envVariables instanceof Array)) {
+        envVariables = JSON.parse(environment.variables);
+        envVariables.forEach(item => {
+          if (item.name && !scenarioVariableKeys.has(item.name)) {
+            scenario.variables.push(new KeyValue(item.name, item.value));
+          }
+        })
+      }
+    }
     let args = this.filterKV(scenario.variables);
     if (args.length > 0) {
       let name = scenario.name + " Variables"
@@ -471,6 +497,22 @@ class JMXGenerator {
   }
 
   addScenarioHeaders(threadGroup, scenario) {
+    let scenarioHeaderKeys = new Set();
+    scenario.headers.forEach(item => {
+      scenarioHeaderKeys.add(item.name);
+    });
+    let environment = scenario.environment;
+    if (environment) {
+      let envHeaders = environment.headers;
+      if (!(envHeaders instanceof Array)) {
+        envHeaders = JSON.parse(environment.headers);
+        envHeaders.forEach(item => {
+          if (item.name && !scenarioHeaderKeys.has(item.name)) {
+            scenario.headers.push(new KeyValue(item.name, item.value));
+          }
+        })
+      }
+    }
     let headers = this.filterKV(scenario.headers);
     if (headers.length > 0) {
       let name = scenario.name + " Headers"

From 44dd7ca6531ac7b1c07c6381b7b231be24d1bd2e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Jul 2020 15:26:44 +0800
Subject: [PATCH 07/31] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/report/components/RequestStatistics.vue        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/business/components/performance/report/components/RequestStatistics.vue b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
index 907eb7abea..0bc7d644c2 100644
--- a/frontend/src/business/components/performance/report/components/RequestStatistics.vue
+++ b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
@@ -131,12 +131,15 @@
         let transactions = data.reduce(function (total, currentValue) {
           return total + parseFloat(currentValue.transactions);
         }, 0);
+        transactions = transactions.toFixed(2);
         let received = data.reduce(function (total, currentValue) {
           return total + parseFloat(currentValue.received);
         }, 0);
+        received = received.toFixed(2);
         let sent = data.reduce(function (total, currentValue) {
           return total + parseFloat(currentValue.sent);
         }, 0);
+        sent = sent.toFixed(2);
 
         let error = (Math.round(failSize / allSamples * 10000) / 100) + '%';
         let averageTime = (averageTimeTotal / allSamples).toFixed(2);

From 0652e2906d7ccd2e1e5e6df7cea0dd2fcba4c4f4 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Jul 2020 15:32:05 +0800
Subject: [PATCH 08/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E7=9A=84=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
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 04c19ebdf2..3bbf45d3f8 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -162,7 +162,7 @@
     </el-dialog>
 
     <!--Modify user information in system settings-->
-    <el-dialog :title="$t('user.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true"
+    <el-dialog :title="$t('user.modify')" :visible.sync="updateVisible" width="35%" :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="form" label-position="right" label-width="120px" size="small" :rules="rule" ref="updateUserForm">
         <el-form-item label="ID" prop="id">

From d38cffe9524f1068736eecd269878f58f1dd3568 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Jul 2020 18:17:31 +0800
Subject: [PATCH 09/31] ldap

---
 .../ldap/controller/LdapController.java          | 12 +++++++++---
 .../io/metersphere/ldap/dao/PersonRepoImpl.java  | 16 +++++++++++-----
 .../io/metersphere/ldap/service/LdapService.java | 12 ++++++++----
 .../resources/i18n/messages_en_US.properties     |  5 +++--
 .../resources/i18n/messages_zh_CN.properties     |  4 ++--
 .../resources/i18n/messages_zh_TW.properties     |  3 ++-
 .../components/settings/system/LdapSetting.vue   | 13 +++++++++----
 7 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
index 506629dcaf..3c89a17c4d 100644
--- a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
+++ b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
@@ -6,6 +6,7 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.controller.ResultHolder;
 import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.i18n.Translator;
+import io.metersphere.ldap.domain.Person;
 import io.metersphere.ldap.service.LdapService;
 import io.metersphere.ldap.domain.LdapInfo;
 import io.metersphere.service.SystemParameterService;
@@ -34,20 +35,25 @@ public class LdapController {
             MSException.throwException(Translator.get("ldap_authentication_not_enabled"));
         }
 
-        ldapService.authenticate(request);
+        Person person = ldapService.authenticate(request);
 
         SecurityUtils.getSubject().getSession().setAttribute("authenticate", "ldap");
 
         String username = request.getUsername();
         String password = request.getPassword();
 
+        String email = person.getEmail();
+
+        if (StringUtils.isBlank(email)) {
+            MSException.throwException(Translator.get("login_fail_email_null"));
+        }
+
         User u = userService.selectUser(request.getUsername());
         if (u == null) {
             User user = new User();
             user.setId(username);
             user.setName(username);
-            // todo user email ?
-            user.setEmail(username + "@fit2cloud.com");
+            user.setEmail(email);
             user.setPassword(password);
             userService.createUser(user);
         } else {
diff --git a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
index d453f4c6ef..106885bc77 100644
--- a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
+++ b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
@@ -32,6 +32,10 @@ public class PersonRepoImpl implements PersonRepo {
 
     public boolean authenticate(String dn, String credentials) {
         LdapTemplate ldapTemplate = getConnection();
+        return authenticate(dn, credentials, ldapTemplate);
+    }
+
+    private boolean authenticate(String dn, String credentials, LdapTemplate ldapTemplate) {
         DirContext ctx = null;
         try {
             ctx = ldapTemplate.getContextSource().getContext(dn, credentials);
@@ -58,9 +62,8 @@ public class PersonRepoImpl implements PersonRepo {
     }
 
     @Override
-    public List findByName(String name) {
+    public List<Person> findByName(String name) {
         LdapTemplate ldapTemplate = getConnection();
-        ldapTemplate.setIgnorePartialResultException(true);
         LdapQuery query = query().where("cn").is(name);
         return ldapTemplate.search(query, getContextMapper());
     }
@@ -68,7 +71,6 @@ public class PersonRepoImpl implements PersonRepo {
     @Override
     public String getDnForUser(String uid) {
         LdapTemplate ldapTemplate = getConnection();
-        ldapTemplate.setIgnorePartialResultException(true);
         List<String> result = ldapTemplate.search(
                 query().where("cn").is(uid),
                 new AbstractContextMapper() {
@@ -112,7 +114,6 @@ public class PersonRepoImpl implements PersonRepo {
 
         String credentials = EncryptUtils.aesDecrypt(password).toString();
 
-
         LdapContextSource sourceLdapCtx = new LdapContextSource();
         sourceLdapCtx.setUrl(url);
         sourceLdapCtx.setUserDn(dn);
@@ -120,8 +121,13 @@ public class PersonRepoImpl implements PersonRepo {
         sourceLdapCtx.setBase(ou);
         sourceLdapCtx.setDirObjectFactory(DefaultDirObjectFactory.class);
         sourceLdapCtx.afterPropertiesSet();
+        LdapTemplate ldapTemplate = new LdapTemplate(sourceLdapCtx);
+        ldapTemplate.setIgnorePartialResultException(true);
 
-        return new LdapTemplate(sourceLdapCtx);
+        // ldapTemplate 是否可用
+        authenticate(dn, credentials, ldapTemplate);
+
+        return ldapTemplate;
     }
 
     private void preConnect(String url, String dn, String ou, String password) {
diff --git a/backend/src/main/java/io/metersphere/ldap/service/LdapService.java b/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
index f5bc5b573a..ee7cd48190 100644
--- a/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
+++ b/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
@@ -5,6 +5,7 @@ import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.i18n.Translator;
 import io.metersphere.ldap.dao.PersonRepoImpl;
 import io.metersphere.ldap.domain.LdapInfo;
+import io.metersphere.ldap.domain.Person;
 import org.springframework.ldap.CommunicationException;
 import org.springframework.stereotype.Service;
 
@@ -18,18 +19,19 @@ public class LdapService {
     private PersonRepoImpl personRepo;
 
 
-    public void authenticate(LoginRequest request) {
+    public Person authenticate(LoginRequest request) {
         String dn = null;
         String username = request.getUsername();
         String credentials = request.getPassword();
 
+        List<Person> personList = null;
         try {
             // select user by sAMAccountName
-            List user = personRepo.findByName(username);
+            personList = personRepo.findByName(username);
 
-            if (user.size() == 1) {
+            if (personList.size() == 1) {
                 dn = personRepo.getDnForUser(username);
-            } else if (user.size() == 0) {
+            } else if (personList.size() == 0) {
                 MSException.throwException(Translator.get("user_not_exist") + username);
             } else {
                 MSException.throwException(Translator.get("find_more_user"));
@@ -38,6 +40,8 @@ public class LdapService {
             MSException.throwException(Translator.get("ldap_connect_fail"));
         }
         personRepo.authenticate(dn, credentials);
+
+        return personList.get(0);
     }
 
     public void testConnect(LdapInfo ldap) {
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index a4408167b7..8b5589147e 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -120,7 +120,8 @@ ldap_dn_is_null=LDAP binding DN is empty
 ldap_ou_is_null=LDAP parameter OU is empty
 ldap_password_is_null=LDAP password is empty
 ldap_connect_fail=Connection failed
-authentication_failed=User authentication failed
+authentication_failed=User authentication failed,wrong user name or password
 user_not_found_or_not_unique=User does not exist or is not unique
 find_more_user=Multiple users found
-ldap_authentication_not_enabled=LDAP authentication is not enabled
\ No newline at end of file
+ldap_authentication_not_enabled=LDAP authentication is not enabled
+login_fail_email_null=Login failed, user mailbox is empty
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 08f872d5d9..c62db227c8 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -120,10 +120,10 @@ ldap_dn_is_null=LDAP绑定DN为空
 ldap_ou_is_null=LDAP参数OU为空
 ldap_password_is_null=LDAP密码为空
 ldap_connect_fail=连接失败
-authentication_failed=用户认证失败
+authentication_failed=用户认证失败,用户名或密码错误
 user_not_found_or_not_unique=用户不存在或者不唯一
 find_more_user=查找到多个用户
 ldap_authentication_not_enabled=LDAP认证未启用
-
+login_fail_email_null=登录失败，用户邮箱为空
 
 
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 41ae94a8cc..096e4d6a4f 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -120,7 +120,8 @@ ldap_dn_is_null=LDAP綁定DN為空
 ldap_ou_is_null=LDAP參數OU為空
 ldap_password_is_null=LDAP密碼為空
 ldap_connect_fail=連接失敗
-authentication_failed=用戶認證失敗
+authentication_failed=用戶認證失敗,用戶名或密碼錯誤
 user_not_found_or_not_unique=用戶不存在或者不唯一
 find_more_user=查找到多個用戶
 ldap_authentication_not_enabled=LDAP認證未啟用
+login_fail_email_null=登錄失敗，用戶郵箱為空
diff --git a/frontend/src/business/components/settings/system/LdapSetting.vue b/frontend/src/business/components/settings/system/LdapSetting.vue
index a300155338..0c710e8a5b 100644
--- a/frontend/src/business/components/settings/system/LdapSetting.vue
+++ b/frontend/src/business/components/settings/system/LdapSetting.vue
@@ -18,9 +18,9 @@
         <el-form-item :label="$t('ldap.filter')" prop="filter">
           <el-input v-model="form.filter" :placeholder="$t('ldap.input_filter_placeholder')"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('ldap.mapping')" prop="mapping">
-          <el-input v-model="form.mapping" :placeholder="$t('ldap.input_mapping')"></el-input>
-        </el-form-item>
+<!--        <el-form-item :label="$t('ldap.mapping')" prop="mapping">-->
+<!--          <el-input v-model="form.mapping" :placeholder="$t('ldap.input_mapping')"></el-input>-->
+<!--        </el-form-item>-->
         <el-form-item :label="$t('ldap.open')" prop="open">
           <el-checkbox v-model="form.open"></el-checkbox>
         </el-form-item>
@@ -29,7 +29,7 @@
       <div>
         <el-button type="primary" size="small" :disabled="!show" @click="testConnection">{{$t('ldap.test_connect')}}
         </el-button>
-        <el-button type="primary" size="small" :disabled="!show" @click="testLogin">{{$t('ldap.test_login')}}
+        <el-button type="primary" size="small" :disabled="!showLogin || !show" @click="testLogin">{{$t('ldap.test_login')}}
         </el-button>
         <el-button v-if="showEdit" size="small" @click="edit">{{$t('ldap.edit')}}</el-button>
         <el-button type="success" v-if="showSave" size="small" @click="save('form')">{{$t('commons.save')}}</el-button>
@@ -75,6 +75,7 @@
         showEdit: true,
         showSave: false,
         showCancel: false,
+        showLogin: false,
         loginVisible: false,
         rules: {
           url: {required: true, message: this.$t('ldap.input_url'), trigger: ['change', 'blur']},
@@ -120,6 +121,9 @@
         }
         this.result = this.$post("/ldap/test/connect", this.form, response => {
           this.$success(this.$t('commons.connection_successful'));
+          this.showLogin = true;
+        }, () => {
+          this.showLogin = false;
         })
       },
       testLogin() {
@@ -172,6 +176,7 @@
               this.showEdit = true;
               this.showSave = false;
               this.showCancel = false;
+              this.showLogin = false;
               this.$success(this.$t('commons.save_success'));
               this.init();
             });

From 334160273370f8deee69f3406c01e69ae4868ac4 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 7 Jul 2020 09:13:32 +0800
Subject: [PATCH 10/31] i18n

---
 .../service/ApiTestEnvironmentService.java    | 15 +++++
 .../resources/i18n/messages_en_US.properties  |  1 +
 .../resources/i18n/messages_zh_CN.properties  |  1 +
 .../resources/i18n/messages_zh_TW.properties  |  1 +
 .../components/api/test/ApiTestConfig.vue     |  4 +-
 .../test/components/ApiEnvironmentConfig.vue  |  6 +-
 .../api/test/components/ApiRequestForm.vue    | 12 ++--
 .../api/test/components/ApiScenarioForm.vue   |  4 +-
 .../environment/EnvironmentEdit.vue           | 18 +++---
 .../common/components/MsScheduleConfig.vue    |  2 +-
 .../common/components/MsScheduleEdit.vue      | 14 ++---
 .../components/common/cron/Crontab.vue        | 37 ++++++-----
 .../components/common/cron/CrontabDay.vue     | 24 +++----
 .../components/common/cron/CrontabHour.vue    | 16 ++---
 .../components/common/cron/CrontabMin.vue     | 18 +++---
 .../components/common/cron/CrontabMouth.vue   | 16 ++---
 .../components/common/cron/CrontabResult.vue  | 10 +--
 .../components/common/cron/CrontabSecond.vue  | 16 ++---
 .../components/common/cron/CrontabWeek.vue    | 26 +++++---
 .../components/common/cron/CrontabYear.vue    | 18 +++---
 .../test/EditPerformanceTestPlan.vue          |  2 +-
 .../plan/view/comonents/TestCaseRelevance.vue |  2 +-
 frontend/src/i18n/en-US.js                    | 60 +++++++++++++++++-
 frontend/src/i18n/zh-CN.js                    | 62 ++++++++++++++++++-
 frontend/src/i18n/zh-TW.js                    | 60 +++++++++++++++++-
 25 files changed, 326 insertions(+), 119 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
index 07c72adb23..e2e485ae2a 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
@@ -3,6 +3,8 @@ package io.metersphere.api.service;
 import io.metersphere.base.domain.ApiTestEnvironmentExample;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import io.metersphere.base.mapper.ApiTestEnvironmentMapper;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.i18n.Translator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,7 +39,20 @@ public class ApiTestEnvironmentService {
 
     public String add(ApiTestEnvironmentWithBLOBs apiTestEnvironmentWithBLOBs) {
         apiTestEnvironmentWithBLOBs.setId(UUID.randomUUID().toString());
+        checkEnvironmentExist(apiTestEnvironmentWithBLOBs);
         apiTestEnvironmentMapper.insert(apiTestEnvironmentWithBLOBs);
         return apiTestEnvironmentWithBLOBs.getId();
     }
+
+    private void checkEnvironmentExist (ApiTestEnvironmentWithBLOBs environment) {
+        if (environment.getName() != null) {
+            ApiTestEnvironmentExample example = new ApiTestEnvironmentExample();
+            example.createCriteria()
+                    .andNameEqualTo(environment.getName())
+                    .andProjectIdEqualTo(environment.getProjectId());
+            if (apiTestEnvironmentMapper.selectByExample(example).size() > 0) {
+                MSException.throwException(Translator.get("api_test_environment_already_exists"));
+            }
+        }
+    }
 }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index a4408167b7..22f943b725 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -66,6 +66,7 @@ organization_id_is_null=Organization ID cannot be null
 #api
 api_load_script_error=Load script error
 api_report_is_null="Report is null, can't update"
+api_test_environment_already_exists="Api test environment already exists"
 #test case
 test_case_node_level=level
 test_case_node_level_tip=The node tree maximum depth is
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 08f872d5d9..11f1f06f30 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -66,6 +66,7 @@ organization_id_is_null=组织 ID 不能为空
 #api
 api_load_script_error=读取脚本失败
 api_report_is_null="测试报告是未生成，无法更新"
+api_test_environment_already_exists="已存在该名称的环境配置"
 #test case
 test_case_node_level=层
 test_case_node_level_tip=模块树最大深度为
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 41ae94a8cc..8dd582dfbf 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -66,6 +66,7 @@ organization_id_is_null=組織 ID 不能為空
 #api
 api_load_script_error=讀取腳本失敗
 api_report_is_null="測試報告是未生成，無法更新"
+api_test_environment_already_exists="已存在該名稱的環境配置"
 #test case
 test_case_node_level=層
 test_case_node_level_tip=模塊樹最大深度為
diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index a2e4eef886..299a7883c2 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -228,13 +228,13 @@
           url = '/api/schedule/update';
         }
         this.$post(url, param, response => {
-          this.$success('保存成功');
+          this.$success(this.$t('commons.save_success'));
           this.getTest(this.test.id);
         });
       },
       checkScheduleEdit() {
         if (this.create) {
-          this.$message('请先保存测试');
+          this.$message(this.$t('api_test.environment.please_save_test'));
           return false;
         }
         return true;
diff --git a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
index 369539926f..277ed420de 100644
--- a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-dialog :title="'环境配置'" :visible.sync="visible" class="environment-dialog" @close="close">
+  <el-dialog :title="$t('api_test.environment.environment_config')" :visible.sync="visible" class="environment-dialog" @close="close">
     <el-container v-loading="result.loading">
-      <ms-aside-item :title="'环境列表'" :data="environments" :item-operators="environmentOperators" :add-fuc="addEnvironment"
+      <ms-aside-item :title="$t('api_test.environment.environment_list')" :data="environments" :item-operators="environmentOperators" :add-fuc="addEnvironment"
                      :delete-fuc="deleteEnvironment" @itemSelected="environmentSelected" ref="environmentItems"/>
       <environment-edit :environment="currentEnvironment" ref="environmentEdit"/>
     </el-container>
@@ -51,7 +51,7 @@
         },
         deleteEnvironment(environment) {
           this.result = this.$get('/api/environment/delete/' + environment.id, response => {
-            this.$success('删除成功');
+            this.$success(this.$t('commons.delete_success'));
             this.getEnvironments();
           });
         },
diff --git a/frontend/src/business/components/api/test/components/ApiRequestForm.vue b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
index 6b5c052f4b..0dd42b9a21 100644
--- a/frontend/src/business/components/api/test/components/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
@@ -14,27 +14,27 @@
       </el-input>
     </el-form-item>
 
-    <el-form-item v-if="request.useEnvironment" :label="'请求路径'" prop="path">
+    <el-form-item v-if="request.useEnvironment" :label="$t('api_test.request.path')" prop="path">
       <el-input :disabled="isReadOnly" v-model="request.path" maxlength="500"
-                :placeholder="'例如：/login'" @change="pathChange" clearable>
+                :placeholder="$t('api_test.request.path_description')" @change="pathChange" clearable>
         <template  v-slot:prepend>
           <ApiRequestMethodSelect :is-read-only="isReadOnly" :request="request" @change="methodChange"/>
         </template>
       </el-input>
     </el-form-item>
 
-    <el-form-item v-if="request.useEnvironment" :label="'请求地址'" class="adjust-margin-bottom">
+    <el-form-item v-if="request.useEnvironment" :label="$t('api_test.request.address')" class="adjust-margin-bottom">
       <el-tag class="environment-display">
         <span class="environment-name">{{request.environment ? request.environment.name + ': ' : ''}}</span>
         <span class="environment-url">{{displayUrl}}</span>
-        <span v-if="!displayUrl" class="environment-url-tip">请在场景中配置环境</span>
+        <span v-if="!displayUrl" class="environment-url-tip">{{$t('api_test.request.please_configure_environment_in_scenario')}}</span>
       </el-tag>
     </el-form-item>
 
     <el-form-item>
       <el-switch
         v-model="request.useEnvironment"
-        active-text="引用环境" @change="useEnvironmentChange">
+        :active-text="$t('api_test.request.refer_to_environment')" @change="useEnvironmentChange">
       </el-switch>
     </el-form-item>
 
@@ -140,7 +140,7 @@
       },
       useEnvironmentChange(value) {
         if (value && !this.request.environment) {
-          this.$error('请先在场景中添加环境配置！' , 2000);
+          this.$error(this.$t('api_test.request.please_add_environment_to_scenario'), 2000);
           this.request.useEnvironment = false;
         }
       },
diff --git a/frontend/src/business/components/api/test/components/ApiScenarioForm.vue b/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
index ebcea5b6fa..a447a2ec8e 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
@@ -4,10 +4,10 @@
       <el-input :disabled="isReadOnly" v-model="scenario.name" maxlength="100" show-word-limit/>
     </el-form-item>
 
-      <el-form-item :label="'环境'">
+      <el-form-item :label="$t('api_test.environment.environment')">
         <el-select :disabled="isReadOnly" v-model="scenario.environmentId" class="environment-select" @change="environmentChange" clearable>
           <el-option v-for="(environment, index) in environments" :key="index" :label="environment.name + ': ' + environment.protocol + '://' + environment.socket" :value="environment.id"/>
-          <el-button class="environment-button" size="mini" type="primary" @click="openEnvironmentConfig">环境配置</el-button>
+          <el-button class="environment-button" size="mini" type="primary" @click="openEnvironmentConfig">{{$t('api_test.environment.environment_config')}}</el-button>
         </el-select>
       </el-form-item>
 
diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
index 597da96abc..c635add186 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
@@ -2,13 +2,13 @@
   <el-main v-loading="result.loading">
     <el-form :model="environment" :rules="rules" ref="from">
 
-      <span>环境名称</span>
+      <span>{{$t('api_test.environment.name')}}</span>
       <el-form-item
         prop="name">
-        <el-input v-model="environment.name" :placeholder="'请填写名称'" clearable></el-input>
+        <el-input v-model="environment.name" :placeholder="this.$t('commons.input_name')" clearable></el-input>
       </el-form-item>
 
-      <span>环境域名</span>
+      <span>{{$t('api_test.environment.socket')}}</span>
       <el-form-item
         prop="socket">
         <el-input v-model="environment.socket" :placeholder="$t('api_test.request.url_description')" clearable>
@@ -21,14 +21,14 @@
         </el-input>
       </el-form-item>
 
-      <span>全局变量</span>
+      <span>{{$t('api_test.environment.globalVariable')}}</span>
       <ms-api-scenario-variables :items="environment.variables"/>
 
-      <span>请求头</span>
+      <span>{{$t('api_test.request.headers')}}</span>
       <ms-api-key-value :items="environment.headers"/>
 
       <div class="environment-footer">
-        <el-button type="primary" @click="save">保存</el-button>
+        <el-button type="primary" @click="save">{{this.$t('commons.save')}}</el-button>
       </div>
 
     </el-form>
@@ -53,7 +53,7 @@
       data() {
         let socketValidator = (rule, value, callback) => {
           if (!this.validateSocket(value)) {
-            callback(new Error('格式错误'));
+            callback(new Error(this.$t('commons.formatErr')));
           } else {
             callback();
           }
@@ -61,7 +61,7 @@
         return {
           result: {},
           rules: {
-            name :[{required: true, message: '请填写名称', trigger: 'blur'}],
+            name :[{required: true, message: this.$t('commons.input_name'), trigger: 'blur'}],
             socket :[{required: true, validator: socketValidator, trigger: 'blur'}],
           },
         }
@@ -84,7 +84,7 @@
           }
           this.result = this.$post(url, param,  response => {
             this.environment.id = response.data;
-            this.$success("保存成功");
+            this.$success(this.$t('commons.save_success'));
           });
         },
         buildParam() {
diff --git a/frontend/src/business/components/common/components/MsScheduleConfig.vue b/frontend/src/business/components/common/components/MsScheduleConfig.vue
index e5608bf925..c2a2ad3d83 100644
--- a/frontend/src/business/components/common/components/MsScheduleConfig.vue
+++ b/frontend/src/business/components/common/components/MsScheduleConfig.vue
@@ -10,7 +10,7 @@
         <crontab-result v-show="false" :ex="schedule.value" ref="crontabResult" @resultListChange="resultListChange"/>
       </div>
       <div>
-        <span :class="{'disable-character': !schedule.enable}"> 下次执行时间：{{this.recentList.length > 0 ? this.recentList[0] : '未设置'}} </span>
+        <span :class="{'disable-character': !schedule.enable}"> {{$t('schedule.next_execution_time')}}：{{this.recentList.length > 0 ? this.recentList[0] : $t('schedule.not_set')}} </span>
       </div>
     </div>
 </template>
diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index 8d96dbf9c3..71a85de668 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -1,17 +1,17 @@
 <template>
-  <el-dialog width="30%" class="schedule-edit" :title="'编辑定时任务'" :visible.sync="dialogVisible"  @close="close">
+  <el-dialog width="30%" class="schedule-edit" :title="$t('schedule.edit_timer_task')" :visible.sync="dialogVisible"  @close="close">
     <div id="app">
       <el-form :model="form" :rules="rules" ref="from">
         <el-form-item
-          :placeholder="'请输入 Cron 表达式'"
+          :placeholder="$t('schedule.please_input_cron_expression')"
           prop="cronValue">
           <el-input v-model="form.cronValue" placeholder class="inp"/>
-          <el-button type="primary" @click="showCronDialog">生成 Cron</el-button>
-          <el-button type="primary" @click="saveCron">保存</el-button>
+          <el-button type="primary" @click="showCronDialog">{{$t('schedule.generate_expression')}}</el-button>
+          <el-button type="primary" @click="saveCron">{{$t('commons.save')}}</el-button>
         </el-form-item>
         <crontab-result :ex="form.cronValue" ref="crontabResult" />
       </el-form>
-      <el-dialog title="生成 cron" :visible.sync="showCron" :modal="false">
+      <el-dialog :title="$t('schedule.generate_expression')" :visible.sync="showCron" :modal="false">
         <crontab @hide="showCron=false" @fill="crontabFill" :expression="schedule.value" ref="crontab"/>
       </el-dialog>
     </div>
@@ -46,9 +46,9 @@
           const validateCron = (rule, cronValue, callback) => {
             let customValidate = this.customValidate(this.getIntervalTime());
             if (!cronValidate(cronValue)) {
-              callback(new Error('Cron 表达式格式错误'));
+              callback(new Error(this.$t('schedule.cron_expression_format_error')));
             } else if(!this.intervalShortValidate()) {
-              callback(new Error('间隔时间请大于 5 分钟'));
+              callback(new Error(this.$t('schedule.cron_expression_interval_short_error')));
             } else if (!customValidate.pass){
               callback(new Error(customValidate.info));
             } else {
diff --git a/frontend/src/business/components/common/cron/Crontab.vue b/frontend/src/business/components/common/cron/Crontab.vue
index 7fff078e42..fd3ca6337c 100644
--- a/frontend/src/business/components/common/cron/Crontab.vue
+++ b/frontend/src/business/components/common/cron/Crontab.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-tabs type="border-card">
-      <el-tab-pane label="秒" v-if="shouldHide('second')">
+      <el-tab-pane :label="$t('schedule.cron.seconds')" v-if="shouldHide('second')">
         <crontab-second
           @update="updateContabValue"
           :check="checkNumber"
@@ -9,7 +9,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="分钟" v-if="shouldHide('min')">
+      <el-tab-pane :label="$t('schedule.cron.minutes')"  v-if="shouldHide('min')">
         <crontab-min
           @update="updateContabValue"
           :check="checkNumber"
@@ -18,7 +18,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="小时" v-if="shouldHide('hour')">
+      <el-tab-pane :label="$t('schedule.cron.hours')" v-if="shouldHide('hour')">
         <crontab-hour
           @update="updateContabValue"
           :check="checkNumber"
@@ -27,7 +27,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="日" v-if="shouldHide('day')">
+      <el-tab-pane :label="$t('schedule.cron.day')" v-if="shouldHide('day')">
         <crontab-day
           @update="updateContabValue"
           :check="checkNumber"
@@ -36,7 +36,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="月" v-if="shouldHide('mouth')">
+      <el-tab-pane :label="$t('schedule.cron.month')" v-if="shouldHide('mouth')">
         <crontab-mouth
           @update="updateContabValue"
           :check="checkNumber"
@@ -45,7 +45,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="周" v-if="shouldHide('week')">
+      <el-tab-pane :label="$t('schedule.cron.weeks')" v-if="shouldHide('week')">
         <crontab-week
           @update="updateContabValue"
           :check="checkNumber"
@@ -54,7 +54,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="年" v-if="shouldHide('year')">
+      <el-tab-pane :label="$t('schedule.cron.years')" v-if="shouldHide('year')">
         <crontab-year @update="updateContabValue"
                       :check="checkNumber"
                       :cron="contabValueObj"
@@ -64,11 +64,11 @@
 
     <div class="popup-main">
       <div class="popup-result-container">
-        <p class="title">时间表达式</p>
+        <p class="title">{{$t('schedule.cron.time_expression')}}</p>
         <table>
           <thead>
           <th v-for="item of tabTitles" width="40" :key="item">{{item}}</th>
-          <th>crontab完整表达式</th>
+          <th>{{$t('schedule.cron.complete_expression')}}</th>
           </thead>
           <tbody>
           <td>
@@ -101,9 +101,9 @@
       <crontab-result :ex="contabValueString" ref="crontabResult"/>
 
       <div class="pop_btn">
-        <el-button size="small" type="primary" @click="submitFill">确定</el-button>
-        <el-button size="small" type="warning" @click="clearCron">重置</el-button>
-        <el-button size="small" @click="hidePopup">取消</el-button>
+        <el-button size="small" type="primary" @click="submitFill">{{$t('commons.confirm')}}</el-button>
+        <el-button size="small" type="warning" @click="clearCron">{{$t('api_test.reset')}}</el-button>
+        <el-button size="small" @click="hidePopup">{{$t('commons.cancel')}}</el-button>
       </div>
     </div>
   </div>
@@ -123,7 +123,14 @@
     name: "Crontab",
     data() {
       return {
-        tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
+        tabTitles: [
+          this.$t('schedule.cron.seconds'),
+          this.$t('schedule.cron.minutes'),
+          this.$t('schedule.cron.hours'),
+          this.$t('schedule.cron.day'),
+          this.$t('schedule.cron.month'),
+          this.$t('schedule.cron.weeks'),
+          this.$t('schedule.cron.years')],
         tabActive: 0,
         myindex: 0,
         contabValueObj: {
@@ -179,7 +186,7 @@
         "updateContabValue", name, value, from;
         this.contabValueObj[name] = value;
         if (from && from !== name) {
-          console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
+          // console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
           this.changeRadio(name, value);
         }
       },
@@ -310,7 +317,7 @@
       },
       clearCron() {
         // 还原选择项
-        ("准备还原");
+        // ("准备还原");
         this.contabValueObj = {
           second: "*",
           min: "*",
diff --git a/frontend/src/business/components/common/cron/CrontabDay.vue b/frontend/src/business/components/common/cron/CrontabDay.vue
index 9f7593a0e1..16778448df 100644
--- a/frontend/src/business/components/common/cron/CrontabDay.vue
+++ b/frontend/src/business/components/common/cron/CrontabDay.vue
@@ -2,49 +2,49 @@
 	<el-form size="small">
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="1">
-				日，允许的通配符[, - * / L M]
+        {{$t('schedule.cron.day')}}，{{$t('schedule.cron.day_allowed_wildcards')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="2">
-				不指定
+        {{$t('schedule.cron.not_specify')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
-				周期从
+				{{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
 				<el-input-number v-model='cycle01' :min="0" :max="31" /> -
-				<el-input-number v-model='cycle02' :min="0" :max="31" /> 日
+				<el-input-number v-model='cycle02' :min="0" :max="31" /> {{$t('schedule.cron.day')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
-				从
-				<el-input-number v-model='average01' :min="0" :max="31" /> 号开始，每
-				<el-input-number v-model='average02' :min="0" :max="31" /> 日执行一次
+        {{$t('schedule.cron.from')}}
+				<el-input-number v-model='average01' :min="0" :max="31" /> {{$t('schedule.cron.day_unit')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+				<el-input-number v-model='average02' :min="0" :max="31" /> {{$t('schedule.cron.day')}}{{$t('schedule.cron.execute_once')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="5">
-				每月
-				<el-input-number v-model='workday' :min="0" :max="31" /> 号最近的那个工作日
+        {{$t('schedule.cron.every')}}{{$t('schedule.cron.month')}}
+				<el-input-number v-model='workday' :min="0" :max="31" /> {{$t('schedule.cron.day_unit')}}{{$t('schedule.cron.last_working_day')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="6">
-				本月最后一天
+        {{$t('schedule.cron.last_working_day')}}{{$t('schedule.cron.last_day_of_the_month')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="7">
-				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+        {{$t('schedule.cron.specify')}}
+				<el-select clearable v-model="checkboxList" :placeholder="$t('schedule.cron.multi_select')" multiple style="width:100%">
 					<el-option v-for="item in 31" :key="item" :value="item">{{item}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/frontend/src/business/components/common/cron/CrontabHour.vue b/frontend/src/business/components/common/cron/CrontabHour.vue
index 06140c33cf..36585b4a97 100644
--- a/frontend/src/business/components/common/cron/CrontabHour.vue
+++ b/frontend/src/business/components/common/cron/CrontabHour.vue
@@ -2,13 +2,13 @@
 	<el-form size="small">
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="1">
-				小时，允许的通配符[, - * /]
-			</el-radio>
+        {{$t('schedule.cron.hours')}}，{{$t('schedule.cron.allowed_wildcards')}}
+      </el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="2">
-				周期从
+        {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
 				<el-input-number v-model='cycle01' :min="0" :max="60" /> -
 				<el-input-number v-model='cycle02' :min="0" :max="60" /> 小时
 			</el-radio>
@@ -16,16 +16,16 @@
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
-				从
-				<el-input-number v-model='average01' :min="0" :max="60" /> 小时开始，每
-				<el-input-number v-model='average02' :min="0" :max="60" /> 小时执行一次
+        {{$t('schedule.cron.from')}}
+				<el-input-number v-model='average01' :min="0" :max="60" /> {{$t('schedule.cron.hours')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+				<el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.hours')}}{{$t('schedule.cron.execute_once')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
-				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+        {{$t('schedule.cron.specify')}}
+				<el-select clearable v-model="checkboxList" :placeholder="$t('schedule.cron.multi_select')" multiple style="width:100%">
 					<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/frontend/src/business/components/common/cron/CrontabMin.vue b/frontend/src/business/components/common/cron/CrontabMin.vue
index 6a188c2413..9871c6b740 100644
--- a/frontend/src/business/components/common/cron/CrontabMin.vue
+++ b/frontend/src/business/components/common/cron/CrontabMin.vue
@@ -2,30 +2,30 @@
 	<el-form size="small">
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="1">
-				分钟，允许的通配符[, - * /]
-			</el-radio>
+        {{$t('schedule.cron.minutes')}}，{{$t('schedule.cron.allowed_wildcards')}}
+      </el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="2">
-				周期从
+        {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
 				<el-input-number v-model='cycle01' :min="0" :max="60" /> -
-				<el-input-number v-model='cycle02' :min="0" :max="60" /> 分钟
+				<el-input-number v-model='cycle02' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
-				从
-				<el-input-number v-model='average01' :min="0" :max="60" /> 分钟开始，每
-				<el-input-number v-model='average02' :min="0" :max="60" /> 分钟执行一次
+        {{$t('schedule.cron.from')}}
+				<el-input-number v-model='average01' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+				<el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.execute_once')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
-				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+        {{$t('schedule.cron.specify')}}
+				<el-select clearable v-model="checkboxList" :placeholder="$t('schedule.cron.multi_select')" multiple style="width:100%">
 					<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/frontend/src/business/components/common/cron/CrontabMouth.vue b/frontend/src/business/components/common/cron/CrontabMouth.vue
index 027e2d16cf..f1d6545b8b 100644
--- a/frontend/src/business/components/common/cron/CrontabMouth.vue
+++ b/frontend/src/business/components/common/cron/CrontabMouth.vue
@@ -2,30 +2,30 @@
 	<el-form size='small'>
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="1">
-				月，允许的通配符[, - * /]
+        {{$t('schedule.cron.month')}}，{{$t('schedule.cron.allowed_wildcards')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="2">
-				周期从
+        {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
 				<el-input-number v-model='cycle01' :min="1" :max="12" /> -
-				<el-input-number v-model='cycle02' :min="1" :max="12" /> 月
+				<el-input-number v-model='cycle02' :min="1" :max="12" /> {{$t('schedule.cron.month')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
-				从
-				<el-input-number v-model='average01' :min="1" :max="12" /> 月开始，每
-				<el-input-number v-model='average02' :min="1" :max="12" /> 月月执行一次
+        {{$t('schedule.cron.from')}}
+				<el-input-number v-model='average01' :min="1" :max="12" /> {{$t('schedule.cron.month')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+				<el-input-number v-model='average02' :min="1" :max="12" /> {{$t('schedule.cron.month')}}{{$t('schedule.cron.execute_once')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
-				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+        {{$t('schedule.cron.specify')}}
+				<el-select clearable v-model="checkboxList" :placeholder="$t('schedule.cron.multi_select')" multiple style="width:100%">
 					<el-option v-for="item in 12" :key="item" :value="item">{{item}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/frontend/src/business/components/common/cron/CrontabResult.vue b/frontend/src/business/components/common/cron/CrontabResult.vue
index bd443d3c5c..10a69029b5 100644
--- a/frontend/src/business/components/common/cron/CrontabResult.vue
+++ b/frontend/src/business/components/common/cron/CrontabResult.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="popup-result">
-		<p class="title">最近5次运行时间</p>
+		<p class="title">{{$t('schedule.cron.recent_run_time')}}</p>
 		<ul class="popup-result-scroll">
 			<template>
 				<li v-for='item in resultList' :key="item">{{item}}</li>
@@ -340,12 +340,12 @@ export default {
 			}
 			// 判断100年内的结果条数
 			if (resultArr.length == 0) {
-				this.resultList = ['没有达到条件的结果！'];
+				this.resultList = [this.$t('schedule.cron.no_qualifying_results')];
 			} else {
 				this.resultList = resultArr;
-				if (resultArr.length !== 5) {
-					this.resultList.push('最近100年内只有上面' + resultArr.length + '条结果！')
-				}
+				// if (resultArr.length !== 5) {
+				// 	this.resultList.push('最近100年内只有上面' + resultArr.length + '条结果！')
+				// }
 			}
 
 			this.$emit("resultListChange", this.resultList);
diff --git a/frontend/src/business/components/common/cron/CrontabSecond.vue b/frontend/src/business/components/common/cron/CrontabSecond.vue
index 6d950439e0..903c93d7e4 100644
--- a/frontend/src/business/components/common/cron/CrontabSecond.vue
+++ b/frontend/src/business/components/common/cron/CrontabSecond.vue
@@ -2,30 +2,30 @@
   <el-form size="small">
     <el-form-item>
       <el-radio v-model='radioValue' :label="1">
-        秒，允许的通配符[, - * /]
+        {{$t('schedule.cron.seconds')}}，{{$t('schedule.cron.allowed_wildcards')}}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model='radioValue' :label="2">
-        周期从
+        {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
         <el-input-number v-model='cycle01' :min="0" :max="60" /> -
-        <el-input-number v-model='cycle02' :min="0" :max="60" /> 秒
+        <el-input-number v-model='cycle02' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model='radioValue' :label="3">
-        从
-        <el-input-number v-model='average01' :min="0" :max="60" /> 秒开始，每
-        <el-input-number v-model='average02' :min="0" :max="60" /> 秒执行一次
+        {{$t('schedule.cron.from')}}
+        <el-input-number v-model='average01' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+        <el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.execute_once')}}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model='radioValue' :label="4">
-        指定
-        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+        {{$t('schedule.cron.specify')}}
+        <el-select clearable v-model="checkboxList" :placeholder="$t('schedule.cron.multi_select')" multiple style="width:100%">
           <el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
         </el-select>
       </el-radio>
diff --git a/frontend/src/business/components/common/cron/CrontabWeek.vue b/frontend/src/business/components/common/cron/CrontabWeek.vue
index eb584f49e8..d77495c105 100644
--- a/frontend/src/business/components/common/cron/CrontabWeek.vue
+++ b/frontend/src/business/components/common/cron/CrontabWeek.vue
@@ -2,19 +2,19 @@
 	<el-form size='small'>
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="1">
-				周，允许的通配符[, - * / L #]
+        {{$t('schedule.cron.weeks')}}，{{$t('schedule.cron.weeks_allowed_wildcards')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="2">
-				不指定
+        {{$t('schedule.cron.not_specify')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
-				周期从星期
+        {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}{{$t('schedule.cron.week')}}
 				<el-input-number v-model='cycle01' :min="1" :max="7" /> -
 				<el-input-number v-model='cycle02' :min="1" :max="7" />
 			</el-radio>
@@ -22,23 +22,23 @@
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
-				第
-				<el-input-number v-model='average01' :min="1" :max="4" /> 周的星期
+				{{$t('schedule.cron.num')}}
+				<el-input-number v-model='average01' :min="1" :max="4" /> {{$t('schedule.cron.week_of_weeks')}}
 				<el-input-number v-model='average02' :min="1" :max="7" />
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="5">
-				本月最后一个星期
+        {{$t('schedule.cron.last_week_of_the_month')}}
 				<el-input-number v-model='weekday' :min="1" :max="7" />
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="6">
-				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+        {{$t('schedule.cron.specify')}}
+        <el-select clearable v-model="checkboxList" :placeholder="$t('schedule.cron.multi_select')" multiple style="width:100%">
 					<el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{item}}</el-option>
 				</el-select>
 			</el-radio>
@@ -58,7 +58,15 @@ export default {
 			average01: 1,
 			average02: 1,
 			checkboxList: [],
-			weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
+			weekList: [
+			  this.$t('commons.weeks_1'),
+        this.$t('commons.weeks_2'),
+        this.$t('commons.weeks_3'),
+        this.$t('commons.weeks_4'),
+        this.$t('commons.weeks_5'),
+        this.$t('commons.weeks_6'),
+        this.$t('commons.weeks_0'),
+      ],
 			checkNum: this.$options.propsData.check
 		}
 	},
diff --git a/frontend/src/business/components/common/cron/CrontabYear.vue b/frontend/src/business/components/common/cron/CrontabYear.vue
index 6e85b63d24..b94cf40082 100644
--- a/frontend/src/business/components/common/cron/CrontabYear.vue
+++ b/frontend/src/business/components/common/cron/CrontabYear.vue
@@ -2,29 +2,29 @@
 	<el-form size="small">
 		<el-form-item>
 			<el-radio :label="1" v-model='radioValue'>
-				不填，允许的通配符[, - * /]
-			</el-radio>
+        {{$t('schedule.cron.not_fill')}}，{{$t('schedule.cron.allowed_wildcards')}}
+      </el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio :label="2" v-model='radioValue'>
-				每年
+        {{$t('schedule.cron.every')}}{{$t('schedule.cron.years')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio :label="3" v-model='radioValue'>
-				周期从
-				<el-input-number v-model='cycle01' :min='fullYear' /> -
+        {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
+        <el-input-number v-model='cycle01' :min='fullYear' /> -
 				<el-input-number v-model='cycle02' :min='fullYear' />
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio :label="4" v-model='radioValue'>
-				从
-				<el-input-number v-model='average01' :min='fullYear' /> 年开始，每
-				<el-input-number v-model='average02' :min='fullYear' /> 年执行一次
+        {{$t('schedule.cron.from')}}
+        <el-input-number v-model='average01' :min='fullYear' /> {{$t('schedule.cron.years')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+				<el-input-number v-model='average02' :min='fullYear' /> {{$t('schedule.cron.years')}}{{$t('schedule.cron.execute_once')}}
 			</el-radio>
 
 		</el-form-item>
@@ -32,7 +32,7 @@
 		<el-form-item>
 			<el-radio :label="5" v-model='radioValue'>
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple>
+				<el-select clearable v-model="checkboxList" :placeholder="$t('schedule.cron.multi_select')" multiple>
 					<el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item -1 + fullYear" />
 				</el-select>
 			</el-radio>
diff --git a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue b/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
index a162694329..f118545c9e 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
@@ -268,7 +268,7 @@
           url = '/performance/schedule/update';
         }
         this.$post(url, param, response => {
-          this.$success('保存成功');
+          this.$success(this.$t('commons.save_success'));
           this.getTest(this.testPlan.id);
         });
       },
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 0763efb122..09a11d8979 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
@@ -96,7 +96,7 @@
           param.testCaseIds = [...this.selectIds];
           this.$post('/test/plan/relevance' , param, () => {
             this.selectIds.clear();
-            this.$success("保存成功");
+            this.$success(this.$t('commons.save_success'));
             this.dialogFormVisible = false;
             this.$emit('refresh');
           });
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index ed27505251..922d011d6c 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -101,6 +101,8 @@ export default {
     'delete_confirm': 'Please enter the following to confirm deletion:',
     'login_username': 'ID or email',
     'input_login_username': 'Please input the user ID or email',
+    'input_name': 'Please enter name',
+    'formatErr': 'Format Error'
   },
   workspace: {
     'create': 'Create Workspace',
@@ -294,6 +296,15 @@ export default {
     value: "Value",
     create_performance_test: "Create Performance Test",
     export_config: "Export Configuration",
+    environment: {
+      name: "Environment Name",
+      socket: "Socket",
+      globalVariable: "Global Variable",
+      environment_list: "Environment List",
+      environment_config: "Environment Config",
+      environment: "Environment",
+      please_save_test: "Please Save Test First",
+    },
     scenario: {
       config: "Scenario Config",
       input_name: "Please enter the scenario name",
@@ -314,7 +325,13 @@ export default {
       name: "Name",
       method: "Method",
       url: "URL",
+      path: "Path",
+      address: "Address",
+      refer_to_environment: "Use Environment",
+      please_configure_environment_in_scenario: "Please Configure Environment In The Scenario",
+      please_add_environment_to_scenario: "Please Add The Environment Configuration To The Scenario First",
       url_description: "etc: https://fit2cloud.com",
+      path_description: "etc：/login",
       parameters: "Query parameters",
       parameters_desc: "Parameters will be appended to the URL e.g. https://fit2cloud.com?Name=Value&Name2=Value2",
       headers: "Headers",
@@ -591,5 +608,46 @@ export default {
     'dn_cannot_be_empty': 'LDAP DN cannot be empty',
     'ou_cannot_be_empty': 'LDAP OU cannot be empty',
     'password_cannot_be_empty': 'LDAP password cannot be empty',
-  }
+  },
+  schedule: {
+    not_set: "Not Set",
+    next_execution_time: "Next Execution Time",
+    edit_timer_task: "Edit Timer Task",
+    please_input_cron_expression: "Please Input Cron Expression",
+    generate_expression: "Generate Expression",
+    cron_expression_format_error: "Cron Expression Format Error",
+    cron_expression_interval_short_error: "Interval Time Should Longer than 5 Minutes",
+    cron: {
+      seconds: "Seconds",
+      minutes: "Minutes",
+      hours: "Hours",
+      day: "Day",
+      month: "Month",
+      weeks: "Weeks",
+      years: "Years",
+      week: "Week",
+      time_expression: "Time Expression",
+      complete_expression: "Complete Expression",
+      allowed_wildcards: "Allowed Wildcards[, - * /]",
+      day_allowed_wildcards: "Allowed Wildcards[, - * / L M]",
+      weeks_allowed_wildcards: "Allowed Wildcards[, - * / L M]",
+      not_specify: "Not Specify",
+      specify: "Specify",
+      period: "Period",
+      from: "From",
+      every: "Every",
+      day_unit: "Day Unit",
+      start: "Start",
+      execute_once: "Execute Once",
+      last_working_day: "The Last Working Day",
+      last_day_of_the_month: "The Last Day Of The Month",
+      multi_select: "Multi Select",
+      num: "Number",
+      week_of_weeks: "Week Of Weeks",
+      last_week_of_the_month: "The Last Week Of The Month",
+      not_fill: "Not Fill",
+      recent_run_time: "Recent 5th Runing Time",
+      no_qualifying_results: "No Qualifying Results",
+    }
+  },
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index d80b56aa54..58a82c5099 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -101,6 +101,8 @@ export default {
     'delete_confirm': '请输入以下内容，确认删除：',
     'login_username': 'ID 或 邮箱',
     'input_login_username': '请输入用户 ID 或 邮箱',
+    'input_name': '请输入名称',
+    'formatErr': '格式错误'
   },
   workspace: {
     'create': '创建工作空间',
@@ -292,6 +294,15 @@ export default {
     value: "值",
     create_performance_test: "创建性能测试",
     export_config: "导出配置",
+    environment: {
+      name: "环境名称",
+      socket: "环境域名",
+      globalVariable: "全局变量",
+      environment_list: "环境列表",
+      environment_config: "环境配置",
+      environment: "环境",
+      please_save_test: "请先保存测试",
+    },
     scenario: {
       config: "场景配置",
       input_name: "请输入场景名称",
@@ -311,7 +322,13 @@ export default {
       name: "请求名称",
       method: "请求方法",
       url: "请求URL",
-      url_description: "例如: https://fit2cloud.com",
+      path: "请求路径",
+      address: "请求地址",
+      refer_to_environment: "引用环境",
+      please_configure_environment_in_scenario: "请在场景中配置环境",
+      please_add_environment_to_scenario: "请先在场景中添加环境配置",
+      url_description: "例如：https://fit2cloud.com",
+      path_description: "例如：/login",
       url_invalid: "URL无效",
       parameters: "请求参数",
       parameters_desc: "参数追加到URL，例如https://fit2cloud.com/entries?key1=Value1&Key2=Value2",
@@ -588,5 +605,46 @@ export default {
     'dn_cannot_be_empty': 'LDAP DN不能为空',
     'ou_cannot_be_empty': 'LDAP OU不能为空',
     'password_cannot_be_empty': 'LDAP 密码不能为空',
-  }
+  },
+  schedule: {
+    not_set: "未设置",
+    next_execution_time: "下次执行时间",
+    edit_timer_task: "编辑定时任务",
+    please_input_cron_expression: "请输入 Cron 表达式",
+    generate_expression: "生成表达式",
+    cron_expression_format_error: "Cron 表达式格式错误",
+    cron_expression_interval_short_error: "间隔时间请大于 5 分钟",
+    cron: {
+      seconds: "秒",
+      minutes: "分钟",
+      hours: "小时",
+      day: "日",
+      month: "月",
+      weeks: "周",
+      years: "年",
+      week: "星期",
+      time_expression: "时间表达式",
+      complete_expression: "完整表达式",
+      allowed_wildcards: "允许的通配符[, - * /]",
+      day_allowed_wildcards: "允许的通配符[, - * / L M]",
+      weeks_allowed_wildcards: "允许的通配符[, - * / L M]",
+      not_specify: "不指定",
+      specify: "指定",
+      period: "周期",
+      from: "从",
+      every: "每",
+      day_unit: "号",
+      start: "开始",
+      execute_once: "执行一次",
+      last_working_day: "最近的那个工作日",
+      last_day_of_the_month: "本月最后一天",
+      multi_select: "可多选",
+      num: "第",
+      week_of_weeks: "周的星期",
+      last_week_of_the_month: "本月最后一个星期",
+      not_fill: "不填",
+      recent_run_time: "最近5次运行时间",
+      no_qualifying_results: "没有达到条件的结果",
+    }
+  },
 };
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 31f3c58871..9eda033d19 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -99,6 +99,8 @@ export default {
     'not_performed_yet': '尚未執行',
     'incorrect_input': '輸入內容不正確',
     'delete_confirm': '請輸入以下內容，確認刪除：',
+    'input_name': '請輸入名稱',
+    'formatErr': '格式錯誤'
   },
   workspace: {
     'create': '創建工作空間',
@@ -291,6 +293,15 @@ export default {
     value: "值",
     create_performance_test: "創建性能測試",
     export_config: "匯出配寘",
+    environment: {
+      name: "環境名稱",
+      socket: "環境域名",
+      globalVariable: "全局變量",
+      environment_list: "環境列表",
+      environment_config: "環境配置",
+      environment: "環境",
+      please_save_test: "請先保存測試",
+    },
     scenario: {
       creator: "創建人",
       config: "場景配寘",
@@ -311,7 +322,13 @@ export default {
       name: "請求名稱",
       method: "請求方法",
       url: "請求URL",
+      path: "請求路徑",
+      address: "請求地址",
+      refer_to_environment: "引用環境",
+      please_configure_environment_in_scenario: "請在場景中配置環境",
+      please_add_environment_to_scenario: "請先在場景中添加環境配置",
       url_description: "例如：https://fit2cloud.com",
+      path_description: "例如：/login",
       url_invalid: "URL無效",
       parameters: "請求參數",
       parameters_desc: "參數追加到URL,例如https://fit2cloud.com/entries？key1=Value1&amp;Key2=Value2",
@@ -588,5 +605,46 @@ export default {
     'dn_cannot_be_empty': 'LDAP DN不能為空',
     'ou_cannot_be_empty': 'LDAP OU不能為空',
     'password_cannot_be_empty': 'LDAP 密碼不能為空',
-  }
+  },
+  schedule: {
+    not_set: "未設置",
+    next_execution_time: "下次執行時間",
+    edit_timer_task: "編輯定時任務",
+    please_input_cron_expression: "請輸入 Cron 表達式",
+    generate_expression: "生成表達式",
+    cron_expression_format_error: "Cron 表達式格式錯誤",
+    cron_expression_interval_short_error: "間隔時間請大於 5 分鐘",
+    cron: {
+      seconds: "秒",
+      minutes: "分鐘",
+      hours: "小時",
+      day: "日",
+      month: "月",
+      weeks: "周",
+      years: "年",
+      week: "星期",
+      time_expression: "時間表達式",
+      complete_expression: "完整表達式",
+      allowed_wildcards: "允許的通配符[, - * /]",
+      day_allowed_wildcards: "允許的通配符[, - * / L M]",
+      weeks_allowed_wildcards: "允許的通配符[, - * / L M]",
+      not_specify: "不指定",
+      specify: "指定",
+      period: "周期",
+      from: "從",
+      every: "每",
+      day_unit: "號",
+      start: "開始",
+      execute_once: "執行壹次",
+      last_working_day: "最近的那個工作日",
+      last_day_of_the_month: "本月最後壹天",
+      multi_select: "可多選",
+      num: "第",
+      week_of_weeks: "周的星期",
+      last_week_of_the_month: "本月最後壹個星期",
+      not_fill: "不填",
+      recent_run_time: "最近5次運行時間",
+      no_qualifying_results: "沒有達到條件的結果",
+    }
+  },
 };

From cee30dd1263ad3fc81ea26978460a014250ab9cb Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 7 Jul 2020 10:02:29 +0800
Subject: [PATCH 11/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9quartz-spring-boot-star?=
 =?UTF-8?q?ter=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 45 +++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 34721c92c4..0afd90ed95 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -161,6 +161,17 @@
             <version>2.1.7</version>
         </dependency>
 
+        <!--
+        该依赖是私有仓库的依赖，现已经发布到 Github Packages，下载请在 settings 文件中配置自己的 GITHUB_TOKEN
+        示例：
+          <servers>
+            <server>
+              <id>github</id>
+              <username>USERNAME</username>
+              <password>TOKEN</password>
+            </server>
+          </servers>
+          -->
         <dependency>
             <groupId>com.fit2cloud</groupId>
             <artifactId>quartz-spring-boot-starter</artifactId>
@@ -296,39 +307,9 @@
 
     <repositories>
         <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>jcenter-snapshots</id>
-            <name>jcenter</name>
-            <url>https://jcenter.bintray.com/</url>
-        </repository>
-        <repository>
-            <id>fit2cloud-enterprise-release</id>
-            <name>Fit2Cloud Enterprise Release</name>
-            <url>http://repository.fit2cloud.com/content/repositories/fit2cloud-enterprise-release/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>fit2cloud</id>
+            <id>github</id>
             <name>fit2cloud</name>
-            <url>http://repository.fit2cloud.com/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <url>https://maven.pkg.github.com/fit2cloud/quartz-spring-boot-starter</url>
         </repository>
     </repositories>
 

From 1ab097bc29b7301cfd9c722797f5665dd8148d0a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 7 Jul 2020 10:32:47 +0800
Subject: [PATCH 12/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=AD=E8=A8=80?=
 =?UTF-8?q?=E5=92=8C=E6=8F=90=E5=8F=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assertion/ApiAssertionDuration.vue        |  2 +-
 .../assertion/ApiAssertionRegex.vue           |  2 +-
 .../components/assertion/ApiAssertionText.vue |  2 +-
 .../components/assertion/ApiAssertions.vue    | 42 ++++++++++++-------
 .../test/components/extract/ApiExtract.vue    | 37 ++++++++++------
 .../components/extract/ApiExtractCommon.vue   |  2 +-
 6 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionDuration.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionDuration.vue
index b992735f0b..c2de8c0adf 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionDuration.vue
+++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertionDuration.vue
@@ -7,7 +7,7 @@
       </el-col>
       <el-col class="assertion-btn">
         <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove" v-if="edit"/>
-        <el-button :disabled="isReadOnly" type="primary" size="small" icon="el-icon-plus" plain @click="add" v-else/>
+        <el-button :disabled="isReadOnly" type="primary" size="small" @click="add" v-else>Add</el-button>
       </el-col>
     </el-row>
   </div>
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue
index 758dea2ec4..ddd19f0d28 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue
+++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue
@@ -15,7 +15,7 @@
       </el-col>
       <el-col class="assertion-btn">
         <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove" v-if="edit"/>
-        <el-button :disabled="isReadOnly" type="primary" size="small" icon="el-icon-plus" plain @click="add" v-else/>
+        <el-button :disabled="isReadOnly" type="primary" size="small" @click="add" v-else>Add</el-button>
       </el-col>
     </el-row>
   </div>
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionText.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionText.vue
index 2ea5dbe31a..6201e07da6 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionText.vue
+++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertionText.vue
@@ -24,7 +24,7 @@
                   :placeholder="$t('api_test.request.assertions.value')"/>
       </el-col>
       <el-col class="assertion-btn">
-        <el-button :disabled="isReadOnly" type="primary" size="small" icon="el-icon-plus" plain @click="add"/>
+        <el-button :disabled="isReadOnly" type="primary" size="small"  @click="add">Add</el-button>
       </el-col>
     </el-row>
   </div>
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
index c748a87e6e..daa939dd36 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
+++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
@@ -1,21 +1,24 @@
 <template>
   <div>
-    <el-row :gutter="10">
-      <el-col :span="4">
-        <el-select :disabled="isReadOnly" class="assertion-item" v-model="type" :placeholder="$t('api_test.request.assertions.select_type')"
-                   size="small">
-          <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT"/>
-          <el-option :label="$t('api_test.request.assertions.regex')" :value="options.REGEX"/>
-          <el-option :label="$t('api_test.request.assertions.response_time')" :value="options.DURATION"/>
-        </el-select>
-      </el-col>
-      <el-col :span="20">
-        <ms-api-assertion-text :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.TEXT" :callback="after"/>
-        <ms-api-assertion-regex :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.REGEX" :callback="after"/>
-        <ms-api-assertion-duration :is-read-only="isReadOnly" v-model="time" :duration="assertions.duration"
-                                        v-if="type === options.DURATION" :callback="after"/>
-      </el-col>
-    </el-row>
+    <div class="assertion-add">
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-select :disabled="isReadOnly" class="assertion-item" v-model="type" :placeholder="$t('api_test.request.assertions.select_type')"
+                     size="small">
+            <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT"/>
+            <el-option :label="$t('api_test.request.assertions.regex')" :value="options.REGEX"/>
+            <el-option :label="$t('api_test.request.assertions.response_time')" :value="options.DURATION"/>
+          </el-select>
+        </el-col>
+        <el-col :span="20">
+          <ms-api-assertion-text :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.TEXT" :callback="after"/>
+          <ms-api-assertion-regex :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.REGEX" :callback="after"/>
+          <ms-api-assertion-duration :is-read-only="isReadOnly" v-model="time" :duration="assertions.duration"
+                                     v-if="type === options.DURATION" :callback="after"/>
+          <el-button v-if="!type" :disabled="true" type="primary" size="small">Add</el-button>
+        </el-col>
+      </el-row>
+    </div>
 
     <ms-api-assertions-edit :is-read-only="isReadOnly" :assertions="assertions"/>
   </div>
@@ -62,4 +65,11 @@
   .assertion-item {
     width: 100%;
   }
+
+  .assertion-add {
+    padding: 10px;
+    border: #DCDFE6 solid 1px;
+    margin: 5px 0;
+    border-radius: 5px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/test/components/extract/ApiExtract.vue b/frontend/src/business/components/api/test/components/extract/ApiExtract.vue
index d8f57981cd..54ce088051 100644
--- a/frontend/src/business/components/api/test/components/extract/ApiExtract.vue
+++ b/frontend/src/business/components/api/test/components/extract/ApiExtract.vue
@@ -3,19 +3,23 @@
     <div class="extract-description">
       {{$t('api_test.request.extract.description')}}
     </div>
-    <el-row :gutter="10">
-      <el-col :span="2">
-        <el-select :disabled="isReadOnly" class="extract-item" v-model="type" :placeholder="$t('api_test.request.extract.select_type')"
-                   size="small">
-          <el-option :label="$t('api_test.request.extract.regex')" :value="options.REGEX"/>
-          <el-option label="JSONPath" :value="options.JSON_PATH"/>
-          <el-option label="XPath" :value="options.XPATH"/>
-        </el-select>
-      </el-col>
-      <el-col :span="22">
-        <ms-api-extract-common :is-read-only="isReadOnly" :extract-type="type" :list="list" v-if="type" :callback="after"/>
-      </el-col>
-    </el-row>
+    <div class="extract-add">
+      <el-row :gutter="10">
+        <el-col :span="2">
+          <el-select :disabled="isReadOnly" class="extract-item" v-model="type" :placeholder="$t('api_test.request.extract.select_type')"
+                     size="small">
+            <el-option :label="$t('api_test.request.extract.regex')" :value="options.REGEX"/>
+            <el-option label="JSONPath" :value="options.JSON_PATH"/>
+            <el-option label="XPath" :value="options.XPATH"/>
+          </el-select>
+        </el-col>
+        <el-col :span="22">
+          <ms-api-extract-common :is-read-only="isReadOnly" :extract-type="type" :list="list" v-if="type" :callback="after"/>
+        </el-col>
+
+        <el-button v-if="!type" :disabled="true" type="primary" size="small">Add</el-button>
+      </el-row>
+    </div>
 
     <ms-api-extract-edit :is-read-only="isReadOnly" :extract="extract"/>
   </div>
@@ -81,4 +85,11 @@
   .extract-item {
     width: 100%;
   }
+
+  .extract-add {
+    padding: 10px;
+    border: #DCDFE6 solid 1px;
+    margin: 5px 0;
+    border-radius: 5px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue b/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
index 178f37e362..9c84ee00bc 100644
--- a/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
+++ b/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
@@ -17,7 +17,7 @@
       <el-col class="extract-btn">
         <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove"
                    v-if="edit"/>
-        <el-button :disabled="isReadOnly" type="primary" size="small" icon="el-icon-plus" plain @click="add" v-else/>
+        <el-button :disabled="isReadOnly" type="primary" size="small" @click="add" v-else>Add</el-button>
       </el-col>
     </el-row>
   </div>

From fbc688697230c21af9fb3c53387619f272dfa7e4 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 7 Jul 2020 13:48:18 +0800
Subject: [PATCH 13/31] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=89=8D=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E7=9B=B8=E5=85=B3=E8=81=94=E7=9A=84=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/service/APITestService.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 9c1cdec6e0..91a4af8dcb 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -8,6 +8,7 @@ import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiTestFileMapper;
 import io.metersphere.base.mapper.ApiTestMapper;
+import io.metersphere.base.mapper.TestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtApiTestMapper;
 import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.exception.MSException;
@@ -46,6 +47,8 @@ public class APITestService {
     private JMeterService jMeterService;
     @Resource
     private APIReportService apiReportService;
+    @Resource
+    private TestCaseMapper testCaseMapper;
 
     public List<APITestResult> list(QueryAPITestRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
@@ -110,6 +113,20 @@ public class APITestService {
     }
 
     public void delete(String testId) {
+
+        // 是否关联测试用例
+        TestCaseExample testCaseExample = new TestCaseExample();
+        testCaseExample.createCriteria().andTestIdEqualTo(testId);
+        List<TestCase> testCases = testCaseMapper.selectByExample(testCaseExample);
+        if (testCases.size() > 0) {
+            String caseName = "";
+            for (int i = 0; i < testCases.size(); i++) {
+                caseName = caseName + testCases.get(i).getName() + ",";
+            }
+            caseName = caseName.substring(0, caseName.length() - 1);
+            MSException.throwException(Translator.get("related_case_del_fail_prefix") + caseName + Translator.get("related_case_del_fail_suffix"));
+        }
+
         deleteFileByTestId(testId);
         apiReportService.deleteByTestId(testId);
         apiTestMapper.deleteByPrimaryKey(testId);

From a0483661bd2092ea55dddde9b27167db119a29b4 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 7 Jul 2020 16:29:01 +0800
Subject: [PATCH 14/31] =?UTF-8?q?smtp=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SystemParameterService.java       | 26 +++++++++++++------
 .../system/SystemParameterSetting.vue         | 12 ++++++---
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 6f60b47dda..7ee18ac83a 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -40,17 +40,24 @@ public class SystemParameterService {
 
     public void editMail(List<SystemParameter> parameters) {
         List<SystemParameter> paramList = this.getParamList(ParamConstants.Classify.MAIL.getValue());
-        boolean empty = paramList.size() < 2;
+        boolean empty = paramList.size() <= 0;
+
         parameters.forEach(parameter -> {
+            SystemParameterExample example = new SystemParameterExample();
             if (parameter.getParamKey().equals(ParamConstants.MAIL.PASSWORD.getKey())) {
-                String string = EncryptUtils.aesEncrypt(parameter.getParamValue()).toString();
-                parameter.setParamValue(string);
+                if (!StringUtils.isBlank(parameter.getParamValue())) {
+                    String string = EncryptUtils.aesEncrypt(parameter.getParamValue()).toString();
+                    parameter.setParamValue(string);
+                }
             }
-            if (empty) {
-                systemParameterMapper.insert(parameter);
-            } else {
+            example.createCriteria().andParamKeyEqualTo(parameter.getParamKey());
+            if (systemParameterMapper.countByExample(example) > 0) {
                 systemParameterMapper.updateByPrimaryKey(parameter);
+            } else {
+                systemParameterMapper.insert(parameter);
             }
+            example.clear();
+
         });
     }
 
@@ -105,8 +112,11 @@ public class SystemParameterService {
             }
         } else {
             paramList.stream().filter(param -> param.getParamKey().equals(ParamConstants.MAIL.PASSWORD.getKey())).forEach(param -> {
-                String string = EncryptUtils.aesDecrypt(param.getParamValue()).toString();
-                param.setParamValue(string);
+                if (!StringUtils.isBlank(param.getParamValue())) {
+                    String string = EncryptUtils.aesDecrypt(param.getParamValue()).toString();
+                    param.setParamValue(string);
+                }
+
             });
         }
         paramList.sort(Comparator.comparingInt(SystemParameter::getSort));
diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index 8c30d63387..2d9ade2b79 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -127,9 +127,15 @@
           this.$set(this.formInline, "port", response.data[1].paramValue);
           this.$set(this.formInline, "account", response.data[2].paramValue);
           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));
+          if(response.data[4].paramValue!=""){
+            this.$set(this.formInline, "SSL", JSON.parse(response.data[4].paramValue));
+          }
+          if(response.data[5].paramValue!=""){
+            this.$set(this.formInline, "TLS", JSON.parse(response.data[5].paramValue));
+          }
+          if(response.data[6].paramValue!=""){
+            this.$set(this.formInline, "SMTP", JSON.parse(response.data[6].paramValue));
+          }
         })
       },
       change() {

From 8903fc80b3a9b733098c1fbc5c770e10be82dab3 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 7 Jul 2020 17:44:43 +0800
Subject: [PATCH 15/31] =?UTF-8?q?smtp=E8=B6=85=E6=97=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/service/SystemParameterService.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 7ee18ac83a..ecd15b6431 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -75,6 +75,8 @@ 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.timeout", "5000");
+        props.put("mail.smtp.connectiontimeout", "5000");
         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");

From 024304d0185efb279c9b30a14bacd789e816abe7 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 7 Jul 2020 17:52:37 +0800
Subject: [PATCH 16/31] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=A1=86=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/personal/PersonSetting.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 07050c3259..70935ad8ce 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -57,7 +57,7 @@
     </el-dialog>
 
     <!--Change personal password-->
-    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" left>
+    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" :before-close='closeDialog' left  >
       <el-form :model="ruleForm" :rules="rules" ref="editPasswordForm" label-width="120px" class="demo-ruleForm">
         <el-form-item :label="$t('member.old_password')" prop="password" style="margin-bottom: 29px">
           <el-input v-model="ruleForm.password" autocomplete="off" show-password/>
@@ -68,7 +68,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
            <ms-dialog-footer
-             @cancel="editPasswordVisible = false"
+             @cancel="cancel()"
              @confirm="updatePassword('editPasswordForm')"/>
         </span>
     </el-dialog>
@@ -156,6 +156,16 @@
       editPassword(row) {
         this.editPasswordVisible = true;
       },
+      cancel(){
+        this.editPasswordVisible = false;
+        this.ruleForm.password="";
+        this.ruleForm.newpassword="";
+      },
+      closeDialog(){
+        this.editPasswordVisible = false;
+        this.ruleForm.password="";
+        this.ruleForm.newpassword="";
+      },
       updateUser(updateUserForm) {
         this.$refs[updateUserForm].validate(valid => {
           if (valid) {

From 192dac6f793056438d7b857ee317925d487b3dab Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 7 Jul 2020 18:12:02 +0800
Subject: [PATCH 17/31] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E6=97=B6=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/PerformanceTestService.java         | 10 +---------
 .../performance/service/ReportService.java      | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
index 8d199b0808..5332c337b7 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -102,16 +102,8 @@ public class PerformanceTestService {
         if (!loadTestReports.isEmpty()) {
             List<String> reportIdList = loadTestReports.stream().map(LoadTestReport::getId).collect(Collectors.toList());
 
-            // delete load_test_report_result
-            LoadTestReportResultExample loadTestReportResultExample = new LoadTestReportResultExample();
-            loadTestReportResultExample.createCriteria().andReportIdIn(reportIdList);
-            loadTestReportResultMapper.deleteByExample(loadTestReportResultExample);
-
-            // delete load_test_report, delete load_test_report_detail
+            // delete load_test_report
             reportIdList.forEach(reportId -> {
-                LoadTestReportDetailExample example = new LoadTestReportDetailExample();
-                example.createCriteria().andReportIdEqualTo(reportId);
-                loadTestReportDetailMapper.deleteByExample(example);
                 reportService.deleteReport(reportId);
             });
         }
diff --git a/backend/src/main/java/io/metersphere/performance/service/ReportService.java b/backend/src/main/java/io/metersphere/performance/service/ReportService.java
index 5f3e3a66ad..50bcc908fc 100644
--- a/backend/src/main/java/io/metersphere/performance/service/ReportService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/ReportService.java
@@ -3,10 +3,7 @@ package io.metersphere.performance.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.base.domain.*;
-import io.metersphere.base.mapper.LoadTestMapper;
-import io.metersphere.base.mapper.LoadTestReportLogMapper;
-import io.metersphere.base.mapper.LoadTestReportMapper;
-import io.metersphere.base.mapper.LoadTestReportResultMapper;
+import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtLoadTestReportMapper;
 import io.metersphere.commons.constants.PerformanceTestStatus;
 import io.metersphere.commons.constants.ReportKeys;
@@ -45,6 +42,8 @@ public class ReportService {
     private LoadTestReportLogMapper loadTestReportLogMapper;
     @Resource
     private TestResourceService testResourceService;
+    @Resource
+    private LoadTestReportDetailMapper loadTestReportDetailMapper;
 
     public List<ReportDTO> getRecentReportList(ReportRequest request) {
         List<OrderRequest> orders = new ArrayList<>();
@@ -85,6 +84,16 @@ public class ReportService {
             stopEngine(loadTest, engine);
         }
 
+        // delete load_test_report_result
+        LoadTestReportResultExample loadTestReportResultExample = new LoadTestReportResultExample();
+        loadTestReportResultExample.createCriteria().andReportIdEqualTo(reportId);
+        loadTestReportResultMapper.deleteByExample(loadTestReportResultExample);
+
+        // delete load_test_report_detail
+        LoadTestReportDetailExample example = new LoadTestReportDetailExample();
+        example.createCriteria().andReportIdEqualTo(reportId);
+        loadTestReportDetailMapper.deleteByExample(example);
+
         loadTestReportMapper.deleteByPrimaryKey(reportId);
     }
 

From 712154dd8a50af448539ac4cb5d1f049cddc33cf Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 7 Jul 2020 18:23:37 +0800
Subject: [PATCH 18/31] ws or wss

---
 .../components/performance/report/PerformanceReportView.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index d30b2dc501..9f046180bd 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -139,7 +139,11 @@
         }
       },
       initWebSocket() {
-        const uri = "ws://" + window.location.host + "/performance/report/" + this.reportId;
+        let protocol = "ws://";
+        if (window.location.protocol === 'https:') {
+          protocol = "wss://";
+        }
+        const uri = protocol + window.location.host + "/performance/report/" + this.reportId;
         this.websocket = new WebSocket(uri);
         this.websocket.onmessage = this.onMessage;
         this.websocket.onopen = this.onOpen;

From fbb6fc0277965c9dcfdd81ee78459ee6f3e03a6e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 8 Jul 2020 01:02:16 +0800
Subject: [PATCH 19/31] ldap

---
 .../io/metersphere/ldap/dao/PersonRepo.java   |  6 +--
 .../metersphere/ldap/dao/PersonRepoImpl.java  | 45 ++++++++++++-------
 .../io/metersphere/ldap/domain/Person.java    |  3 +-
 .../metersphere/ldap/service/LdapService.java | 26 ++++++-----
 .../settings/system/LdapSetting.vue           |  1 +
 5 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepo.java b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepo.java
index d6e4821364..bf0306cefd 100644
--- a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepo.java
+++ b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepo.java
@@ -1,11 +1,9 @@
 package io.metersphere.ldap.dao;
 
 
-import java.util.List;
+import io.metersphere.ldap.domain.Person;
 
 public interface PersonRepo {
 
-    List findByName(String name);
-
-    String getDnForUser(String name);
+    Person getDnForUser(String name);
 }
diff --git a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
index 106885bc77..00793de941 100644
--- a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
+++ b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
@@ -15,12 +15,15 @@ import org.springframework.ldap.core.*;
 import org.springframework.ldap.core.support.AbstractContextMapper;
 import org.springframework.ldap.core.support.DefaultDirObjectFactory;
 import org.springframework.ldap.core.support.LdapContextSource;
-import org.springframework.ldap.query.LdapQuery;
+import org.springframework.ldap.query.SearchScope;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapContext;
+import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 
 import static org.springframework.ldap.query.LdapQueryBuilder.query;
 
@@ -62,31 +65,32 @@ public class PersonRepoImpl implements PersonRepo {
     }
 
     @Override
-    public List<Person> findByName(String name) {
+    public Person getDnForUser(String username) {
         LdapTemplate ldapTemplate = getConnection();
-        LdapQuery query = query().where("cn").is(name);
-        return ldapTemplate.search(query, getContextMapper());
-    }
+        String filter = getFilter();
 
-    @Override
-    public String getDnForUser(String uid) {
-        LdapTemplate ldapTemplate = getConnection();
-        List<String> result = ldapTemplate.search(
-                query().where("cn").is(uid),
-                new AbstractContextMapper() {
-                    @Override
-                    protected String doMapFromContext(DirContextOperations ctx) {
-                        return ctx.getNameInNamespace();
-                    }
-                });
+        List<Person> result = ldapTemplate.search(
+                query().filter(filter, username),
+                getContextMapper());
+
+        System.out.println(result.toString());
 
         if (result.size() != 1) {
             throw new RuntimeException(Translator.get("user_not_found_or_not_unique"));
         }
-
         return result.get(0);
     }
 
+    private String getFilter() {
+        String filter = service.getValue(ParamConstants.LDAP.FILTER.getValue());
+
+        if (StringUtils.isBlank(filter)) {
+            filter = "(sAMAccountName={0})";
+        }
+
+        return filter;
+    }
+
     protected ContextMapper getContextMapper() {
         return new PersonContextMapper();
     }
@@ -95,6 +99,8 @@ public class PersonRepoImpl implements PersonRepo {
         @Override
         public Person doMapFromContext(DirContextOperations context) {
             Person person = new Person();
+            person.setDn(context.getNameInNamespace());
+            person.setUid(context.getStringAttribute("uid"));
             person.setCommonName(context.getStringAttribute("cn"));
             person.setSurName(context.getStringAttribute("sn"));
             person.setUsername(context.getStringAttribute("sAMAccountName"));
@@ -123,6 +129,11 @@ public class PersonRepoImpl implements PersonRepo {
         sourceLdapCtx.afterPropertiesSet();
         LdapTemplate ldapTemplate = new LdapTemplate(sourceLdapCtx);
         ldapTemplate.setIgnorePartialResultException(true);
+        Map<String, Object> baseEnv = new Hashtable<>();
+        baseEnv.put("com.sun.jndi.ldap.connect.timeout", "3000");
+        baseEnv.put("com.sun.jndi.ldap.read.timeout", "3000");
+        sourceLdapCtx.setBaseEnvironmentProperties(baseEnv);
+        ldapTemplate.setDefaultSearchScope(SearchScope.SUBTREE.getId());
 
         // ldapTemplate 是否可用
         authenticate(dn, credentials, ldapTemplate);
diff --git a/backend/src/main/java/io/metersphere/ldap/domain/Person.java b/backend/src/main/java/io/metersphere/ldap/domain/Person.java
index 36205db73f..3da72e1341 100644
--- a/backend/src/main/java/io/metersphere/ldap/domain/Person.java
+++ b/backend/src/main/java/io/metersphere/ldap/domain/Person.java
@@ -14,7 +14,7 @@ public class Person {
 
     @Id
     private Name id;
-    @DnAttribute(value="uid",index = 3)
+    @DnAttribute(value="uid",index = 0)
     private String uid;
     @Attribute(name = "cn")
     private String commonName;
@@ -24,5 +24,6 @@ public class Person {
     private String username;
     @Attribute(name = "mail")
     private String email;
+    private String dn;
 
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/ldap/service/LdapService.java b/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
index ee7cd48190..d0d0467a2c 100644
--- a/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
+++ b/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
@@ -23,25 +23,27 @@ public class LdapService {
         String dn = null;
         String username = request.getUsername();
         String credentials = request.getPassword();
-
+        Person person = null;
         List<Person> personList = null;
         try {
-            // select user by sAMAccountName
-            personList = personRepo.findByName(username);
-
-            if (personList.size() == 1) {
-                dn = personRepo.getDnForUser(username);
-            } else if (personList.size() == 0) {
-                MSException.throwException(Translator.get("user_not_exist") + username);
-            } else {
-                MSException.throwException(Translator.get("find_more_user"));
-            }
+//            // select user by sAMAccountName
+//            personList = personRepo.findByName(username);
+//
+//            if (personList.size() == 1) {
+//                dn = personRepo.getDnForUser(username);
+//            } else if (personList.size() == 0) {
+//                MSException.throwException(Translator.get("user_not_exist") + username);
+//            } else {
+//                MSException.throwException(Translator.get("find_more_user"));
+//            }
+            person = personRepo.getDnForUser(username);
+            dn = person.getDn();
         } catch (CommunicationException e) {
             MSException.throwException(Translator.get("ldap_connect_fail"));
         }
         personRepo.authenticate(dn, credentials);
 
-        return personList.get(0);
+        return person;
     }
 
     public void testConnect(LdapInfo ldap) {
diff --git a/frontend/src/business/components/settings/system/LdapSetting.vue b/frontend/src/business/components/settings/system/LdapSetting.vue
index 0c710e8a5b..62e4a97fc7 100644
--- a/frontend/src/business/components/settings/system/LdapSetting.vue
+++ b/frontend/src/business/components/settings/system/LdapSetting.vue
@@ -82,6 +82,7 @@
           dn: {required: true, message: this.$t('ldap.input_dn'), trigger: ['change', 'blur']},
           password: {required: true, message: this.$t('ldap.input_password'), trigger: ['change', 'blur']},
           ou: {required: true, message: this.$t('ldap.input_ou'), trigger: ['change', 'blur']},
+          filter: {required: true, message: this.$t('ldap.input_ou'), trigger: ['change', 'blur']}
         },
         loginFormRules: {
           username: {required: true, message: this.$t('ldap.input_username'), trigger: 'blur'},

From 3dcf2f0f2a1b3f060146a36aae87d7a25945634e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 8 Jul 2020 11:57:45 +0800
Subject: [PATCH 20/31] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5-=20Metersphere(json)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/APITestController.java     |   6 +
 .../metersphere/api/dto/parse/ApiImport.java  |  11 ++
 .../api/parse/ApiImportParser.java            |   9 ++
 .../api/parse/ApiImportParserFactory.java     |  16 +++
 .../io/metersphere/api/parse/MsParser.java    |  36 +++++
 .../api/service/APITestService.java           |  51 ++++++-
 .../commons/constants/ApiImportPlatform.java  |   5 +
 .../commons/constants/FileType.java           |   2 +-
 .../components/api/test/ApiTestConfig.vue     |  14 +-
 .../api/test/components/import/ApiImport.vue  | 132 ++++++++++++++++++
 .../track/case/components/TestCaseImport.vue  |   6 +-
 11 files changed, 280 insertions(+), 8 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/ApiImport.java
 create mode 100644 backend/src/main/java/io/metersphere/api/parse/ApiImportParser.java
 create mode 100644 backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java
 create mode 100644 backend/src/main/java/io/metersphere/api/parse/MsParser.java
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java
 create mode 100644 frontend/src/business/components/api/test/components/import/ApiImport.vue

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 84cff582b3..ced4f7f2df 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -96,4 +96,10 @@ public class APITestController {
         return apiTestService.run(request);
     }
 
+    @PostMapping("/import/{platform}/{projectId}")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public ApiTest testCaseImport(MultipartFile file, @PathVariable String platform, @PathVariable String projectId) {
+        return apiTestService.apiTestImport(file, platform, projectId);
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/ApiImport.java b/backend/src/main/java/io/metersphere/api/dto/parse/ApiImport.java
new file mode 100644
index 0000000000..deddba481a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/ApiImport.java
@@ -0,0 +1,11 @@
+package io.metersphere.api.dto.parse;
+
+import io.metersphere.api.dto.scenario.Scenario;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiImport {
+    private List<Scenario> scenarios;
+}
diff --git a/backend/src/main/java/io/metersphere/api/parse/ApiImportParser.java b/backend/src/main/java/io/metersphere/api/parse/ApiImportParser.java
new file mode 100644
index 0000000000..659e9ea6d2
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/parse/ApiImportParser.java
@@ -0,0 +1,9 @@
+package io.metersphere.api.parse;
+
+import io.metersphere.api.dto.parse.ApiImport;
+
+import java.io.InputStream;
+
+public interface ApiImportParser {
+    ApiImport parse(InputStream source);
+}
diff --git a/backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java b/backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java
new file mode 100644
index 0000000000..a6b425df5f
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java
@@ -0,0 +1,16 @@
+package io.metersphere.api.parse;
+
+import io.metersphere.commons.constants.ApiImportPlatform;
+import io.metersphere.commons.constants.FileType;
+import io.metersphere.performance.parse.EngineSourceParser;
+import io.metersphere.performance.parse.xml.XmlEngineSourceParse;
+import org.apache.commons.lang3.StringUtils;
+
+public class ApiImportParserFactory {
+    public static ApiImportParser getApiImportParser(String platform) {
+        if (StringUtils.equals(ApiImportPlatform.Metersphere.name(), platform)) {
+            return new MsParser();
+        }
+        return null;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/parse/MsParser.java b/backend/src/main/java/io/metersphere/api/parse/MsParser.java
new file mode 100644
index 0000000000..8eec7b8367
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/parse/MsParser.java
@@ -0,0 +1,36 @@
+package io.metersphere.api.parse;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.api.dto.parse.ApiImport;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.LogUtil;
+
+import java.io.*;
+
+public class MsParser implements ApiImportParser {
+
+    @Override
+    public ApiImport parse(InputStream source) {BufferedReader bufferedReader = null;
+        StringBuilder testStr = null;
+        try {
+            bufferedReader = new BufferedReader(new InputStreamReader(source, "UTF-8"));
+            testStr = new StringBuilder();
+            String inputStr = null;
+            while ((inputStr = bufferedReader.readLine()) != null) {
+                testStr.append(inputStr);
+            }
+        } catch (Exception e) {
+            MSException.throwException(e.getMessage());
+            LogUtil.error(e.getMessage(), e);
+        } finally {
+            try {
+                source.close();
+            } catch (IOException e) {
+                MSException.throwException(e.getMessage());
+                LogUtil.error(e.getMessage(), e);
+            }
+        }
+        return JSON.parseObject(testStr.toString(), ApiImport.class);
+    }
+
+}
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 fa81f73172..52cea01489 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -2,14 +2,19 @@ package io.metersphere.api.service;
 
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.dto.APITestResult;
+import io.metersphere.api.dto.parse.ApiImport;
 import io.metersphere.api.dto.QueryAPITestRequest;
 import io.metersphere.api.dto.SaveAPITestRequest;
 import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.parse.ApiImportParser;
+import io.metersphere.api.parse.ApiImportParserFactory;
+import io.metersphere.api.parse.MsParser;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiTestFileMapper;
 import io.metersphere.base.mapper.ApiTestMapper;
 import io.metersphere.base.mapper.ext.ExtApiTestMapper;
 import io.metersphere.commons.constants.APITestStatus;
+import io.metersphere.commons.constants.FileType;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.constants.ScheduleType;
 import io.metersphere.commons.exception.MSException;
@@ -26,8 +31,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
+import java.io.*;
 import java.util.List;
 import java.util.Objects;
 import java.util.Random;
@@ -163,6 +167,15 @@ public class APITestService {
         }
     }
 
+    private Boolean isNameExist(SaveAPITestRequest request) {
+        ApiTestExample example = new ApiTestExample();
+        example.createCriteria().andNameEqualTo(request.getName()).andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(request.getId());
+        if (apiTestMapper.countByExample(example) > 0) {
+           return true;
+        }
+        return false;
+    }
+
     private ApiTest updateTest(SaveAPITestRequest request) {
         checkNameExist(request);
         final ApiTest test = new ApiTest();
@@ -246,4 +259,38 @@ public class APITestService {
     private void addOrUpdateApiTestCronJob(Schedule request) {
         scheduleService.addOrUpdateCronJob(request, ApiTestJob.getJobKey(request.getResourceId()), ApiTestJob.getTriggerKey(request.getResourceId()), ApiTestJob.class);
     }
+
+    public ApiTest apiTestImport(MultipartFile file, String platform, String projectId) {
+        try {
+
+            ApiImportParser apiImportParser = ApiImportParserFactory.getApiImportParser(platform);
+            ApiImport apiImport = apiImportParser.parse(file.getInputStream());
+            SaveAPITestRequest request = getImportApiTest(file, projectId, apiImport);
+            ApiTest test = createTest(request);
+            return test;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private SaveAPITestRequest getImportApiTest(MultipartFile file, String projectId, ApiImport apiImport) {
+        SaveAPITestRequest request =  new SaveAPITestRequest();
+        request.setName(file.getOriginalFilename());
+        request.setProjectId(projectId);
+        request.setScenarioDefinition(apiImport.getScenarios());
+        request.setUserId(SessionUtils.getUser().getId());
+        request.setId(UUID.randomUUID().toString());
+        for (FileType fileType : FileType.values()) {
+            String suffix = fileType.suffix();
+            String name = request.getName();
+            if (name.endsWith(suffix)) {
+                request.setName(name.substring(0, name.length() - suffix.length()));
+            }
+        };
+        if (isNameExist(request)) {
+            request.setName(request.getName() + "_" + request.getId().substring(0, 5));
+        }
+        return request;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java b/backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java
new file mode 100644
index 0000000000..a5bea45b77
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java
@@ -0,0 +1,5 @@
+package io.metersphere.commons.constants;
+
+public enum  ApiImportPlatform {
+    Metersphere, Postman
+}
diff --git a/backend/src/main/java/io/metersphere/commons/constants/FileType.java b/backend/src/main/java/io/metersphere/commons/constants/FileType.java
index 6b800133ff..db8236c2ed 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/FileType.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/FileType.java
@@ -1,7 +1,7 @@
 package io.metersphere.commons.constants;
 
 public enum FileType {
-    JMX(".jmx"), CSV(".csv");
+    JMX(".jmx"), CSV(".csv"), JSON(".json");
 
     // 保存后缀
     private String suffix;
diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 299a7883c2..1013f64f18 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -39,12 +39,18 @@
                   <el-dropdown-item command="performance" :disabled="create || isReadOnly">
                     {{$t('api_test.create_performance_test')}}
                   </el-dropdown-item>
-                  <el-dropdown-item command="export" :disabled="isDisabled || isReadOnly">
+                  <el-dropdown-item command="export" :disabled="isReadOnly || create">
                     {{$t('api_test.export_config')}}
                   </el-dropdown-item>
+                  <el-dropdown-item command="import" :disabled="isReadOnly">
+                    导入
+<!--                    {{$t('api_test.export_config')}}-->
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
 
+              <api-import :project-id="test.projectId" ref="apiImport"/>
+
               <ms-api-report-dialog :test-id="id" ref="reportDialog"/>
 
               <ms-schedule-config :schedule="test.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule" :check-open="checkScheduleEdit"/>
@@ -64,11 +70,12 @@
   import MsApiReportDialog from "./ApiReportDialog";
   import {checkoutTestManagerOrTestUser, downloadFile} from "../../../../common/js/utils";
   import MsScheduleConfig from "../../common/components/MsScheduleConfig";
+  import ApiImport from "./components/import/ApiImport";
 
   export default {
     name: "MsApiTestConfig",
 
-    components: {MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig},
+    components: {ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig},
 
     props: ["id"],
 
@@ -211,6 +218,9 @@
           case "export":
             downloadFile(this.test.name + ".json", this.test.export());
             break;
+          case "import":
+            this.$refs.apiImport.open();
+            break;
         }
       },
       saveCronExpression(cronExpression) {
diff --git a/frontend/src/business/components/api/test/components/import/ApiImport.vue b/frontend/src/business/components/api/test/components/import/ApiImport.vue
new file mode 100644
index 0000000000..ab74065566
--- /dev/null
+++ b/frontend/src/business/components/api/test/components/import/ApiImport.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog :title="'接口测试导入'" :visible.sync="visible" class="api-import" v-loading="result.loading">
+
+    <div class="data-format">
+      <div>数据格式</div>
+      <el-radio-group v-model="selectedPlatformValue">
+        <el-radio v-for="(item, index) in platforms" :key="index" :label="item.value">{{item.name}}</el-radio>
+      </el-radio-group>
+    </div>
+
+    <div  class="api-upload">
+      <el-upload
+        drag
+        action=""
+        :http-request="upload"
+        :limit="1"
+        :beforeUpload="uploadValidate"
+        :show-file-list="false"
+        :file-list="fileList"
+        multiple>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">文件大小不超过 20 M</div>
+      </el-upload>
+    </div>
+
+    <div class="format-tip">
+      <div>
+        <span>说明：{{selectedPlatform.tip}}</span>
+      </div>
+      <div>
+        <span>导出方法：{{selectedPlatform.exportTip}}</span>
+      </div>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script>
+    import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+    export default {
+      name: "ApiImport",
+      components: {MsDialogFooter},
+      props: ['projectId'],
+      data() {
+        return {
+          visible: false,
+          platforms: [
+            {
+              name: 'Metersphere',
+              value: 'Metersphere',
+              tip: '支持 Metersphere json 格式',
+              exportTip: '通过 Metersphere Api 测试页面或者浏览器插件导出 json 格式文件',
+              suffixes: new Set(['json'])
+            }
+          ],
+          selectedPlatform: {},
+          selectedPlatformValue: 'Metersphere',
+          fileList: [],
+          result: {},
+        }
+      },
+      created() {
+        this.selectedPlatform = this.platforms[0];
+      },
+      watch: {
+        selectedPlatformId() {
+          for (let i in this.platforms) {
+            if (this.platforms[i].id === this.selectedPlatformValue) {
+              this.selectedPlatform = this.platforms[i];
+              break;
+            }
+          }
+        }
+      },
+      methods: {
+        open() {
+          this.visible = true;
+        },
+        upload(file) {
+          this.fileList.push(file.file);
+          this.result = this.$fileUpload('/api/import/' + this.selectedPlatformValue + '/' + this.projectId, this.fileList, response => {
+            let res = response.data;
+            this.$success(this.$t('test_track.case.import.success'));
+            this.visible = false;
+            this.$router.push({path: '/api/test/edit', query: {id: res.id}});
+          });
+          this.fileList = [];
+        },
+        uploadValidate(file, fileList) {
+          let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
+          if (!this.selectedPlatform.suffixes.has(suffix)) {
+            this.$warning("格式错误");
+            return false;
+          }
+
+          if (file.size / 1024 / 1024 > 20) {
+            this.$warning(this.$t('test_track.case.import.upload_limit_size'));
+            return false;
+          }
+          return true;
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+  .format-tip {
+    background: #EDEDED;
+  }
+
+  .api-upload {
+    text-align: center;
+  }
+
+  .el-radio-group {
+    margin: 10px 0;
+  }
+
+  .data-format,.format-tip,.api-upload {
+    border: solid #E1E1E1 1px;
+    margin: 10px 0;
+    padding: 10px;
+    border-radius: 3px;
+  }
+
+  .api-import >>> .el-dialog__body {
+    padding: 15px 25px;
+  }
+
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseImport.vue b/frontend/src/business/components/track/case/components/TestCaseImport.vue
index 9088499638..f41ada12f3 100644
--- a/frontend/src/business/components/track/case/components/TestCaseImport.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseImport.vue
@@ -16,7 +16,7 @@
           :limit="1"
           action=""
           :on-exceed="handleExceed"
-          :beforeUpload="UploadValidate"
+          :beforeUpload="uploadValidate"
           :on-error="handleError"
           :show-file-list="false"
           :http-request="upload"
@@ -66,8 +66,8 @@
         handleExceed(files, fileList) {
           this.$warning(this.$t('test_track.case.import.upload_limit_count'));
         },
-        UploadValidate(file) {
-          var suffix =file.name.substring(file.name.lastIndexOf('.') + 1);
+        uploadValidate(file) {
+          let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
           if (suffix != 'xls' && suffix != 'xlsx') {
             this.$warning(this.$t('test_track.case.import.upload_limit_format'));
             return false;

From 16c7044b2502b4cf0b3239f6e13393ba58a146d8 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 8 Jul 2020 14:56:46 +0800
Subject: [PATCH 21/31] jenkins

---
 .../java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 6c04346e56..647d676656 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
@@ -54,14 +54,14 @@
         </if>
     </select>
     <select id="listByMethod" resultType="io.metersphere.track.dto.TestCaseDTO">
-        SELECT id,name,status,project_id,type from api_test
+        SELECT id,name,status,project_id,"api" as type from api_test
         <where>
             <if test="request.projectId!=null">
                 and project_id=#{request.projectId}
             </if>
         </where>
         UNION ALL
-        select id,name,status,project_id,type from load_test
+        select id,name,status,project_id,"perform" as type from load_test
         <where>
             <if test="request.projectId!=null">
                 and project_id= #{request.projectId}

From e45810701d6e1f881db726d7e3b535caaeb81a15 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 8 Jul 2020 15:47:44 +0800
Subject: [PATCH 22/31] ldap

---
 .../ldap/controller/LdapController.java       |  2 +-
 .../metersphere/ldap/dao/PersonRepoImpl.java  | 74 ++++++++++---------
 .../metersphere/ldap/service/LdapService.java | 28 ++-----
 .../resources/i18n/messages_en_US.properties  |  8 +-
 .../resources/i18n/messages_zh_CN.properties  |  8 +-
 .../resources/i18n/messages_zh_TW.properties  |  6 +-
 .../settings/system/LdapSetting.vue           |  7 +-
 frontend/src/i18n/en-US.js                    |  3 +-
 frontend/src/i18n/zh-CN.js                    |  3 +-
 frontend/src/i18n/zh-TW.js                    |  3 +-
 10 files changed, 77 insertions(+), 65 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
index 3c89a17c4d..0956c66abf 100644
--- a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
+++ b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
@@ -66,7 +66,7 @@ public class LdapController {
 
     @PostMapping("/test/connect")
     public void testConnect(@RequestBody LdapInfo ldapInfo) {
-        ldapService.testConnect(ldapInfo);
+        ldapService.testConnect();
     }
 
     @PostMapping("/test/login")
diff --git a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
index 00793de941..c6f98f31f9 100644
--- a/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
+++ b/backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
@@ -4,13 +4,15 @@ package io.metersphere.ldap.dao;
 import io.metersphere.commons.constants.ParamConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.EncryptUtils;
-import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.i18n.Translator;
 import io.metersphere.ldap.domain.Person;
 import io.metersphere.service.SystemParameterService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.realm.ldap.LdapUtils;
 import org.springframework.ldap.AuthenticationException;
+import org.springframework.ldap.InvalidNameException;
+import org.springframework.ldap.InvalidSearchFilterException;
+import org.springframework.ldap.NameNotFoundException;
 import org.springframework.ldap.core.*;
 import org.springframework.ldap.core.support.AbstractContextMapper;
 import org.springframework.ldap.core.support.DefaultDirObjectFactory;
@@ -38,59 +40,63 @@ public class PersonRepoImpl implements PersonRepo {
         return authenticate(dn, credentials, ldapTemplate);
     }
 
-    private boolean authenticate(String dn, String credentials, LdapTemplate ldapTemplate) {
+    private boolean authenticate(String dn, String credentials, LdapTemplate ldapTemplate) throws AuthenticationException {
         DirContext ctx = null;
         try {
             ctx = ldapTemplate.getContextSource().getContext(dn, credentials);
-//            ldapTemplate.authenticate(dn, credentials);
-            // Take care here - if a base was specified on the ContextSource
-            // that needs to be removed from the user DN for the lookup to succeed.
-            // ctx.lookup(userDn);
             return true;
-        } catch (AuthenticationException e) {
-            LogUtil.error("ldap authenticate failed..." + e);
-            System.out.println("Login failed: " + e);
-            MSException.throwException(Translator.get("authentication_failed"));
-            return false;
-        } catch (Exception e) {
-            // Context creation failed - authentication did not succeed
-            LogUtil.error("ldap authenticate failed..." + e);
-            System.out.println("Login failed: " + e);
-            MSException.throwException(Translator.get("ldap_connect_fail"));
-            return false;
         } finally {
             // It is imperative that the created DirContext instance is always closed
             LdapUtils.closeContext((LdapContext) ctx);
         }
     }
 
+
     @Override
     public Person getDnForUser(String username) {
         LdapTemplate ldapTemplate = getConnection();
-        String filter = getFilter();
 
-        List<Person> result = ldapTemplate.search(
-                query().filter(filter, username),
-                getContextMapper());
+        String filter = getUserFilter();
+        String ou = getUserOu();
 
-        System.out.println(result.toString());
+        List<Person> result = null;
+        try {
+            result = ldapTemplate.search(query().base(ou).filter(filter, username), getContextMapper());
+        } catch (NameNotFoundException e) {
+            MSException.throwException(Translator.get("login_fail_ou_error"));
+        } catch (InvalidNameException e) {
+            MSException.throwException(Translator.get("login_fail_ou_error"));
+        } catch (InvalidSearchFilterException e) {
+            MSException.throwException(Translator.get("login_fail_filter_error"));
+        }
 
         if (result.size() != 1) {
-            throw new RuntimeException(Translator.get("user_not_found_or_not_unique"));
+            MSException.throwException(Translator.get("user_not_found_or_not_unique"));
         }
+
         return result.get(0);
     }
 
-    private String getFilter() {
+    private String getUserFilter() {
         String filter = service.getValue(ParamConstants.LDAP.FILTER.getValue());
 
         if (StringUtils.isBlank(filter)) {
-            filter = "(sAMAccountName={0})";
+            MSException.throwException(Translator.get("ldap_user_filter_is_null"));
         }
 
         return filter;
     }
 
+    private String getUserOu() {
+        String ou = service.getValue(ParamConstants.LDAP.OU.getValue());
+
+        if (StringUtils.isBlank(ou)) {
+            MSException.throwException(Translator.get("ldap_ou_is_null"));
+        }
+
+        return ou;
+    }
+
     protected ContextMapper getContextMapper() {
         return new PersonContextMapper();
     }
@@ -113,10 +119,9 @@ public class PersonRepoImpl implements PersonRepo {
 
         String url = service.getValue(ParamConstants.LDAP.URL.getValue());
         String dn = service.getValue(ParamConstants.LDAP.DN.getValue());
-        String ou = service.getValue(ParamConstants.LDAP.OU.getValue());
         String password = service.getValue(ParamConstants.LDAP.PASSWORD.getValue());
 
-        preConnect(url, dn, ou, password);
+        preConnect(url, dn, password);
 
         String credentials = EncryptUtils.aesDecrypt(password).toString();
 
@@ -124,7 +129,6 @@ public class PersonRepoImpl implements PersonRepo {
         sourceLdapCtx.setUrl(url);
         sourceLdapCtx.setUserDn(dn);
         sourceLdapCtx.setPassword(credentials);
-        sourceLdapCtx.setBase(ou);
         sourceLdapCtx.setDirObjectFactory(DefaultDirObjectFactory.class);
         sourceLdapCtx.afterPropertiesSet();
         LdapTemplate ldapTemplate = new LdapTemplate(sourceLdapCtx);
@@ -136,12 +140,18 @@ public class PersonRepoImpl implements PersonRepo {
         ldapTemplate.setDefaultSearchScope(SearchScope.SUBTREE.getId());
 
         // ldapTemplate 是否可用
-        authenticate(dn, credentials, ldapTemplate);
+        try {
+            authenticate(dn, credentials, ldapTemplate);
+        } catch (AuthenticationException e) {
+            MSException.throwException(Translator.get("ldap_connect_fail_user"));
+        } catch (Exception e) {
+            MSException.throwException(Translator.get("ldap_connect_fail"));
+        }
 
         return ldapTemplate;
     }
 
-    private void preConnect(String url, String dn, String ou, String password) {
+    private void preConnect(String url, String dn, String password) {
 
         if (StringUtils.isBlank(url)) {
             MSException.throwException(Translator.get("ldap_url_is_null"));
@@ -151,10 +161,6 @@ public class PersonRepoImpl implements PersonRepo {
             MSException.throwException(Translator.get("ldap_dn_is_null"));
         }
 
-        if (StringUtils.isBlank(ou)) {
-            MSException.throwException(Translator.get("ldap_ou_is_null"));
-        }
-
         if (StringUtils.isBlank(password)) {
             MSException.throwException(Translator.get("ldap_password_is_null"));
         }
diff --git a/backend/src/main/java/io/metersphere/ldap/service/LdapService.java b/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
index d0d0467a2c..849a1d1565 100644
--- a/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
+++ b/backend/src/main/java/io/metersphere/ldap/service/LdapService.java
@@ -4,13 +4,11 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.i18n.Translator;
 import io.metersphere.ldap.dao.PersonRepoImpl;
-import io.metersphere.ldap.domain.LdapInfo;
 import io.metersphere.ldap.domain.Person;
-import org.springframework.ldap.CommunicationException;
+import org.springframework.ldap.AuthenticationException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class LdapService {
@@ -20,34 +18,22 @@ public class LdapService {
 
 
     public Person authenticate(LoginRequest request) {
-        String dn = null;
         String username = request.getUsername();
         String credentials = request.getPassword();
         Person person = null;
-        List<Person> personList = null;
+
         try {
-//            // select user by sAMAccountName
-//            personList = personRepo.findByName(username);
-//
-//            if (personList.size() == 1) {
-//                dn = personRepo.getDnForUser(username);
-//            } else if (personList.size() == 0) {
-//                MSException.throwException(Translator.get("user_not_exist") + username);
-//            } else {
-//                MSException.throwException(Translator.get("find_more_user"));
-//            }
             person = personRepo.getDnForUser(username);
-            dn = person.getDn();
-        } catch (CommunicationException e) {
-            MSException.throwException(Translator.get("ldap_connect_fail"));
+            personRepo.authenticate(person.getDn(), credentials);
+        } catch (AuthenticationException e) {
+            MSException.throwException(Translator.get("authentication_failed"));
         }
-        personRepo.authenticate(dn, credentials);
 
         return person;
     }
 
-    public void testConnect(LdapInfo ldap) {
-        personRepo.authenticate(ldap.getDn(), ldap.getPassword());
+    public void testConnect() {
+        personRepo.getConnection();
     }
 
 }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 9dabf8d3c3..1d14244156 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -120,9 +120,13 @@ ldap_url_is_null=LDAP address is empty
 ldap_dn_is_null=LDAP binding DN is empty
 ldap_ou_is_null=LDAP parameter OU is empty
 ldap_password_is_null=LDAP password is empty
-ldap_connect_fail=Connection failed
+ldap_connect_fail=Connection LDAP failed
+ldap_connect_fail_user=Connection LDAP failed, wrong DN or password bound
+ldap_user_filter_is_null=LDAP user filter is empty
 authentication_failed=User authentication failed,wrong user name or password
 user_not_found_or_not_unique=User does not exist or is not unique
 find_more_user=Multiple users found
 ldap_authentication_not_enabled=LDAP authentication is not enabled
-login_fail_email_null=Login failed, user mailbox is empty
\ No newline at end of file
+login_fail_email_null=Login failed, user mailbox is empty
+login_fail_ou_error=Login failed, please check the user OU
+login_fail_filter_error=Login failed, please check the user filter
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index fef626ea70..1a0bb91584 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -19,7 +19,7 @@ cannot_delete_current_user=无法删除当前登录用户
 connection_failed=连接失败
 user_already_exists=该用户已存在于当前成员列表中
 cannot_remove_current=无法移除当前登录用户
-login_fail=登陆失败
+login_fail=登录失败
 password_is_incorrect=密码不正确
 user_not_exist=用户不存在：
 user_has_been_disabled=用户已被禁用
@@ -120,11 +120,15 @@ ldap_url_is_null=LDAP地址为空
 ldap_dn_is_null=LDAP绑定DN为空
 ldap_ou_is_null=LDAP参数OU为空
 ldap_password_is_null=LDAP密码为空
-ldap_connect_fail=连接失败
+ldap_connect_fail=连接LDAP失败
+ldap_connect_fail_user=连接LDAP失败，绑定的DN或密码错误
+ldap_user_filter_is_null=LDAP用户过滤器为空
 authentication_failed=用户认证失败,用户名或密码错误
 user_not_found_or_not_unique=用户不存在或者不唯一
 find_more_user=查找到多个用户
 ldap_authentication_not_enabled=LDAP认证未启用
 login_fail_email_null=登录失败，用户邮箱为空
+login_fail_ou_error=登录失败，请检查用户OU
+login_fail_filter_error=登录失败，请检查用户过滤器
 
 
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 04c273276d..79d31c162b 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -120,9 +120,13 @@ ldap_url_is_null=LDAP地址為空
 ldap_dn_is_null=LDAP綁定DN為空
 ldap_ou_is_null=LDAP參數OU為空
 ldap_password_is_null=LDAP密碼為空
-ldap_connect_fail=連接失敗
+ldap_connect_fail=連接LDAP失敗
+ldap_connect_fail_user=連接LDAP失敗，綁定的DN或密碼錯誤
+ldap_user_filter_is_null=LDAP用戶過濾器為空
 authentication_failed=用戶認證失敗,用戶名或密碼錯誤
 user_not_found_or_not_unique=用戶不存在或者不唯一
 find_more_user=查找到多個用戶
 ldap_authentication_not_enabled=LDAP認證未啟用
 login_fail_email_null=登錄失敗，用戶郵箱為空
+login_fail_ou_error=登錄失敗，請檢查用戶OU
+login_fail_filter_error=登錄失敗，請檢查用戶過濾器
diff --git a/frontend/src/business/components/settings/system/LdapSetting.vue b/frontend/src/business/components/settings/system/LdapSetting.vue
index 62e4a97fc7..25053afc78 100644
--- a/frontend/src/business/components/settings/system/LdapSetting.vue
+++ b/frontend/src/business/components/settings/system/LdapSetting.vue
@@ -82,7 +82,7 @@
           dn: {required: true, message: this.$t('ldap.input_dn'), trigger: ['change', 'blur']},
           password: {required: true, message: this.$t('ldap.input_password'), trigger: ['change', 'blur']},
           ou: {required: true, message: this.$t('ldap.input_ou'), trigger: ['change', 'blur']},
-          filter: {required: true, message: this.$t('ldap.input_ou'), trigger: ['change', 'blur']}
+          filter: {required: true, message: this.$t('ldap.input_filter'), trigger: ['change', 'blur']}
         },
         loginFormRules: {
           username: {required: true, message: this.$t('ldap.input_username'), trigger: 'blur'},
@@ -137,6 +137,11 @@
           return false;
         }
 
+        if (!this.form.filter) {
+          this.$warning(this.$t('ldap.filter_cannot_be_empty'));
+          return false;
+        }
+
         this.loginForm = {};
         this.loginVisible = true;
       },
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 922d011d6c..107bc42045 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -599,7 +599,7 @@ export default {
     'input_username': 'please enter user name',
     'input_url_placeholder': 'Please enter the LDAP address (eg ldap://localhost:389)',
     'input_ou_placeholder': 'Enter user OU (use | to separate each OU)',
-    'input_filter_placeholder': 'Input filter [Possible options are cn or uid or sAMAccountName=%(user)s]',
+    'input_filter_placeholder': 'Input filter [Possible options are cn or uid or sAMAccountName={0}, eg: (uid={0})]',
     'test_connect': 'Test Connection',
     'test_login': 'Test Login',
     'edit': 'Edit',
@@ -607,6 +607,7 @@ export default {
     'url_cannot_be_empty': 'LDAP address cannot be empty',
     'dn_cannot_be_empty': 'LDAP DN cannot be empty',
     'ou_cannot_be_empty': 'LDAP OU cannot be empty',
+    'filter_cannot_be_empty': 'LDAP user filter cannot be empty',
     'password_cannot_be_empty': 'LDAP password cannot be empty',
   },
   schedule: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 58a82c5099..45434392d5 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -596,7 +596,7 @@ export default {
     'input_username': '请输入用户名',
     'input_url_placeholder': '请输入LDAP地址 (如 ldap://localhost:389)',
     'input_ou_placeholder': '输入用户OU (使用|分隔各OU)',
-    'input_filter_placeholder': '输入过滤器 [可能的选项是cn或uid或sAMAccountName=%(user)s]',
+    'input_filter_placeholder': '输入过滤器 [可能的选项是cn或uid或sAMAccountName={0}, 如：(uid={0})]',
     'test_connect': '测试连接',
     'test_login': '测试登录',
     'edit': '编辑',
@@ -604,6 +604,7 @@ export default {
     'url_cannot_be_empty': 'LDAP 地址不能为空',
     'dn_cannot_be_empty': 'LDAP DN不能为空',
     'ou_cannot_be_empty': 'LDAP OU不能为空',
+    'filter_cannot_be_empty': 'LDAP 用户过滤器不能为空',
     'password_cannot_be_empty': 'LDAP 密码不能为空',
   },
   schedule: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 9eda033d19..0ea369ad9b 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -596,7 +596,7 @@ export default {
     'input_username': '請輸入用戶名',
     'input_url_placeholder': '請輸入LDAP地址 (如 ldap://localhost:389)',
     'input_ou_placeholder': '輸入用戶OU (使用|分隔各OU)',
-    'input_filter_placeholder': '輸入過濾器 [可能的選項是cn或uid或sAMAccountName=%(user)s]',
+    'input_filter_placeholder': '輸入過濾器 [可能的選項是cn或uid或sAMAccountName={0}, 如：(uid={0})]',
     'test_connect': '測試連接',
     'test_login': '測試登錄',
     'edit': '編輯',
@@ -604,6 +604,7 @@ export default {
     'url_cannot_be_empty': 'LDAP 地址不能為空',
     'dn_cannot_be_empty': 'LDAP DN不能為空',
     'ou_cannot_be_empty': 'LDAP OU不能為空',
+    'filter_cannot_be_empty': 'LDAP 用戶過濾器不能為空',
     'password_cannot_be_empty': 'LDAP 密碼不能為空',
   },
   schedule: {

From 5318537e12c69dde90c92f40e29165401a573ce7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 8 Jul 2020 17:56:05 +0800
Subject: [PATCH 23/31] =?UTF-8?q?=E6=94=AF=E6=8C=81=20postman=20=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/APITestController.java     |   6 +-
 .../dto/parse/postman/PostmanCollection.java  |  13 +
 .../parse/postman/PostmanCollectionInfo.java  |  13 +
 .../api/dto/parse/postman/PostmanItem.java    |  13 +
 .../dto/parse/postman/PostmanKeyValue.java    |  18 ++
 .../api/dto/parse/postman/PostmanRequest.java |  18 ++
 .../api/dto/parse/postman/PostmanUrl.java     |  14 +
 .../api/dto/scenario/KeyValue.java            |   8 +
 .../api/parse/ApiImportAbstractParser.java    |  37 +++
 .../api/parse/ApiImportParserFactory.java     |   2 +
 .../io/metersphere/api/parse/MsParser.java    |  24 +-
 .../metersphere/api/parse/PostmanParser.java  | 262 ++++++++++++++++++
 .../api/service/APITestService.java           |  24 +-
 .../commons/constants/MsRequestBodyType.java  |  17 ++
 .../constants/PostmanRequestBodyMode.java     |  16 ++
 .../components/api/test/ApiTestConfig.vue     |   5 +-
 .../api/test/components/import/ApiImport.vue  |  32 ++-
 frontend/src/i18n/en-US.js                    |  13 +
 frontend/src/i18n/zh-CN.js                    |  13 +
 frontend/src/i18n/zh-TW.js                    |  13 +
 20 files changed, 509 insertions(+), 52 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollection.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollectionInfo.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanItem.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanKeyValue.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanRequest.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java
 create mode 100644 backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
 create mode 100644 backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/MsRequestBodyType.java
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/PostmanRequestBodyMode.java

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index ced4f7f2df..035d922ec5 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -96,10 +96,10 @@ public class APITestController {
         return apiTestService.run(request);
     }
 
-    @PostMapping("/import/{platform}/{projectId}")
+    @PostMapping("/import/{platform}")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public ApiTest testCaseImport(MultipartFile file, @PathVariable String platform, @PathVariable String projectId) {
-        return apiTestService.apiTestImport(file, platform, projectId);
+    public ApiTest testCaseImport(MultipartFile file, @PathVariable String platform) {
+        return apiTestService.apiTestImport(file, platform);
     }
 
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollection.java b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollection.java
new file mode 100644
index 0000000000..636feab232
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollection.java
@@ -0,0 +1,13 @@
+package io.metersphere.api.dto.parse.postman;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PostmanCollection {
+
+    private PostmanCollectionInfo info;
+
+    private List<PostmanItem> item;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollectionInfo.java b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollectionInfo.java
new file mode 100644
index 0000000000..d5307a7cda
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanCollectionInfo.java
@@ -0,0 +1,13 @@
+package io.metersphere.api.dto.parse.postman;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class PostmanCollectionInfo {
+
+    @JSONField(name = "_postman_id")
+    private String postmanId;
+    private String name;
+    private String schema;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanItem.java b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanItem.java
new file mode 100644
index 0000000000..1d780e7d23
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanItem.java
@@ -0,0 +1,13 @@
+package io.metersphere.api.dto.parse.postman;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PostmanItem {
+
+    private String name;
+    private PostmanRequest request;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanKeyValue.java b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanKeyValue.java
new file mode 100644
index 0000000000..c68e4fc114
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanKeyValue.java
@@ -0,0 +1,18 @@
+package io.metersphere.api.dto.parse.postman;
+
+import lombok.Data;
+
+@Data
+public class PostmanKeyValue {
+    private String key;
+    private String value;
+    private String type;
+
+    public PostmanKeyValue() {
+    }
+
+    public PostmanKeyValue(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanRequest.java b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanRequest.java
new file mode 100644
index 0000000000..59c0e97fa7
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanRequest.java
@@ -0,0 +1,18 @@
+package io.metersphere.api.dto.parse.postman;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PostmanRequest {
+
+    private String method;
+    private String schema;
+    private List<PostmanKeyValue> header;
+    private JSONObject body;
+    private JSONObject auth;
+    private PostmanUrl url;
+    private String description;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java
new file mode 100644
index 0000000000..55481b4b12
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java
@@ -0,0 +1,14 @@
+package io.metersphere.api.dto.parse.postman;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PostmanUrl {
+
+    private String raw;
+    private String protocol;
+    private String port;
+    private List<PostmanKeyValue> query;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
index 26d1450608..67c7311b5d 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
@@ -6,4 +6,12 @@ import lombok.Data;
 public class KeyValue {
     private String name;
     private String value;
+
+    public KeyValue() {
+    }
+
+    public KeyValue(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java b/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
new file mode 100644
index 0000000000..0e3ef0e4c1
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
@@ -0,0 +1,37 @@
+package io.metersphere.api.parse;
+
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.LogUtil;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public abstract class ApiImportAbstractParser implements ApiImportParser {
+
+    protected String getApiTestStr(InputStream source) {
+        BufferedReader bufferedReader = null;
+        StringBuilder testStr = null;
+        try {
+            bufferedReader = new BufferedReader(new InputStreamReader(source, "UTF-8"));
+            testStr = new StringBuilder();
+            String inputStr = null;
+            while ((inputStr = bufferedReader.readLine()) != null) {
+                testStr.append(inputStr);
+            }
+        } catch (Exception e) {
+            MSException.throwException(e.getMessage());
+            LogUtil.error(e.getMessage(), e);
+        } finally {
+            try {
+                source.close();
+            } catch (IOException e) {
+                MSException.throwException(e.getMessage());
+                LogUtil.error(e.getMessage(), e);
+            }
+        }
+        return testStr.toString();
+    }
+
+}
diff --git a/backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java b/backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java
index a6b425df5f..d2a25ba819 100644
--- a/backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java
+++ b/backend/src/main/java/io/metersphere/api/parse/ApiImportParserFactory.java
@@ -10,6 +10,8 @@ public class ApiImportParserFactory {
     public static ApiImportParser getApiImportParser(String platform) {
         if (StringUtils.equals(ApiImportPlatform.Metersphere.name(), platform)) {
             return new MsParser();
+        } else if (StringUtils.equals(ApiImportPlatform.Postman.name(), platform)) {
+            return new PostmanParser();
         }
         return null;
     }
diff --git a/backend/src/main/java/io/metersphere/api/parse/MsParser.java b/backend/src/main/java/io/metersphere/api/parse/MsParser.java
index 8eec7b8367..26af2afc63 100644
--- a/backend/src/main/java/io/metersphere/api/parse/MsParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/MsParser.java
@@ -7,29 +7,11 @@ import io.metersphere.commons.utils.LogUtil;
 
 import java.io.*;
 
-public class MsParser implements ApiImportParser {
+public class MsParser extends ApiImportAbstractParser {
 
     @Override
-    public ApiImport parse(InputStream source) {BufferedReader bufferedReader = null;
-        StringBuilder testStr = null;
-        try {
-            bufferedReader = new BufferedReader(new InputStreamReader(source, "UTF-8"));
-            testStr = new StringBuilder();
-            String inputStr = null;
-            while ((inputStr = bufferedReader.readLine()) != null) {
-                testStr.append(inputStr);
-            }
-        } catch (Exception e) {
-            MSException.throwException(e.getMessage());
-            LogUtil.error(e.getMessage(), e);
-        } finally {
-            try {
-                source.close();
-            } catch (IOException e) {
-                MSException.throwException(e.getMessage());
-                LogUtil.error(e.getMessage(), e);
-            }
-        }
+    public ApiImport parse(InputStream source) {
+        String testStr = getApiTestStr(source);
         return JSON.parseObject(testStr.toString(), ApiImport.class);
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java b/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
new file mode 100644
index 0000000000..8b676fa1c6
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
@@ -0,0 +1,262 @@
+package io.metersphere.api.parse;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import io.metersphere.api.dto.parse.ApiImport;
+import io.metersphere.api.dto.parse.postman.*;
+import io.metersphere.api.dto.scenario.Body;
+import io.metersphere.api.dto.scenario.KeyValue;
+import io.metersphere.api.dto.scenario.Request;
+import io.metersphere.api.dto.scenario.Scenario;
+import io.metersphere.commons.constants.MsRequestBodyType;
+import io.metersphere.commons.constants.PostmanRequestBodyMode;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.LogUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PostmanParser extends ApiImportAbstractParser {
+
+    @Override
+    public ApiImport parse(InputStream source) {
+        String testStr = getApiTestStr(source);
+
+//        String testStr = "{\n" +
+//                "\t\"info\": {\n" +
+//                "\t\t\"_postman_id\": \"9721cd51-8626-4f61-9ac1-e77b8399cca8\",\n" +
+//                "\t\t\"name\": \"test\",\n" +
+//                "\t\t\"schema\": \"https://schema.getpostman.com/json/collection/v2.1.0/collection.json\"\n" +
+//                "\t},\n" +
+//                "\t\"item\": [\n" +
+//                "\t\t{\n" +
+//                "\t\t\t\"name\": \"test\",\n" +
+//                "\t\t\t\"request\": {\n" +
+//                "\t\t\t\t\"auth\": {\n" +
+//                "\t\t\t\t\t\"type\": \"basic\",\n" +
+//                "\t\t\t\t\t\"basic\": [\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"password\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
+//                "\t\t\t\t\t\t},\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"username\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t]\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"method\": \"POST\",\n" +
+//                "\t\t\t\t\"header\": [\n" +
+//                "\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\"key\": \"aaa\",\n" +
+//                "\t\t\t\t\t\t\"value\": \"testH\",\n" +
+//                "\t\t\t\t\t\t\"type\": \"text\"\n" +
+//                "\t\t\t\t\t}\n" +
+//                "\t\t\t\t],\n" +
+//                "\t\t\t\t\"body\": {\n" +
+//                "\t\t\t\t\t\"mode\": \"raw\",\n" +
+//                "\t\t\t\t\t\"raw\": \"<html>\\n</html>\\n\",\n" +
+//                "\t\t\t\t\t\"options\": {\n" +
+//                "\t\t\t\t\t\t\"raw\": {\n" +
+//                "\t\t\t\t\t\t\t\"language\": \"html\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t}\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"url\": {\n" +
+//                "\t\t\t\t\t\"raw\": \"https://localhost:8080?tset=test\",\n" +
+//                "\t\t\t\t\t\"protocol\": \"https\",\n" +
+//                "\t\t\t\t\t\"host\": [\n" +
+//                "\t\t\t\t\t\t\"localhost\"\n" +
+//                "\t\t\t\t\t],\n" +
+//                "\t\t\t\t\t\"port\": \"8080\",\n" +
+//                "\t\t\t\t\t\"query\": [\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"tset\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"description\": \"test\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t]\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"description\": \"dd\"\n" +
+//                "\t\t\t},\n" +
+//                "\t\t\t\"response\": []\n" +
+//                "\t\t},\n" +
+//                "\t\t{\n" +
+//                "\t\t\t\"name\": \"test Copy\",\n" +
+//                "\t\t\t\"request\": {\n" +
+//                "\t\t\t\t\"auth\": {\n" +
+//                "\t\t\t\t\t\"type\": \"basic\",\n" +
+//                "\t\t\t\t\t\"basic\": [\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"password\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
+//                "\t\t\t\t\t\t},\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"username\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t]\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"method\": \"POST\",\n" +
+//                "\t\t\t\t\"header\": [\n" +
+//                "\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\"key\": \"testH\",\n" +
+//                "\t\t\t\t\t\t\"value\": \"testH\",\n" +
+//                "\t\t\t\t\t\t\"type\": \"text\"\n" +
+//                "\t\t\t\t\t}\n" +
+//                "\t\t\t\t],\n" +
+//                "\t\t\t\t\"body\": {\n" +
+//                "\t\t\t\t\t\"mode\": \"raw\",\n" +
+//                "\t\t\t\t\t\"raw\": \"{\\\"name\\\":\\\"test\\\"}\\n\",\n" +
+//                "\t\t\t\t\t\"options\": {\n" +
+//                "\t\t\t\t\t\t\"raw\": {\n" +
+//                "\t\t\t\t\t\t\t\"language\": \"json\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t}\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"url\": {\n" +
+//                "\t\t\t\t\t\"raw\": \"http://localhost:8081\",\n" +
+//                "\t\t\t\t\t\"protocol\": \"http\",\n" +
+//                "\t\t\t\t\t\"host\": [\n" +
+//                "\t\t\t\t\t\t\"localhost\"\n" +
+//                "\t\t\t\t\t],\n" +
+//                "\t\t\t\t\t\"port\": \"8081\"\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"description\": \"dd\"\n" +
+//                "\t\t\t},\n" +
+//                "\t\t\t\"response\": []\n" +
+//                "\t\t},\n" +
+//                "\t\t{\n" +
+//                "\t\t\t\"name\": \"test Copy Copy\",\n" +
+//                "\t\t\t\"request\": {\n" +
+//                "\t\t\t\t\"auth\": {\n" +
+//                "\t\t\t\t\t\"type\": \"basic\",\n" +
+//                "\t\t\t\t\t\"basic\": [\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"password\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
+//                "\t\t\t\t\t\t},\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"username\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t]\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"method\": \"POST\",\n" +
+//                "\t\t\t\t\"header\": [\n" +
+//                "\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\"key\": \"testH\",\n" +
+//                "\t\t\t\t\t\t\"value\": \"testH\",\n" +
+//                "\t\t\t\t\t\t\"type\": \"text\"\n" +
+//                "\t\t\t\t\t}\n" +
+//                "\t\t\t\t],\n" +
+//                "\t\t\t\t\"body\": {\n" +
+//                "\t\t\t\t\t\"mode\": \"urlencoded\",\n" +
+//                "\t\t\t\t\t\"urlencoded\": [\n" +
+//                "\t\t\t\t\t\t{\n" +
+//                "\t\t\t\t\t\t\t\"key\": \"test\",\n" +
+//                "\t\t\t\t\t\t\t\"value\": \"tset\",\n" +
+//                "\t\t\t\t\t\t\t\"description\": \"dd\",\n" +
+//                "\t\t\t\t\t\t\t\"type\": \"text\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t],\n" +
+//                "\t\t\t\t\t\"options\": {\n" +
+//                "\t\t\t\t\t\t\"raw\": {\n" +
+//                "\t\t\t\t\t\t\t\"language\": \"json\"\n" +
+//                "\t\t\t\t\t\t}\n" +
+//                "\t\t\t\t\t}\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"url\": {\n" +
+//                "\t\t\t\t\t\"raw\": \"http://localhost:8081\",\n" +
+//                "\t\t\t\t\t\"protocol\": \"http\",\n" +
+//                "\t\t\t\t\t\"host\": [\n" +
+//                "\t\t\t\t\t\t\"localhost\"\n" +
+//                "\t\t\t\t\t],\n" +
+//                "\t\t\t\t\t\"port\": \"8081\"\n" +
+//                "\t\t\t\t},\n" +
+//                "\t\t\t\t\"description\": \"dd\"\n" +
+//                "\t\t\t},\n" +
+//                "\t\t\t\"response\": []\n" +
+//                "\t\t}\n" +
+//                "\t],\n" +
+//                "\t\"protocolProfileBehavior\": {}\n" +
+//                "}";
+
+        PostmanCollection postmanCollection = JSON.parseObject(testStr.toString(), PostmanCollection.class);
+        PostmanCollectionInfo info = postmanCollection.getInfo();
+        List<Request> requests = parseRequests(postmanCollection);
+        ApiImport apiImport = new ApiImport();
+        List<Scenario> scenarios = new ArrayList<>();
+        Scenario scenario = new Scenario();
+        scenario.setRequests(requests);
+        scenario.setName(info.getName());
+        scenarios.add(scenario);
+        apiImport.setScenarios(scenarios);
+        return apiImport;
+    }
+
+    private List<KeyValue> parseKeyValue(List<PostmanKeyValue> postmanKeyValues) {
+        if (postmanKeyValues == null) {
+            return null;
+        }
+        List<KeyValue> keyValues = new ArrayList<>();
+        postmanKeyValues.forEach(item -> {
+            keyValues.add(new KeyValue(item.getKey(), item.getValue()));
+        });
+        return keyValues;
+    }
+
+    private List<Request> parseRequests(PostmanCollection postmanCollection) {
+        List<PostmanItem> item = postmanCollection.getItem();
+        List<Request> requests = new ArrayList<>();
+        for (PostmanItem requestItem : item) {
+            Request request = new Request();
+            PostmanRequest requestDesc = requestItem.getRequest();
+            PostmanUrl url = requestDesc.getUrl();
+            request.setName(requestItem.getName());
+            request.setUrl(url.getRaw());
+            request.setUseEnvironment(false);
+            request.setMethod(requestDesc.getMethod());
+            request.setHeaders(parseKeyValue(requestDesc.getHeader()));
+            request.setParameters(parseKeyValue(url.getQuery()));
+            Body body = new Body();
+            JSONObject postmanBody = requestDesc.getBody();
+            String bodyMode = postmanBody.getString("mode");
+            if (StringUtils.equals(bodyMode, PostmanRequestBodyMode.RAW.value())) {
+                body.setRaw(postmanBody.getString(bodyMode));
+                body.setType(MsRequestBodyType.RAW.value());
+                String contentType = postmanBody.getJSONObject("options").getJSONObject("raw").getString("language");
+                List<KeyValue> headers = request.getHeaders();
+                boolean hasContentType = false;
+                for (KeyValue header : headers) {
+                    if (StringUtils.equalsIgnoreCase(header.getName(), "Content-Type")) {
+                        hasContentType = true;
+                    }
+                }
+                if (!hasContentType) {
+                    headers.add(new KeyValue("Content-Type", contentType));
+                }
+            } else if (StringUtils.equals(bodyMode, PostmanRequestBodyMode.FORM_DATA.value()) || StringUtils.equals(bodyMode, PostmanRequestBodyMode.URLENCODED.value())) {
+                List<PostmanKeyValue> postmanKeyValues = JSON.parseArray(postmanBody.getString(bodyMode), PostmanKeyValue.class);
+                body.setType(MsRequestBodyType.KV.value());
+                body.setKvs(parseKeyValue(postmanKeyValues));
+            }
+            request.setBody(body);
+            requests.add(request);
+        }
+        return requests;
+    }
+
+}
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 52cea01489..8739dd253d 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -19,6 +19,7 @@ import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.constants.ScheduleType;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.i18n.Translator;
@@ -260,24 +261,23 @@ public class APITestService {
         scheduleService.addOrUpdateCronJob(request, ApiTestJob.getJobKey(request.getResourceId()), ApiTestJob.getTriggerKey(request.getResourceId()), ApiTestJob.class);
     }
 
-    public ApiTest apiTestImport(MultipartFile file, String platform, String projectId) {
+    public ApiTest apiTestImport(MultipartFile file, String platform) {
+        ApiImportParser apiImportParser = ApiImportParserFactory.getApiImportParser(platform);
+        ApiImport apiImport = null;
         try {
-
-            ApiImportParser apiImportParser = ApiImportParserFactory.getApiImportParser(platform);
-            ApiImport apiImport = apiImportParser.parse(file.getInputStream());
-            SaveAPITestRequest request = getImportApiTest(file, projectId, apiImport);
-            ApiTest test = createTest(request);
-            return test;
-        } catch (IOException e) {
-            e.printStackTrace();
+            apiImport = apiImportParser.parse(file.getInputStream());
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+            MSException.throwException(Translator.get("parse_data_error"));
         }
-        return null;
+        SaveAPITestRequest request = getImportApiTest(file, apiImport);
+        return createTest(request);
     }
 
-    private SaveAPITestRequest getImportApiTest(MultipartFile file, String projectId, ApiImport apiImport) {
+    private SaveAPITestRequest getImportApiTest(MultipartFile file, ApiImport apiImport) {
         SaveAPITestRequest request =  new SaveAPITestRequest();
         request.setName(file.getOriginalFilename());
-        request.setProjectId(projectId);
+        request.setProjectId("");
         request.setScenarioDefinition(apiImport.getScenarios());
         request.setUserId(SessionUtils.getUser().getId());
         request.setId(UUID.randomUUID().toString());
diff --git a/backend/src/main/java/io/metersphere/commons/constants/MsRequestBodyType.java b/backend/src/main/java/io/metersphere/commons/constants/MsRequestBodyType.java
new file mode 100644
index 0000000000..85a08b821d
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/MsRequestBodyType.java
@@ -0,0 +1,17 @@
+package io.metersphere.commons.constants;
+
+public enum MsRequestBodyType {
+
+
+    KV("KeyValue"), FORM_DATA("Form Data"), RAW("Raw");
+
+    private String value;
+
+    MsRequestBodyType(String value) {
+        this.value = value;
+    }
+
+    public String value() {
+        return this.value;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/commons/constants/PostmanRequestBodyMode.java b/backend/src/main/java/io/metersphere/commons/constants/PostmanRequestBodyMode.java
new file mode 100644
index 0000000000..b0ce2714b1
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/PostmanRequestBodyMode.java
@@ -0,0 +1,16 @@
+package io.metersphere.commons.constants;
+
+public enum PostmanRequestBodyMode {
+
+    RAW("raw"), FORM_DATA("formdata"), URLENCODED("urlencoded"), FILE("file");
+
+    private String value;
+
+    PostmanRequestBodyMode(String value) {
+        this.value = value;
+    }
+
+    public String value() {
+        return this.value;
+    }
+}
diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 1013f64f18..9b9e34d004 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -43,13 +43,12 @@
                     {{$t('api_test.export_config')}}
                   </el-dropdown-item>
                   <el-dropdown-item command="import" :disabled="isReadOnly">
-                    导入
-<!--                    {{$t('api_test.export_config')}}-->
+                    {{$t('api_test.api_import.label')}}
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
 
-              <api-import :project-id="test.projectId" ref="apiImport"/>
+              <api-import ref="apiImport"/>
 
               <ms-api-report-dialog :test-id="id" ref="reportDialog"/>
 
diff --git a/frontend/src/business/components/api/test/components/import/ApiImport.vue b/frontend/src/business/components/api/test/components/import/ApiImport.vue
index ab74065566..5aad534353 100644
--- a/frontend/src/business/components/api/test/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/test/components/import/ApiImport.vue
@@ -1,8 +1,8 @@
 <template>
-  <el-dialog :title="'接口测试导入'" :visible.sync="visible" class="api-import" v-loading="result.loading">
+  <el-dialog :title="$t('api_test.api_import.title')" :visible.sync="visible" class="api-import" v-loading="result.loading">
 
     <div class="data-format">
-      <div>数据格式</div>
+      <div>{{$t('api_test.api_import.data_format')}}</div>
       <el-radio-group v-model="selectedPlatformValue">
         <el-radio v-for="(item, index) in platforms" :key="index" :label="item.value">{{item.name}}</el-radio>
       </el-radio-group>
@@ -19,17 +19,17 @@
         :file-list="fileList"
         multiple>
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip" slot="tip">文件大小不超过 20 M</div>
+        <div class="el-upload__text" v-html="$t('load_test.upload_tips')"></div>
+        <div class="el-upload__tip" slot="tip">{{$t('api_test.api_import.file_size_limit')}}</div>
       </el-upload>
     </div>
 
     <div class="format-tip">
       <div>
-        <span>说明：{{selectedPlatform.tip}}</span>
+        <span>{{$t('api_test.api_import.tip')}}：{{selectedPlatform.tip}}</span>
       </div>
       <div>
-        <span>导出方法：{{selectedPlatform.exportTip}}</span>
+        <span>{{$t('api_test.api_import.export_tip')}}：{{selectedPlatform.exportTip}}</span>
       </div>
     </div>
 
@@ -41,7 +41,6 @@
     export default {
       name: "ApiImport",
       components: {MsDialogFooter},
-      props: ['projectId'],
       data() {
         return {
           visible: false,
@@ -49,8 +48,15 @@
             {
               name: 'Metersphere',
               value: 'Metersphere',
-              tip: '支持 Metersphere json 格式',
-              exportTip: '通过 Metersphere Api 测试页面或者浏览器插件导出 json 格式文件',
+              tip: this.$t('api_test.api_import.ms_tip'),
+              exportTip: this.$t('api_test.api_import.ms_export_tip'),
+              suffixes: new Set(['json'])
+            },
+            {
+              name: 'Postman',
+              value: 'Postman',
+              tip: this.$t('api_test.api_import.postman_tip'),
+              exportTip: this.$t('api_test.api_import.post_man_export_tip'),
               suffixes: new Set(['json'])
             }
           ],
@@ -64,9 +70,9 @@
         this.selectedPlatform = this.platforms[0];
       },
       watch: {
-        selectedPlatformId() {
+        selectedPlatformValue() {
           for (let i in this.platforms) {
-            if (this.platforms[i].id === this.selectedPlatformValue) {
+            if (this.platforms[i].value === this.selectedPlatformValue) {
               this.selectedPlatform = this.platforms[i];
               break;
             }
@@ -79,7 +85,7 @@
         },
         upload(file) {
           this.fileList.push(file.file);
-          this.result = this.$fileUpload('/api/import/' + this.selectedPlatformValue + '/' + this.projectId, this.fileList, response => {
+          this.result = this.$fileUpload('/api/import/' + this.selectedPlatformValue, this.fileList, response => {
             let res = response.data;
             this.$success(this.$t('test_track.case.import.success'));
             this.visible = false;
@@ -90,7 +96,7 @@
         uploadValidate(file, fileList) {
           let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
           if (!this.selectedPlatform.suffixes.has(suffix)) {
-            this.$warning("格式错误");
+            this.$warning(this.$t('api_test.api_import.suffixFormatErr'));
             return false;
           }
 
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 922d011d6c..aa6dd5d5be 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -364,6 +364,19 @@ export default {
         json_path_expression: "JSONPath expression",
         xpath_expression: "XPath expression",
       }
+    },
+    api_import: {
+      label: "Import",
+      title: "API test import",
+      data_format: "Data format",
+      file_size_limit: "The file size does not exceed 20 M",
+      tip: "Instructions",
+      export_tip: "Export Tip",
+      ms_tip: "Support for Metersphere JSON format",
+      ms_export_tip: "Export jSON-formatted files via Metersphere website or browser plug-ins",
+      postman_tip: "Only Postman Collection V2.1 json files are supported",
+      post_man_export_tip: "Export the test collection by Postman",
+      suffixFormatErr: "The file format does not meet the requirements",
     }
   },
   api_report: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 58a82c5099..d53cc46398 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -362,6 +362,19 @@ export default {
         json_path_expression: "JSONPath表达式",
         xpath_expression: "XPath表达式",
       }
+    },
+    api_import: {
+      label: "导入",
+      title: "接口测试导入",
+      data_format: "数据格式",
+      file_size_limit: "文件大小不超过 20 M",
+      tip: "说明",
+      export_tip: "导出方法",
+      ms_tip: "支持 Metersphere json 格式",
+      ms_export_tip: "通过 Metersphere Api 测试页面或者浏览器插件导出 json 格式文件",
+      postman_tip: "只支持 Postman Collection v2.1 格式的 json 文件",
+      post_man_export_tip: "通过 Postman 导出测试集合",
+      suffixFormatErr: "文件格式不符合要求",
     }
   },
   api_report: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 9eda033d19..d06fea9a93 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -362,6 +362,19 @@ export default {
         json_path_expression: "JSONPath運算式",
         xpath_expression: "XPath運算式",
       }
+    },
+    api_import: {
+      label: "導入",
+      title: "接口測試導入",
+      data_format: "數據格式",
+      file_size_limit: "文件大小不超過 20 M",
+      tip: "說明",
+      export_tip: "導出方法",
+      ms_tip: "支持 Metersphere json 格式",
+      ms_export_tip: "通過 Metersphere Api 測試頁面或者瀏覽器插件導出 json 格式文件",
+      postman_tip: "只支持 Postman Collection v2.1 格式的 json 文件",
+      post_man_export_tip: "通過 Postman 導出測試集合",
+      suffixFormatErr: "文件格式不符合要求",
     }
   },
   api_report: {

From e089e967c09e37dfbc09c55f1e6c63beda286f91 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 9 Jul 2020 11:23:58 +0800
Subject: [PATCH 24/31] .

---
 .../java/io/metersphere/api/controller/APITestController.java | 4 ++--
 .../metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml | 3 +++
 .../performance/controller/PerformanceTestController.java     | 4 ++--
 .../track/controller/TestPlanTestCaseController.java          | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index ced4f7f2df..cc009120fe 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -50,8 +50,8 @@ public class APITestController {
         return apiTestService.getApiTestByProjectId(projectId);
     }
 
-    /*查询某个api测试状态*/
-    @GetMapping("/list/all/{testId}")
+
+    @GetMapping("/state/get/{testId}")
     public ApiTest apiState(@PathVariable String testId) {
         return apiTestService.getApiTestByTestId(testId);
     }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index d30a68dad6..c9950afca1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -71,6 +71,9 @@
             <if test="request.planId != null">
                 and test_plan_test_case.plan_id = #{request.planId}
             </if>
+            <if test="request.method != null">
+                and test_case.method = #{request.method}
+            </if>
 
             <if test="request.nodePaths != null and request.nodePaths.size() > 0">
                 and test_case.node_path in
diff --git a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
index 4620020bef..b0520ec039 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
@@ -55,8 +55,8 @@ public class PerformanceTestController {
         return performanceTestService.getLoadTestByProjectId(projectId);
     }
 
-    /*查询某个测试状态*/
-    @GetMapping("/list/all/{testId}")
+
+    @GetMapping("/state/get/{testId}")
     public LoadTest listByTestId(@PathVariable String testId) {
         return performanceTestService.getLoadTestBytestId(testId);
     }
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
index dca34abc3c..77e1fdee6c 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
@@ -42,6 +42,7 @@ public class TestPlanTestCaseController {
         QueryTestPlanCaseRequest request = new QueryTestPlanCaseRequest();
         request.setPlanId(planId);
         request.setNodePaths(list);
+        request.setMethod("auto");
         return testPlanTestCaseService.listByNode(request);
     }
 

From 458583ce1f2e0d8474a836c4799c6fd4bb8940cc Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 9 Jul 2020 11:39:05 +0800
Subject: [PATCH 25/31] =?UTF-8?q?Swagger=E5=AF=BC=E5=85=A5=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/parse/swagger/SwaggerApi.java     |  17 ++
 .../api/dto/parse/swagger/SwaggerInfo.java    |  11 ++
 .../dto/parse/swagger/SwaggerParameter.java   |  13 ++
 .../api/dto/parse/swagger/SwaggerRequest.java |  16 ++
 .../api/dto/parse/swagger/SwaggerTag.java     |   9 +
 .../metersphere/api/parse/PostmanParser.java  | 167 ------------------
 .../metersphere/api/parse/SwaggerParser.java  | 106 +++++++++++
 7 files changed, 172 insertions(+), 167 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerApi.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerInfo.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerParameter.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerRequest.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerTag.java
 create mode 100644 backend/src/main/java/io/metersphere/api/parse/SwaggerParser.java

diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerApi.java b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerApi.java
new file mode 100644
index 0000000000..9eeeed860d
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerApi.java
@@ -0,0 +1,17 @@
+package io.metersphere.api.dto.parse.swagger;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SwaggerApi {
+    private String swagger;
+    private SwaggerInfo info;
+    private String host;
+    private String basePath;
+    private List<String> schemes;
+    private List<SwaggerTag> tags;
+    private JSONObject paths;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerInfo.java b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerInfo.java
new file mode 100644
index 0000000000..56d538f340
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerInfo.java
@@ -0,0 +1,11 @@
+package io.metersphere.api.dto.parse.swagger;
+
+import lombok.Data;
+
+@Data
+public class SwaggerInfo {
+    private String version;
+    private String title;
+    private String description;
+    private String termsOfService;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerParameter.java b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerParameter.java
new file mode 100644
index 0000000000..63196e0211
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerParameter.java
@@ -0,0 +1,13 @@
+package io.metersphere.api.dto.parse.swagger;
+
+import lombok.Data;
+
+@Data
+public class SwaggerParameter {
+    private String name;
+    private String in;
+    private String description;
+    private Boolean required;
+    private String type;
+    private String format;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerRequest.java b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerRequest.java
new file mode 100644
index 0000000000..d4e0e9e59a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerRequest.java
@@ -0,0 +1,16 @@
+package io.metersphere.api.dto.parse.swagger;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SwaggerRequest {
+    private List<String> tags;
+    private String summary;
+    private String description;
+    private String operationId;
+    private List<String> consumes;
+    private List<String> produces;
+    private SwaggerParameter parameters;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerTag.java b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerTag.java
new file mode 100644
index 0000000000..14e6ef9bd3
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/swagger/SwaggerTag.java
@@ -0,0 +1,9 @@
+package io.metersphere.api.dto.parse.swagger;
+
+import lombok.Data;
+
+@Data
+public class SwaggerTag {
+    private String name;
+    private String description;
+}
diff --git a/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java b/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
index 8b676fa1c6..6345093cd1 100644
--- a/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
@@ -27,173 +27,6 @@ public class PostmanParser extends ApiImportAbstractParser {
     @Override
     public ApiImport parse(InputStream source) {
         String testStr = getApiTestStr(source);
-
-//        String testStr = "{\n" +
-//                "\t\"info\": {\n" +
-//                "\t\t\"_postman_id\": \"9721cd51-8626-4f61-9ac1-e77b8399cca8\",\n" +
-//                "\t\t\"name\": \"test\",\n" +
-//                "\t\t\"schema\": \"https://schema.getpostman.com/json/collection/v2.1.0/collection.json\"\n" +
-//                "\t},\n" +
-//                "\t\"item\": [\n" +
-//                "\t\t{\n" +
-//                "\t\t\t\"name\": \"test\",\n" +
-//                "\t\t\t\"request\": {\n" +
-//                "\t\t\t\t\"auth\": {\n" +
-//                "\t\t\t\t\t\"type\": \"basic\",\n" +
-//                "\t\t\t\t\t\"basic\": [\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"password\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
-//                "\t\t\t\t\t\t},\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"username\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t]\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"method\": \"POST\",\n" +
-//                "\t\t\t\t\"header\": [\n" +
-//                "\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\"key\": \"aaa\",\n" +
-//                "\t\t\t\t\t\t\"value\": \"testH\",\n" +
-//                "\t\t\t\t\t\t\"type\": \"text\"\n" +
-//                "\t\t\t\t\t}\n" +
-//                "\t\t\t\t],\n" +
-//                "\t\t\t\t\"body\": {\n" +
-//                "\t\t\t\t\t\"mode\": \"raw\",\n" +
-//                "\t\t\t\t\t\"raw\": \"<html>\\n</html>\\n\",\n" +
-//                "\t\t\t\t\t\"options\": {\n" +
-//                "\t\t\t\t\t\t\"raw\": {\n" +
-//                "\t\t\t\t\t\t\t\"language\": \"html\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t}\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"url\": {\n" +
-//                "\t\t\t\t\t\"raw\": \"https://localhost:8080?tset=test\",\n" +
-//                "\t\t\t\t\t\"protocol\": \"https\",\n" +
-//                "\t\t\t\t\t\"host\": [\n" +
-//                "\t\t\t\t\t\t\"localhost\"\n" +
-//                "\t\t\t\t\t],\n" +
-//                "\t\t\t\t\t\"port\": \"8080\",\n" +
-//                "\t\t\t\t\t\"query\": [\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"tset\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"description\": \"test\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t]\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"description\": \"dd\"\n" +
-//                "\t\t\t},\n" +
-//                "\t\t\t\"response\": []\n" +
-//                "\t\t},\n" +
-//                "\t\t{\n" +
-//                "\t\t\t\"name\": \"test Copy\",\n" +
-//                "\t\t\t\"request\": {\n" +
-//                "\t\t\t\t\"auth\": {\n" +
-//                "\t\t\t\t\t\"type\": \"basic\",\n" +
-//                "\t\t\t\t\t\"basic\": [\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"password\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
-//                "\t\t\t\t\t\t},\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"username\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t]\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"method\": \"POST\",\n" +
-//                "\t\t\t\t\"header\": [\n" +
-//                "\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\"key\": \"testH\",\n" +
-//                "\t\t\t\t\t\t\"value\": \"testH\",\n" +
-//                "\t\t\t\t\t\t\"type\": \"text\"\n" +
-//                "\t\t\t\t\t}\n" +
-//                "\t\t\t\t],\n" +
-//                "\t\t\t\t\"body\": {\n" +
-//                "\t\t\t\t\t\"mode\": \"raw\",\n" +
-//                "\t\t\t\t\t\"raw\": \"{\\\"name\\\":\\\"test\\\"}\\n\",\n" +
-//                "\t\t\t\t\t\"options\": {\n" +
-//                "\t\t\t\t\t\t\"raw\": {\n" +
-//                "\t\t\t\t\t\t\t\"language\": \"json\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t}\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"url\": {\n" +
-//                "\t\t\t\t\t\"raw\": \"http://localhost:8081\",\n" +
-//                "\t\t\t\t\t\"protocol\": \"http\",\n" +
-//                "\t\t\t\t\t\"host\": [\n" +
-//                "\t\t\t\t\t\t\"localhost\"\n" +
-//                "\t\t\t\t\t],\n" +
-//                "\t\t\t\t\t\"port\": \"8081\"\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"description\": \"dd\"\n" +
-//                "\t\t\t},\n" +
-//                "\t\t\t\"response\": []\n" +
-//                "\t\t},\n" +
-//                "\t\t{\n" +
-//                "\t\t\t\"name\": \"test Copy Copy\",\n" +
-//                "\t\t\t\"request\": {\n" +
-//                "\t\t\t\t\"auth\": {\n" +
-//                "\t\t\t\t\t\"type\": \"basic\",\n" +
-//                "\t\t\t\t\t\"basic\": [\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"password\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
-//                "\t\t\t\t\t\t},\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"username\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"type\": \"string\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t]\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"method\": \"POST\",\n" +
-//                "\t\t\t\t\"header\": [\n" +
-//                "\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\"key\": \"testH\",\n" +
-//                "\t\t\t\t\t\t\"value\": \"testH\",\n" +
-//                "\t\t\t\t\t\t\"type\": \"text\"\n" +
-//                "\t\t\t\t\t}\n" +
-//                "\t\t\t\t],\n" +
-//                "\t\t\t\t\"body\": {\n" +
-//                "\t\t\t\t\t\"mode\": \"urlencoded\",\n" +
-//                "\t\t\t\t\t\"urlencoded\": [\n" +
-//                "\t\t\t\t\t\t{\n" +
-//                "\t\t\t\t\t\t\t\"key\": \"test\",\n" +
-//                "\t\t\t\t\t\t\t\"value\": \"tset\",\n" +
-//                "\t\t\t\t\t\t\t\"description\": \"dd\",\n" +
-//                "\t\t\t\t\t\t\t\"type\": \"text\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t],\n" +
-//                "\t\t\t\t\t\"options\": {\n" +
-//                "\t\t\t\t\t\t\"raw\": {\n" +
-//                "\t\t\t\t\t\t\t\"language\": \"json\"\n" +
-//                "\t\t\t\t\t\t}\n" +
-//                "\t\t\t\t\t}\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"url\": {\n" +
-//                "\t\t\t\t\t\"raw\": \"http://localhost:8081\",\n" +
-//                "\t\t\t\t\t\"protocol\": \"http\",\n" +
-//                "\t\t\t\t\t\"host\": [\n" +
-//                "\t\t\t\t\t\t\"localhost\"\n" +
-//                "\t\t\t\t\t],\n" +
-//                "\t\t\t\t\t\"port\": \"8081\"\n" +
-//                "\t\t\t\t},\n" +
-//                "\t\t\t\t\"description\": \"dd\"\n" +
-//                "\t\t\t},\n" +
-//                "\t\t\t\"response\": []\n" +
-//                "\t\t}\n" +
-//                "\t],\n" +
-//                "\t\"protocolProfileBehavior\": {}\n" +
-//                "}";
-
         PostmanCollection postmanCollection = JSON.parseObject(testStr.toString(), PostmanCollection.class);
         PostmanCollectionInfo info = postmanCollection.getInfo();
         List<Request> requests = parseRequests(postmanCollection);
diff --git a/backend/src/main/java/io/metersphere/api/parse/SwaggerParser.java b/backend/src/main/java/io/metersphere/api/parse/SwaggerParser.java
new file mode 100644
index 0000000000..e3ff9db8f2
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/parse/SwaggerParser.java
@@ -0,0 +1,106 @@
+package io.metersphere.api.parse;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import io.metersphere.api.dto.parse.ApiImport;
+import io.metersphere.api.dto.parse.postman.PostmanItem;
+import io.metersphere.api.dto.parse.postman.PostmanRequest;
+import io.metersphere.api.dto.parse.postman.PostmanUrl;
+import io.metersphere.api.dto.parse.swagger.SwaggerApi;
+import io.metersphere.api.dto.parse.swagger.SwaggerInfo;
+import io.metersphere.api.dto.parse.swagger.SwaggerRequest;
+import io.metersphere.api.dto.scenario.Request;
+import io.metersphere.api.dto.scenario.Scenario;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+public class SwaggerParser extends ApiImportAbstractParser {
+
+    @Override
+    public ApiImport parse(InputStream source) {
+        String testStr = getApiTestStr(source);
+
+        SwaggerApi swaggerApi = JSON.parseObject(testStr.toString(), SwaggerApi.class);
+
+        SwaggerInfo info = swaggerApi.getInfo();
+
+        String title =  info.getTitle();
+
+
+//        List<Request> requests = parseRequests(swaggerApi);
+//        ApiImport apiImport = new ApiImport();
+//        List<Scenario> scenarios = new ArrayList<>();
+//        Scenario scenario = new Scenario();
+//        scenario.setRequests(requests);
+//        scenario.setName(info.getName());
+//        scenarios.add(scenario);
+//        apiImport.setScenarios(scenarios);
+//        return apiImport;
+        return null;
+    }
+
+//    private List<Request> parseRequests(SwaggerApi swaggerApi) {
+//        JSONObject paths = swaggerApi.getPaths();
+//
+//        Set<String> pathNames = paths.keySet();
+//
+//        for (String path : pathNames) {
+//            JSONObject pathObject = paths.getJSONObject(path);
+//            Set<String> methods = pathObject.keySet();
+//            for (String method : methods) {
+//                SwaggerRequest swaggerRequest = JSON.parseObject(pathObject.getJSONObject(method).toJSONString(), SwaggerRequest.class);
+//                Request request = new Request();
+//                request.setName(swaggerRequest.getOperationId());
+//                request.setUrl(url.getRaw());
+//                request.setPath(.getRaw());
+//                request.setUseEnvironment(false);
+//                request.setMethod(requestDesc.getMethod());
+//                request.setHeaders(parseKeyValue(requestDesc.getHeader()));
+//                request.setParameters(parseKeyValue(url.getQuery()));
+//
+//            }
+//        }
+//
+//        List<PostmanItem> item = postmanCollection.getItem();
+//        List<Request> requests = new ArrayList<>();
+//        for (PostmanItem requestItem : item) {
+//            Request request = new Request();
+//            PostmanRequest requestDesc = requestItem.getRequest();
+//            PostmanUrl url = requestDesc.getUrl();
+//            request.setName(requestItem.getName());
+//            request.setUrl(url.getRaw());
+//            request.setUseEnvironment(false);
+//            request.setMethod(requestDesc.getMethod());
+//            request.setHeaders(parseKeyValue(requestDesc.getHeader()));
+//            request.setParameters(parseKeyValue(url.getQuery()));
+//            Body body = new Body();
+//            JSONObject postmanBody = requestDesc.getBody();
+//            String bodyMode = postmanBody.getString("mode");
+//            if (StringUtils.equals(bodyMode, PostmanRequestBodyMode.RAW.value())) {
+//                body.setRaw(postmanBody.getString(bodyMode));
+//                body.setType(MsRequestBodyType.RAW.value());
+//                String contentType = postmanBody.getJSONObject("options").getJSONObject("raw").getString("language");
+//                List<KeyValue> headers = request.getHeaders();
+//                boolean hasContentType = false;
+//                for (KeyValue header : headers) {
+//                    if (StringUtils.equalsIgnoreCase(header.getName(), "Content-Type")) {
+//                        hasContentType = true;
+//                    }
+//                }
+//                if (!hasContentType) {
+//                    headers.add(new KeyValue("Content-Type", contentType));
+//                }
+//            } else if (StringUtils.equals(bodyMode, PostmanRequestBodyMode.FORM_DATA.value()) || StringUtils.equals(bodyMode, PostmanRequestBodyMode.URLENCODED.value())) {
+//                List<PostmanKeyValue> postmanKeyValues = JSON.parseArray(postmanBody.getString(bodyMode), PostmanKeyValue.class);
+//                body.setType(MsRequestBodyType.KV.value());
+//                body.setKvs(parseKeyValue(postmanKeyValues));
+//            }
+//            request.setBody(body);
+//            requests.add(request);
+//        }
+//        return requests;
+//    }
+}

From 39121f0f993297764e071dc09eb1b23367f86c3b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 9 Jul 2020 14:09:59 +0800
Subject: [PATCH 26/31] =?UTF-8?q?shiro=20config=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/config/ShiroConfig.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/config/ShiroConfig.java b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
index 5f0487cf75..92d723b810 100644
--- a/backend/src/main/java/io/metersphere/config/ShiroConfig.java
+++ b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
@@ -56,7 +56,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/swagger-ui/**", "anon");
         filterChainDefinitionMap.put("/v3/api-docs/**", "anon");
 
-        filterChainDefinitionMap.put("/api/**", "anon");
         filterChainDefinitionMap.put("/403", "anon");
         filterChainDefinitionMap.put("/anonymous/**", "anon");
         filterChainDefinitionMap.put("/**", "apikey, authc");

From 3c797c645eb3fd89dd26703f2c2399684fc33c67 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 9 Jul 2020 14:12:42 +0800
Subject: [PATCH 27/31] =?UTF-8?q?fix=20post=E8=AF=B7=E6=B1=82url=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/components/ApiRequestForm.vue     | 5 ++---
 .../business/components/api/test/model/ScenarioModel.js   | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiRequestForm.vue b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
index 83184a8476..6143c8adf1 100644
--- a/frontend/src/business/components/api/test/components/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
@@ -91,12 +91,11 @@
           let url = new URL(this.addProtocol(this.request.url));
           url.searchParams.forEach((value, key) => {
             if (key && value) {
-              parameters.push(new KeyValue(key, value));
+              this.request.parameters.splice(0, 0, new KeyValue(key, value));
             }
           });
           // 添加一个空的，用于填写
           parameters.push(new KeyValue());
-          this.request.parameters = parameters;
           this.request.url = this.getURL(url);
         } catch (e) {
           this.$error(this.$t('api_test.request.url_invalid'), 2000)
@@ -128,7 +127,7 @@
         return url;
       },
       getURL(url) {
-        return decodeURIComponent(url.origin + url.pathname) + "?" + url.searchParams.toString();
+        return decodeURIComponent(url.origin + url.pathname);
       }
     },
 
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 8b84423be5..ecc02724f6 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -394,7 +394,13 @@ class JMXRequest {
       this.port = url.port;
       this.protocol = url.protocol.split(":")[0];
       if (this.method.toUpperCase() !== "GET") {
-        this.pathname += url.search.replace('&', '&amp;');
+        // this.pathname += url.search.replace('&', '&amp;');
+        this.pathname += '?';
+        request.parameters.forEach(parameter => {
+          if (parameter.name) {
+            this.pathname += (parameter.name + '=' + parameter.value + '&');
+          }
+        });
       }
     }
   }

From 0228043184a6f46917cbd3b52ae98c8cb6e25721 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 9 Jul 2020 14:17:05 +0800
Subject: [PATCH 28/31] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E5=A2=9E=E5=8A=A0=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E7=BA=A7=E5=92=8C=E7=B1=BB=E5=9E=8B=E5=B9=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  12 +-
 .../plan/view/comonents/TestCaseRelevance.vue | 280 ++++++++++--------
 2 files changed, 174 insertions(+), 118 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 647d676656..863966c10b 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
@@ -3,7 +3,7 @@
 <mapper namespace="io.metersphere.base.mapper.ext.ExtTestCaseMapper">
 
     <select id="getTestCaseNames" resultType="io.metersphere.base.domain.TestCase">
-        select test_case.id, test_case.name
+        select test_case.id, test_case.name, test_case.priority, test_case.type
         from test_case
         <where>
             <if test="request.projectId != null">
@@ -16,6 +16,16 @@
                 </foreach>
 
             </if>
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        and test_case.${key} in
+                        <foreach collection="values" item="value" separator="," open="(" close=")">
+                            #{value}
+                        </foreach>
+                    </if>
+                </foreach>
+            </if>
         </where>
         ORDER BY test_case.update_time DESC
     </select>
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 09a11d8979..0697dc3b24 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
@@ -19,26 +19,47 @@
 
         <el-container>
           <el-main class="case-content" v-loading="result.loading">
-              <el-table
-                :data="testCases"
-                row-key="id"
-                @select-all="handleSelectAll"
-                @select="handleSelectionChange"
-                height="70vh"
-                ref="table">
+            <el-table
+              :data="testCases"
+              @filter-change="filter"
+              row-key="id"
+              @select-all="handleSelectAll"
+              @select="handleSelectionChange"
+              height="70vh"
+              ref="table">
 
-                <el-table-column
-                  type="selection"></el-table-column>
+              <el-table-column
+                type="selection"></el-table-column>
 
-                <el-table-column
-                  prop="name"
-                  :label="$t('test_track.case.name')"
-                  style="width: 100%">
-                  <template v-slot:default="scope">
-                    {{scope.row.name}}
-                  </template>
-                </el-table-column>
-              </el-table>
+              <el-table-column
+                prop="name"
+                :label="$t('test_track.case.name')"
+                style="width: 100%">
+                <template v-slot:default="scope">
+                  {{scope.row.name}}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="priority"
+                :filters="priorityFilters"
+                column-key="priority"
+                :label="$t('test_track.case.priority')"
+                show-overflow-tooltip>
+                <template v-slot:default="scope">
+                  <priority-table-item :value="scope.row.priority"/>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="type"
+                :filters="typeFilters"
+                column-key="type"
+                :label="$t('test_track.case.type')"
+                show-overflow-tooltip>
+                <template v-slot:default="scope">
+                  <type-table-item :value="scope.row.type"/>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-main>
         </el-container>
       </el-container>
@@ -56,107 +77,128 @@
 
   import NodeTree from '../../../common/NodeTree';
   import MsDialogFooter from '../../../../common/components/MsDialogFooter'
+  import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem";
+  import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem";
+  import {_filter} from "../../../../../../common/js/utils";
 
   export default {
-      name: "TestCaseRelevance",
-      components: {NodeTree, MsDialogFooter},
-      data() {
-        return {
-          result: {},
-          dialogFormVisible: false,
-          isCheckAll: false,
-          testCases: [],
-          selectIds: new Set(),
-          treeNodes: [],
-          selectNodeIds: [],
-          selectNodeNames: []
-        };
-      },
-      props: {
-        planId: {
-          type: String
-        }
-      },
-      watch: {
-        planId() {
-          this.initData();
-        },
-        selectNodeIds() {
-          this.getCaseNames();
-        }
-      },
-      methods: {
-        openTestCaseRelevanceDialog() {
-          this.initData();
-          this.dialogFormVisible = true;
-        },
-        saveCaseRelevance(){
-          let param = {};
-          param.planId = this.planId;
-          param.testCaseIds = [...this.selectIds];
-          this.$post('/test/plan/relevance' , param, () => {
-            this.selectIds.clear();
-            this.$success(this.$t('commons.save_success'));
-            this.dialogFormVisible = false;
-            this.$emit('refresh');
-          });
-        },
-        getCaseNames() {
-          let param = {};
-          if (this.planId) {
-            param.planId = this.planId;
-          }
-          if (this.selectNodeIds && this.selectNodeIds.length > 0){
-            param.nodeIds = this.selectNodeIds;
-          }
-          this.result = this.$post('/test/case/name', param, response => {
-            this.testCases = response.data;
-            this.testCases.forEach(item => {
-              item.checked = false;
-            });
-          });
-        },
-        handleSelectAll(selection) {
-          if(selection.length > 0){
-            this.testCases.forEach(item => {
-              this.selectIds.add(item.id);
-            });
-          } else {
-            this.selectIds.clear();
-          }
-        },
-        handleSelectionChange(selection, row) {
-          if(this.selectIds.has(row.id)){
-            this.selectIds.delete(row.id);
-          } else {
-            this.selectIds.add(row.id);
-          }
-        },
-        nodeChange(nodeIds, nodeNames) {
-          this.selectNodeIds = nodeIds;
-          this.selectNodeNames = nodeNames;
-        },
-        initData() {
-          this.getCaseNames();
-          this.getAllNodeTreeByPlanId();
-        },
-        refresh() {
-          this.close();
-        },
-        getAllNodeTreeByPlanId() {
-          if (this.planId) {
-            this.result = this.$get("/case/node/list/all/plan/" + this.planId, response => {
-              this.treeNodes = response.data;
-            });
-          }
-        },
-        close() {
-          this.selectIds.clear();
-          this.selectNodeIds = [];
-          this.selectNodeNames = [];
-        }
+    name: "TestCaseRelevance",
+    components: {NodeTree, MsDialogFooter, PriorityTableItem, TypeTableItem},
+    data() {
+      return {
+        result: {},
+        dialogFormVisible: false,
+        isCheckAll: false,
+        testCases: [],
+        selectIds: new Set(),
+        treeNodes: [],
+        selectNodeIds: [],
+        selectNodeNames: [],
+        condition: {},
+        priorityFilters: [
+          {text: 'P0', value: 'P0'},
+          {text: 'P1', value: 'P1'},
+          {text: 'P2', value: 'P2'},
+          {text: 'P3', value: 'P3'}
+        ],
+        typeFilters: [
+          {text: this.$t('commons.functional'), value: 'functional'},
+          {text: this.$t('commons.performance'), value: 'performance'},
+          {text: this.$t('commons.api'), value: 'api'}
+        ]
+      };
+    },
+    props: {
+      planId: {
+        type: String
       }
+    },
+    watch: {
+      planId() {
+        this.initData();
+      },
+      selectNodeIds() {
+        this.getCaseNames();
+      }
+    },
+    methods: {
+      openTestCaseRelevanceDialog() {
+        this.initData();
+        this.dialogFormVisible = true;
+      },
+      saveCaseRelevance() {
+        let param = {};
+        param.planId = this.planId;
+        param.testCaseIds = [...this.selectIds];
+        this.$post('/test/plan/relevance', param, () => {
+          this.selectIds.clear();
+          this.$success(this.$t('commons.save_success'));
+          this.dialogFormVisible = false;
+          this.$emit('refresh');
+        });
+      },
+      getCaseNames() {
+        let param = {};
+        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;
+        }
+        this.result = this.$post('/test/case/name', this.condition, response => {
+          this.testCases = response.data;
+          this.testCases.forEach(item => {
+            item.checked = false;
+          });
+        });
+      },
+      handleSelectAll(selection) {
+        if (selection.length > 0) {
+          this.testCases.forEach(item => {
+            this.selectIds.add(item.id);
+          });
+        } else {
+          this.selectIds.clear();
+        }
+      },
+      handleSelectionChange(selection, row) {
+        if (this.selectIds.has(row.id)) {
+          this.selectIds.delete(row.id);
+        } else {
+          this.selectIds.add(row.id);
+        }
+      },
+      nodeChange(nodeIds, nodeNames) {
+        this.selectNodeIds = nodeIds;
+        this.selectNodeNames = nodeNames;
+      },
+      initData() {
+        this.getCaseNames();
+        this.getAllNodeTreeByPlanId();
+      },
+      refresh() {
+        this.close();
+      },
+      getAllNodeTreeByPlanId() {
+        if (this.planId) {
+          this.result = this.$get("/case/node/list/all/plan/" + this.planId, response => {
+            this.treeNodes = response.data;
+          });
+        }
+      },
+      close() {
+        this.selectIds.clear();
+        this.selectNodeIds = [];
+        this.selectNodeNames = [];
+      },
+      filter(filters) {
+        _filter(filters, this.condition);
+        this.initData();
+      },
     }
+  }
 </script>
 
 <style scoped>
@@ -165,16 +207,18 @@
     display: none;
     color: black;
   }
+
   .tb-edit .current-row .el-input {
     display: block;
 
   }
-  .tb-edit .current-row .el-input+span {
+
+  .tb-edit .current-row .el-input + span {
     display: none;
 
   }
 
-  .node-tree{
+  .node-tree {
     margin-right: 10px;
   }
 
@@ -189,10 +233,12 @@
     height: 100%;
     /*border: 1px solid #EBEEF5;*/
   }
+
   .tree-aside {
     min-height: 300px;
     max-height: 100%;
   }
+
   .main-content {
     min-height: 300px;
     height: 100%;

From e71e8668273bcb66fda3dba9c9f6fee42fba1fcb Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 9 Jul 2020 15:09:05 +0800
Subject: [PATCH 29/31] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E7=94=A8=E4=BE=8B=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml  | 4 +++-
 .../track/request/testcase/QueryTestCaseRequest.java      | 2 ++
 .../track/plan/view/comonents/TestCaseRelevance.vue       | 8 +++++++-
 3 files changed, 12 insertions(+), 2 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 863966c10b..8f5cf65ed5 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
@@ -6,6 +6,9 @@
         select test_case.id, test_case.name, test_case.priority, test_case.type
         from test_case
         <where>
+            <if test="request.name != null">
+                and test_case.name like CONCAT('%', #{request.name},'%')
+            </if>
             <if test="request.projectId != null">
                 AND test_case.project_id = #{request.projectId}
             </if>
@@ -14,7 +17,6 @@
                 <foreach collection="request.nodeIds" open="(" close=")" separator="," item="nodeId">
                     #{nodeId}
                 </foreach>
-
             </if>
             <if test="request.filters != null and request.filters.size() > 0">
                 <foreach collection="request.filters.entrySet()" index="key" item="values">
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
index 47a62e1415..3f6c41cd72 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
@@ -12,6 +12,8 @@ import java.util.Map;
 @Setter
 public class QueryTestCaseRequest extends TestCase {
 
+    private  String name;
+
     private List<String> nodeIds;
 
     private List<OrderRequest> orders;
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 0697dc3b24..a94b8b9477 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
@@ -19,6 +19,11 @@
 
         <el-container>
           <el-main class="case-content" v-loading="result.loading">
+            <el-row>
+              <el-col :offset="16" :span="8">
+                <ms-table-search-bar :condition.sync="condition" @change="initData"/>
+              </el-col>
+            </el-row>
             <el-table
               :data="testCases"
               @filter-change="filter"
@@ -80,10 +85,11 @@
   import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem";
   import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem";
   import {_filter} from "../../../../../../common/js/utils";
+  import MsTableSearchBar from "../../../../common/components/MsTableSearchBar";
 
   export default {
     name: "TestCaseRelevance",
-    components: {NodeTree, MsDialogFooter, PriorityTableItem, TypeTableItem},
+    components: {NodeTree, MsDialogFooter, PriorityTableItem, TypeTableItem, MsTableSearchBar},
     data() {
       return {
         result: {},

From 019933d4d2c1df98af56c88b5a9e2c279fb27d51 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 9 Jul 2020 16:35:29 +0800
Subject: [PATCH 30/31] i18n

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

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c4d37e6f4b..50c15ce345 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -611,7 +611,7 @@ export default {
     'input_mapping': 'Please enter LDAP attribute mapping',
     'input_username': 'please enter user name',
     'input_url_placeholder': 'Please enter the LDAP address (eg ldap://localhost:389)',
-    'input_ou_placeholder': 'Enter user OU (use | to separate each OU)',
+    'input_ou_placeholder': 'Enter user OU',
     'input_filter_placeholder': 'Input filter [Possible options are cn or uid or sAMAccountName={0}, eg: (uid={0})]',
     'test_connect': 'Test Connection',
     'test_login': 'Test Login',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5c85719e17..4a54404e7d 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -608,7 +608,7 @@ export default {
     'input_mapping': '请输入LDAP属性映射',
     'input_username': '请输入用户名',
     'input_url_placeholder': '请输入LDAP地址 (如 ldap://localhost:389)',
-    'input_ou_placeholder': '输入用户OU (使用|分隔各OU)',
+    'input_ou_placeholder': '输入用户OU',
     'input_filter_placeholder': '输入过滤器 [可能的选项是cn或uid或sAMAccountName={0}, 如：(uid={0})]',
     'test_connect': '测试连接',
     'test_login': '测试登录',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 27c55c02bf..8ad5880469 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -608,7 +608,7 @@ export default {
     'input_mapping': '請輸入LDAP屬性映射',
     'input_username': '請輸入用戶名',
     'input_url_placeholder': '請輸入LDAP地址 (如 ldap://localhost:389)',
-    'input_ou_placeholder': '輸入用戶OU (使用|分隔各OU)',
+    'input_ou_placeholder': '輸入用戶OU',
     'input_filter_placeholder': '輸入過濾器 [可能的選項是cn或uid或sAMAccountName={0}, 如：(uid={0})]',
     'test_connect': '測試連接',
     'test_login': '測試登錄',

From b2e4a94a35ff492cc6af74973e7f39354a70667b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 9 Jul 2020 17:04:34 +0800
Subject: [PATCH 31/31] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/vue.config.js | 47 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index f8e8eb790e..f7ee7b1fed 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -1,26 +1,27 @@
 module.exports = {
-    productionSourceMap: true,
-    configureWebpack: {
-        devtool: 'source-map'
-    },
-    devServer: {
-        proxy: {
-            ['^(?!/login)']: {
-                target: 'http://localhost:8081',
-                ws: true,
-            }
-        }
-    },
-    pages: {
-        business: {
-            entry: "src/business/main.js",
-            template: "src/business/index.html",
-            filename: "index.html"
-        },
-        login: {
-            entry: "src/login/login.js",
-            template: "src/login/login.html",
-            filename: "login.html"
-        }
+  productionSourceMap: true,
+  configureWebpack: {
+    devtool: 'source-map'
+  },
+  devServer: {
+    port: 8080,
+    proxy: {
+      ['^(?!/login)']: {
+        target: 'http://localhost:8081',
+        ws: true,
+      }
     }
+  },
+  pages: {
+    business: {
+      entry: "src/business/main.js",
+      template: "src/business/index.html",
+      filename: "index.html"
+    },
+    login: {
+      entry: "src/login/login.js",
+      template: "src/login/login.html",
+      filename: "login.html"
+    }
+  }
 };