From 018f7caf8827fe3518d19c27a751374eb01d8fe2 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 5 Aug 2020 16:57:54 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dzookeeper=E6=97=A0=E9=99=90=E9=87=8D?=
 =?UTF-8?q?=E8=BF=9Ebug=EF=BC=8C=E4=BF=AE=E5=A4=8DRegistry=20Center?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E6=97=A0=E6=B3=95=E7=94=9F=E6=95=88?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index eaec728b54..03582abcdc 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -217,7 +217,7 @@
         <dependency>
             <groupId>io.metersphere</groupId>
             <artifactId>jmeter-plugins-dubbo</artifactId>
-            <version>2.7.8</version>
+            <version>2.7.9</version>
         </dependency>
 
         <!-- LDAP Module -->

From f10c2338586633fe83ec878212bd1fecf0c78d54 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 5 Aug 2020 17:22:01 +0800
Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E4=BF=9D=E5=AD=98=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B5=8B=E8=AF=95=E4=B8=8D=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/api/test/ApiTestConfig.vue    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index ab1d4cd63f..f95c758e1c 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -157,13 +157,9 @@
       saveTest() {
         this.save(() => {
           this.$success(this.$t('commons.save_success'));
-          if (this.create) {
-            this.$router.push({
-              path: '/api/test/edit?id=' + this.test.id
-            })
-          } else {
-            this.$router.push({path: '/api/test/list/all'})
-          }
+          this.$router.push({
+            path: '/api/test/edit?id=' + this.test.id;
+          })
         })
       },
       runTest() {
@@ -183,7 +179,6 @@
         })
       },
       cancel() {
-        // console.log(this.test.toJMX().xml)
         this.$router.push('/api/test/list/all');
       },
       getOptions(url) {

From 0d3f93a71c145801bb2d142e33146450e08917b0 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 5 Aug 2020 17:23:03 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/api/test/ApiTestConfig.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index f95c758e1c..5461bc7034 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -158,7 +158,7 @@
         this.save(() => {
           this.$success(this.$t('commons.save_success'));
           this.$router.push({
-            path: '/api/test/edit?id=' + this.test.id;
+            path: '/api/test/edit?id=' + this.test.id
           })
         })
       },

From 61496ce11af4785bdeeb729a2b3b4a0c34a1f4c9 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 5 Aug 2020 18:13:14 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsAsideContainer.vue         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsAsideContainer.vue b/frontend/src/business/components/common/components/MsAsideContainer.vue
index 982a542550..90d9ec7e9b 100644
--- a/frontend/src/business/components/common/components/MsAsideContainer.vue
+++ b/frontend/src/business/components/common/components/MsAsideContainer.vue
@@ -1,9 +1,9 @@
 <template>
   <el-aside :width="width" class="ms-aside-container"
-            :style="{'margin-left': asideHidden ? '0' : '-' + width}">
-    <div v-if="enableAsideHidden" class="hiddenBottom" @click="asideHidden = !asideHidden" :style="{'left': width}">
-      <i v-if="asideHidden" class="el-icon-arrow-left"/>
-      <i v-if="!asideHidden" class="el-icon-arrow-right"/>
+            :style="{'margin-left': !asideHidden ? 0 : '-' + width}">
+    <div v-if="enableAsideHidden" class="hiddenBottom" @click="asideHidden = !asideHidden" :style="{'left': asideHidden ? 0 : width}">
+      <i v-if="!asideHidden" class="el-icon-arrow-left"/>
+      <i v-if="asideHidden" class="el-icon-arrow-right"/>
     </div>
     <slot></slot>
   </el-aside>
@@ -24,7 +24,7 @@
       },
       data() {
         return {
-          asideHidden: true
+          asideHidden: false
         }
       }
     }
@@ -39,12 +39,9 @@
     box-sizing: border-box;
     background-color: #FFF;
     height: calc(100vh - 80px);
-    position: relative;
-    overflow: inherit;
   }
 
   .hiddenBottom {
-    z-index: 199;
     width: 8px;
     height: 50px;
     top: calc((100vh - 80px)/3);
@@ -56,6 +53,7 @@
     cursor: pointer;
     opacity: 0.2;
     font-size: 2px;
+    margin-left: 1px;
   }
 
   .hiddenBottom i {

From a3dc5ce54711ac53ad97e0c72f9acf610b97a0bd Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 5 Aug 2020 18:22:56 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=BA=E8=87=AA=E5=8A=A8=E6=97=B6=E9=80=9A=E8=BF=87=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=A6=81=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/view/comonents/TestPlanTestCaseEdit.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index cf76720022..6cfa70f8fc 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -366,6 +366,7 @@
         this.$nextTick(() => {
           if (this.testCase.method == 'auto') {
             if (this.$refs.apiTestDetail && this.testCase.type == 'api') {
+
               this.$refs.apiTestDetail.init();
             } else if (this.testCase.type == 'performance') {
               this.$refs.performanceTestDetail.init();
@@ -432,9 +433,12 @@
         this.$post('/test/plan/edit/status/' + planId);
       },
       stepResultChange() {
-        this.isFailure = this.testCase.steptResults.filter(s => {
-          return !s.executeResult || s.executeResult === 'Failure' || s.executeResult === 'Blocking';
-        }).length > 0;
+        if (this.testCase.method == 'manual') {
+          this.isFailure = this.testCase.steptResults.filter(s => {
+            return !s.executeResult || s.executeResult === 'Failure' || s.executeResult === 'Blocking';
+          }).length > 0;
+        }
+
       }
     }
   }

From ec3276edff07d469ec0cbe86dbeb4f7612488b7c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 5 Aug 2020 18:53:08 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/plan/view/comonents/test/ApiTestDetail.vue | 2 +-
 .../components/track/plan/view/comonents/test/ApiTestResult.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue b/frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue
index a1f299a012..a89f2015bf 100644
--- a/frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue
@@ -16,7 +16,7 @@
         </el-row>
       </el-header>
 
-      <ms-api-scenario-config :is-read-only="true" :scenarios="test.scenarioDefinition" ref="config"/>
+      <ms-api-scenario-config :project-id="test.projectId" :is-read-only="true" :scenarios="test.scenarioDefinition" ref="config"/>
 
   </el-container>
   </el-card>
diff --git a/frontend/src/business/components/track/plan/view/comonents/test/ApiTestResult.vue b/frontend/src/business/components/track/plan/view/comonents/test/ApiTestResult.vue
index 92cbe2c113..c869bbf680 100644
--- a/frontend/src/business/components/track/plan/view/comonents/test/ApiTestResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/test/ApiTestResult.vue
@@ -71,7 +71,7 @@
           let url = "/api/report/get/" + this.reportId;
           this.$get(url, response => {
             this.report = response.data || {};
-            if (this.report.status == 'Completed') {
+            if (this.report.status == 'Completed' || this.report.status == 'Success' || this.report.status == 'Error') {
               this.content = JSON.parse(this.report.content);
               this.getFails();
               this.loading = false;

From cef3c8dea745f4e91e17bc488ca13c6257fb67c9 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 5 Aug 2020 20:06:21 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20swagger=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=AD=E5=B8=A6=E6=9C=89/=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/parse/Swagger2Parser.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
index 4cf1e05e3d..5adb221a79 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
@@ -130,8 +130,15 @@ public class Swagger2Parser extends ApiImportAbstractParser {
         Model schema = bodyParameter.getSchema();
 
         if (schema instanceof RefModel) {
+            String simpleRef = "";
             RefModel refModel = (RefModel) bodyParameter.getSchema();
-            Model model = definitions.get(refModel.getSimpleRef());
+            String originalRef = refModel.getOriginalRef();
+            if (refModel.getOriginalRef().split("/").length > 3) {
+                simpleRef = originalRef.replace("#/definitions/", "");
+            } else {
+                simpleRef = refModel.getSimpleRef();
+            }
+            Model model = definitions.get(simpleRef);
             JSONObject bodyParameters = getBodyJSONObjectParameters(model.getProperties(), definitions);
             body.setRaw(bodyParameters.toJSONString());
         } else if (schema instanceof ArrayModel) {