From dff4904efb16e66cefbf78ce883194e2fb208708 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 14:32:45 +0800
Subject: [PATCH 01/13] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20DUBBO=E5=8D=8F=E8=AE=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/common/ScenarioImport.vue        |   2 +-
 .../components/request/dubbo/ConfigCenter.vue | 139 +++++++++---------
 .../request/dubbo/ConsumerAndService.vue      | 132 +++++++++--------
 .../components/request/dubbo/Interface.vue    |   2 +-
 .../request/dubbo/RegistryCenter.vue          | 121 +++++++--------
 5 files changed, 204 insertions(+), 192 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
index b0f9ec854d..e099d29d16 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :close-on-click-modal="false" :title="$t('api_test.api_import.title')" width="30%"
+  <el-dialog :close-on-click-modal="false" :title="$t('api_test.automation.scenario_import')" width="30%"
              :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close">
 
     <div class="header-bar">
diff --git a/frontend/src/business/components/api/definition/components/request/dubbo/ConfigCenter.vue b/frontend/src/business/components/api/definition/components/request/dubbo/ConfigCenter.vue
index a3082133f2..66e08fa1f7 100644
--- a/frontend/src/business/components/api/definition/components/request/dubbo/ConfigCenter.vue
+++ b/frontend/src/business/components/api/definition/components/request/dubbo/ConfigCenter.vue
@@ -1,83 +1,86 @@
 <template>
   <el-form :model="config" :rules="rules" ref="config" label-width="100px" size="small" :disabled="isReadOnly">
-    <div class="dubbo-form-description" v-if="description">
-      {{ description }}
-    </div>
-    <el-form-item label="Protocol" prop="protocol" class="dubbo-form-item">
-      <el-select v-model="config.protocol" class="select-100" clearable>
-        <el-option v-for="p in protocols" :key="p" :label="p" :value="p"/>
-      </el-select>
-    </el-form-item>
+    <el-row>
+      <div class="dubbo-form-description" v-if="description">
+        {{ description }}
+      </div>
+    </el-row>
 
-    <el-form-item label="Group" prop="group" class="dubbo-form-item">
-      <el-input v-model="config.group" maxlength="300" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+    <el-row>
+      <el-form-item label="Protocol" prop="protocol" class="dubbo-form-item">
+        <el-select v-model="config.protocol" class="select-100" clearable>
+          <el-option v-for="p in protocols" :key="p" :label="p" :value="p"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="Group" prop="group" class="dubbo-form-item">
+        <el-input v-model="config.group" maxlength="300" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
+      <el-form-item label="Namespace" prop="namespace" class="dubbo-form-item">
+        <el-input v-model="config.namespace" maxlength="300" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
+      <el-form-item label="Timeout" prop="timeout" class="dubbo-form-item">
+        <el-input type="number" v-model="config.timeout" :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="Address" prop="address" class="dubbo-form-item-long">
+        <el-input v-model="config.address" maxlength="300" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="Namespace" prop="namespace" class="dubbo-form-item">
-      <el-input v-model="config.namespace" maxlength="300" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
-
-    <el-form-item label="Timeout" prop="timeout" class="dubbo-form-item">
-      <el-input type="number" v-model="config.timeout" :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
-
-    <el-form-item label="Address" prop="address" class="dubbo-form-item-long">
-      <el-input v-model="config.address" maxlength="300" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
-
-    <el-form-item label="UserName" prop="username" class="dubbo-form-item">
-      <el-input v-model="config.username" maxlength="100" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
-
-    <el-form-item label="Password" prop="password" class="dubbo-form-item">
-      <el-input v-model="config.password" maxlength="30" show-word-limit show-password autocomplete="new-password"
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="UserName" prop="username" class="dubbo-form-item">
+        <el-input v-model="config.username" maxlength="100" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
+      <el-form-item label="Password" prop="password" class="dubbo-form-item">
+        <el-input v-model="config.password" maxlength="30" show-word-limit show-password autocomplete="new-password"
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
+    </el-row>
   </el-form>
+
 </template>
 
 <script>
-import './dubbo.css'
-import {ConfigCenter} from "@/business/components/api/definition/model/ApiTestModel";
+  import './dubbo.css'
+  import {ConfigCenter} from "@/business/components/api/definition/model/ApiTestModel";
 
-export default {
-  name: "MsDubboConfigCenter",
-  props: {
-    description: String,
-    config: {},
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      protocols: ConfigCenter.PROTOCOLS,
-      methods: [],
-      rules: {
-        group: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ],
-        namespace: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ],
-        username: [
-          {max: 100, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ],
-        password: [
-          {max: 30, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ],
-        address: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ]
+  export default {
+    name: "MsDubboConfigCenter",
+    props: {
+      description: String,
+      config: {},
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        protocols: ConfigCenter.PROTOCOLS,
+        methods: [],
+        rules: {
+          group: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ],
+          namespace: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ],
+          username: [
+            {max: 100, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ],
+          password: [
+            {max: 30, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ],
+          address: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ]
+        }
       }
     }
   }
-}
 </script>
diff --git a/frontend/src/business/components/api/definition/components/request/dubbo/ConsumerAndService.vue b/frontend/src/business/components/api/definition/components/request/dubbo/ConsumerAndService.vue
index 1d26f45eed..873dc0b4e2 100644
--- a/frontend/src/business/components/api/definition/components/request/dubbo/ConsumerAndService.vue
+++ b/frontend/src/business/components/api/definition/components/request/dubbo/ConsumerAndService.vue
@@ -1,82 +1,86 @@
 <template>
 
   <el-form :model="consumer" :rules="rules" ref="consumer" label-width="100px" size="small" :disabled="isReadOnly">
-    <div class="dubbo-form-description" v-if="description">
-      {{ description }}
-    </div>
-    <el-form-item label="Timeout" prop="timeout" class="dubbo-form-item">
-      <el-input type="number" v-model="consumer.timeout" :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+    <el-row>
+      <div class="dubbo-form-description" v-if="description">
+        {{ description }}
+      </div>
+    </el-row>
+    <el-row>
+      <el-form-item label="Timeout" prop="timeout" class="dubbo-form-item">
+        <el-input type="number" v-model="consumer.timeout" :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
+      <el-form-item label="Version" prop="version" class="dubbo-form-item">
+        <el-input v-model="consumer.version" maxlength="30" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="Version" prop="version" class="dubbo-form-item">
-      <el-input v-model="consumer.version" maxlength="30" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="Retries" prop="retries" class="dubbo-form-item">
+        <el-input type="number" v-model="consumer.retries" :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="Retries" prop="retries" class="dubbo-form-item">
-      <el-input type="number" v-model="consumer.retries" :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="Cluster" prop="cluster" class="dubbo-form-item">
+        <el-input v-model="consumer.cluster" maxlength="300" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="Group" prop="group" class="dubbo-form-item">
+        <el-input v-model="consumer.group" maxlength="300" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="Cluster" prop="cluster" class="dubbo-form-item">
-      <el-input v-model="consumer.cluster" maxlength="300" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="Connections" prop="connections" class="dubbo-form-item">
+        <el-input type="number" v-model="consumer.connections" :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="Group" prop="group" class="dubbo-form-item">
-      <el-input v-model="consumer.group" maxlength="300" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="Async" prop="async" class="dubbo-form-item">
+        <el-select v-model="consumer.async" class="select-100" clearable>
+          <el-option v-for="option in asyncOptions" :key="option" :label="option" :value="option"/>
+        </el-select>
+      </el-form-item>
 
-    <el-form-item label="Connections" prop="connections" class="dubbo-form-item">
-      <el-input type="number" v-model="consumer.connections" :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
-
-    <el-form-item label="Async" prop="async" class="dubbo-form-item">
-      <el-select v-model="consumer.async" class="select-100" clearable>
-        <el-option v-for="option in asyncOptions" :key="option" :label="option" :value="option"/>
-      </el-select>
-    </el-form-item>
-
-    <el-form-item label="LoadBalance" prop="loadBalance" class="dubbo-form-item">
-      <el-select v-model="consumer.loadBalance" class="select-100" clearable>
-        <el-option v-for="option in loadBalances" :key="option" :label="option" :value="option"/>
-      </el-select>
-    </el-form-item>
+      <el-form-item label="LoadBalance" prop="loadBalance" class="dubbo-form-item">
+        <el-select v-model="consumer.loadBalance" class="select-100" clearable>
+          <el-option v-for="option in loadBalances" :key="option" :label="option" :value="option"/>
+        </el-select>
+      </el-form-item>
+    </el-row>
   </el-form>
 
 </template>
 
 <script>
-import './dubbo.css'
-import {ConsumerAndService, RegistryCenter} from "@/business/components/api/definition/model/ApiTestModel";
+  import './dubbo.css'
+  import {ConsumerAndService, RegistryCenter} from "@/business/components/api/definition/model/ApiTestModel";
 
-export default {
-  name: "MsDubboConsumerService",
-  props: {
-    description: String,
-    consumer: {},
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      asyncOptions: ConsumerAndService.ASYNC_OPTIONS,
-      loadBalances: ConsumerAndService.LOAD_BALANCE_OPTIONS,
-      methods: [],
-      rules: {
-        version: [
-          {max: 30, message: this.$t('commons.input_limit', [0, 30]), trigger: 'blur'}
-        ],
-        cluster: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ],
-        group: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ]
+  export default {
+    name: "MsDubboConsumerService",
+    props: {
+      description: String,
+      consumer: {},
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        asyncOptions: ConsumerAndService.ASYNC_OPTIONS,
+        loadBalances: ConsumerAndService.LOAD_BALANCE_OPTIONS,
+        methods: [],
+        rules: {
+          version: [
+            {max: 30, message: this.$t('commons.input_limit', [0, 30]), trigger: 'blur'}
+          ],
+          cluster: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ],
+          group: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ]
+        }
       }
     }
   }
-}
 </script>
diff --git a/frontend/src/business/components/api/definition/components/request/dubbo/Interface.vue b/frontend/src/business/components/api/definition/components/request/dubbo/Interface.vue
index 398a7d6b94..1365df3971 100644
--- a/frontend/src/business/components/api/definition/components/request/dubbo/Interface.vue
+++ b/frontend/src/business/components/api/definition/components/request/dubbo/Interface.vue
@@ -117,7 +117,7 @@
 
 <style scoped>
   .get-provider {
-    margin-bottom: 22px;
+    margin: 5px 5px 10px;
   }
 
   .select-100 {
diff --git a/frontend/src/business/components/api/definition/components/request/dubbo/RegistryCenter.vue b/frontend/src/business/components/api/definition/components/request/dubbo/RegistryCenter.vue
index 5910097ce0..82f5a35d25 100644
--- a/frontend/src/business/components/api/definition/components/request/dubbo/RegistryCenter.vue
+++ b/frontend/src/business/components/api/definition/components/request/dubbo/RegistryCenter.vue
@@ -1,73 +1,78 @@
 <template>
   <el-form :model="registry" :rules="rules" ref="registry" label-width="100px" size="small" :disabled="isReadOnly">
-    <div class="dubbo-form-description" v-if="description">
-      {{ description }}
-    </div>
-    <el-form-item label="Protocol" prop="protocol" class="dubbo-form-item">
-      <el-select v-model="registry.protocol" class="select-100" clearable>
-        <el-option v-for="p in protocols" :key="p" :label="p" :value="p"/>
-      </el-select>
-    </el-form-item>
+    <el-row>
+      <div class="dubbo-form-description" v-if="description">
+        {{ description }}
+      </div>
+    </el-row>
+    <el-row>
+      <el-form-item label="Protocol" prop="protocol" class="dubbo-form-item">
+        <el-select v-model="registry.protocol" class="select-100" clearable>
+          <el-option v-for="p in protocols" :key="p" :label="p" :value="p"/>
+        </el-select>
+      </el-form-item>
 
-    <el-form-item label="Group" prop="group" class="dubbo-form-item">
-      <el-input v-model="registry.group" maxlength="300" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="Group" prop="group" class="dubbo-form-item">
+        <el-input v-model="registry.group" maxlength="300" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="UserName" prop="username" class="dubbo-form-item">
-      <el-input v-model="registry.username" maxlength="100" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="UserName" prop="username" class="dubbo-form-item">
+        <el-input v-model="registry.username" maxlength="100" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="Password" prop="password" class="dubbo-form-item">
-      <el-input v-model="registry.password" maxlength="30" show-word-limit show-password autocomplete="new-password"
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="Password" prop="password" class="dubbo-form-item">
+        <el-input v-model="registry.password" maxlength="30" show-word-limit show-password autocomplete="new-password"
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="Address" prop="address" class="dubbo-form-item-long">
+        <el-input v-model="registry.address" maxlength="300" show-word-limit
+                  :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
 
-    <el-form-item label="Address" prop="address" class="dubbo-form-item-long">
-      <el-input v-model="registry.address" maxlength="300" show-word-limit
-                :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
-
-    <el-form-item label="Timeout" prop="timeout" class="dubbo-form-item">
-      <el-input type="number" v-model="registry.timeout" :placeholder="$t('commons.input_content')"/>
-    </el-form-item>
+      <el-form-item label="Timeout" prop="timeout" class="dubbo-form-item">
+        <el-input type="number" v-model="registry.timeout" :placeholder="$t('commons.input_content')"/>
+      </el-form-item>
+    </el-row>
   </el-form>
 </template>
 
 <script>
-import './dubbo.css'
-import {RegistryCenter} from "@/business/components/api/definition/model/ApiTestModel";
+  import './dubbo.css'
+  import {RegistryCenter} from "@/business/components/api/definition/model/ApiTestModel";
 
-export default {
-  name: "MsDubboRegistryCenter",
-  props: {
-    description: String,
-    registry: {},
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      protocols: RegistryCenter.PROTOCOLS,
-      methods: [],
-      rules: {
-        group: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ],
-        username: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ],
-        password: [
-          {max: 30, message: this.$t('commons.input_limit', [0, 30]), trigger: 'blur'}
-        ],
-        address: [
-          {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
-        ]
+  export default {
+    name: "MsDubboRegistryCenter",
+    props: {
+      description: String,
+      registry: {},
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        protocols: RegistryCenter.PROTOCOLS,
+        methods: [],
+        rules: {
+          group: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ],
+          username: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ],
+          password: [
+            {max: 30, message: this.$t('commons.input_limit', [0, 30]), trigger: 'blur'}
+          ],
+          address: [
+            {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
+          ]
+        }
       }
     }
   }
-}
 </script>

From 8b178f99389f6e27d6fea0259d46122f3757505d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Sat, 20 Feb 2021 15:10:21 +0800
Subject: [PATCH 02/13] chore: sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 5e0b365f10..44bcc98930 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 5e0b365f1080197e84055e80071165787e2e79c5
+Subproject commit 44bcc9893033900f95c99068cd4edec740465dfe

From d8262c3ec3ff2616e4da6c6201b69ab032518377 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Sat, 20 Feb 2021 15:23:57 +0800
Subject: [PATCH 03/13] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=94=9F?=
 =?UTF-8?q?=E6=88=90jmx=E6=96=87=E4=BB=B6=E5=87=BD=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改生成jmx文件函数的逻辑
---
 .../api/controller/APITestController.java     |  2 +-
 .../api/service/APITestService.java           | 23 ++++++++++++++-----
 .../api/service/ApiAutomationService.java     |  2 +-
 3 files changed, 19 insertions(+), 8 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 61eb6e2fef..85b1bc768c 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -393,7 +393,7 @@ public class APITestController {
         String testName = runRequest.getName();
 
         //将jmx处理封装为通用方法
-        jmxString = apiTestService.updateJmxString(jmxString,testName,true);
+        jmxString = apiTestService.updateJmxString(jmxString,testName,false);
 
         JmxInfoDTO dto = new JmxInfoDTO();
         dto.setName(runRequest.getName() + ".jmx");
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 10cf3ab666..781ca72078 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -461,7 +461,20 @@ public class APITestService {
         });
     }
 
-    public String updateJmxString(String jmxString,String testName,boolean updateHTTPSamplerProxyName) {
+    /**
+     * @param jmxString      原JMX文件
+     * @param testName       某些节点要替换的testName
+     * @param isFromScenario 是否来源于场景 （来源于场景的话，testName要进行处理）
+     * @return
+     */
+    public String updateJmxString(String jmxString, String testName, boolean isFromScenario) {
+        if (isFromScenario) {
+            //如果调用源来自场景， 原testName是 案例<->场景 ，需要进行切分，只保留案例名
+            String[] testNameArr = testName.split("<->");
+            if (testNameArr.length > 0) {
+                testName = testNameArr[0];
+            }
+        }
         try {
             //将ThreadGroup的testname改为接口名称
             Document doc = DocumentHelper.parseText(jmxString);// 获取可续保保单列表报文模板
@@ -473,11 +486,9 @@ public class APITestService {
 
             List<Element> thirdHashTreeElementList = innerHashTreeElement.elements("hashTree");
             for (Element element : thirdHashTreeElementList) {
-                if(updateHTTPSamplerProxyName){
-                    List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
-                    for (Element itemElement : sampleProxyElementList) {
-                        itemElement.attribute("testname").setText(testName);
-                    }
+                List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
+                for (Element itemElement : sampleProxyElementList) {
+                    itemElement.attribute("testname").setText(testName);
                 }
                 //检查有没有自定义参数
                 List<Element> scriptHashTreeElementList = element.elements("hashTree");
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 0436a9c0d6..ecade606fe 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -668,7 +668,7 @@ public class ApiAutomationService {
         HashTree jmeterHashTree = generateHashTree(apiScenarios, request, null);
         String jmx = testPlan.getJmx(jmeterHashTree);
 
-        jmx = apiTestService.updateJmxString(jmx,testName,false);
+        jmx = apiTestService.updateJmxString(jmx,testName,true);
 
         //将ThreadGroup的testname改为接口名称
 //        Document doc = DocumentHelper.parseText(jmx);// 获取可续保保单列表报文模板

From 44f04d6a2c6dbc26c0a7078a01f8e9433eeb1e93 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 15:55:10 +0800
Subject: [PATCH 04/13] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=87=BAjmx=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiAutomationController.java   |  6 ++
 .../dto/automation/ApiScenrioExportJmx.java   | 16 +++++
 .../api/service/ApiAutomationService.java     | 65 +++++++++++++++++--
 3 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/ApiScenrioExportJmx.java

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index 52c7ac385e..db9e688e93 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -160,5 +160,11 @@ public class ApiAutomationController {
         return apiAutomationService.export(request);
     }
 
+    @PostMapping(value = "/export/jmx")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public List<ApiScenrioExportJmx> exportJmx(@RequestBody ApiScenarioBatchRequest request) {
+        return apiAutomationService.exportJmx(request);
+    }
+
 }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenrioExportJmx.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenrioExportJmx.java
new file mode 100644
index 0000000000..bd42d877bc
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenrioExportJmx.java
@@ -0,0 +1,16 @@
+package io.metersphere.api.dto.automation;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ApiScenrioExportJmx {
+    private String name;
+    private String jmx;
+
+    public ApiScenrioExportJmx(String name, String jmx) {
+        this.name = name;
+        this.jmx = jmx;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 027fe93ec5..bbe5e68f36 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -435,6 +435,47 @@ public class ApiAutomationService {
         return jmeterHashTree;
     }
 
+    private String generateJmx(ApiScenarioWithBLOBs apiScenario) {
+        HashTree jmeterHashTree = new ListedHashTree();
+        MsTestPlan testPlan = new MsTestPlan();
+        testPlan.setHashTree(new LinkedList<>());
+        try {
+            MsThreadGroup group = new MsThreadGroup();
+            group.setLabel(apiScenario.getName());
+            group.setName(apiScenario.getName());
+
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            JSONObject element = JSON.parseObject(apiScenario.getScenarioDefinition());
+            MsScenario scenario = JSONObject.parseObject(apiScenario.getScenarioDefinition(), MsScenario.class);
+
+            // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
+            if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
+                LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
+                        new TypeReference<LinkedList<MsTestElement>>() {
+                        });
+                scenario.setHashTree(elements);
+            }
+            if (StringUtils.isNotEmpty(element.getString("variables"))) {
+                LinkedList<ScenarioVariable> variables = mapper.readValue(element.getString("variables"),
+                        new TypeReference<LinkedList<ScenarioVariable>>() {
+                        });
+                scenario.setVariables(variables);
+            }
+            group.setEnableCookieShare(scenario.isEnableCookieShare());
+            group.setHashTree(new LinkedList<MsTestElement>() {{
+                this.add(scenario);
+            }});
+
+            testPlan.getHashTree().add(group);
+        } catch (Exception ex) {
+            MSException.throwException(ex.getMessage());
+        }
+
+        testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
+        return testPlan.getJmx(jmeterHashTree);
+    }
+
     /**
      * 场景测试执行
      *
@@ -668,7 +709,7 @@ public class ApiAutomationService {
         HashTree jmeterHashTree = generateHashTree(apiScenarios, request, null);
         String jmx = testPlan.getJmx(jmeterHashTree);
 
-        jmx = apiTestService.updateJmxString(jmx,testName,false);
+        jmx = apiTestService.updateJmxString(jmx, testName, false);
 
         //将ThreadGroup的testname改为接口名称
 //        Document doc = DocumentHelper.parseText(jmx);// 获取可续保保单列表报文模板
@@ -805,16 +846,32 @@ public class ApiAutomationService {
         return apiImport;
     }
 
-    public ApiScenrioExportResult export(ApiScenarioBatchRequest request) {
+    private List<ApiScenarioWithBLOBs> getExportResult(ApiScenarioBatchRequest request) {
         ServiceUtils.getSelectAllIds(request, request.getCondition(),
                 (query) -> extApiScenarioMapper.selectIdsByQuery((ApiScenarioRequest) query));
         ApiScenarioExample example = new ApiScenarioExample();
         example.createCriteria().andIdIn(request.getIds());
         List<ApiScenarioWithBLOBs> apiScenarioWithBLOBs = apiScenarioMapper.selectByExampleWithBLOBs(example);
-        ApiScenrioExportResult result =  new ApiScenrioExportResult();
-        result.setData(apiScenarioWithBLOBs);
+        return apiScenarioWithBLOBs;
+    }
+
+    public ApiScenrioExportResult export(ApiScenarioBatchRequest request) {
+        ApiScenrioExportResult result = new ApiScenrioExportResult();
+        result.setData(getExportResult(request));
         result.setProjectId(request.getProjectId());
         result.setVersion(System.getenv("MS_VERSION"));
         return result;
     }
+
+    public List<ApiScenrioExportJmx> exportJmx(ApiScenarioBatchRequest request) {
+        List<ApiScenarioWithBLOBs> apiScenarioWithBLOBs = getExportResult(request);
+        // 生成jmx
+        List<ApiScenrioExportJmx> resList = new ArrayList<>();
+        apiScenarioWithBLOBs.forEach(item -> {
+            ApiScenrioExportJmx scenrioExportJmx = new ApiScenrioExportJmx(item.getName(), generateJmx(item));
+            resList.add(scenrioExportJmx);
+        });
+        return resList;
+    }
+
 }

From bbb218d60a5cb7d382fb29fe43448f385af28f23 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Sat, 20 Feb 2021 15:56:17 +0800
Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=9F?=
 =?UTF-8?q?=E6=88=90jmx=E6=96=87=E4=BB=B6=E5=87=BD=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0tcp/sql/dubbl?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=90=8D=E8=8A=82=E7=82=B9=E8=BD=AC=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改生成jmx文件函数的逻辑，增加tcp/sql/dubbl的类名节点转化
---
 .../api/service/APITestService.java           | 60 +++++++++++++++----
 1 file changed, 48 insertions(+), 12 deletions(-)

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 781ca72078..97cb243d15 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -463,33 +463,69 @@ public class APITestService {
 
     /**
      * @param jmxString      原JMX文件
-     * @param testName       某些节点要替换的testName
+     * @param testNameParam       某些节点要替换的testName
      * @param isFromScenario 是否来源于场景 （来源于场景的话，testName要进行处理）
      * @return
      */
-    public String updateJmxString(String jmxString, String testName, boolean isFromScenario) {
-        if (isFromScenario) {
-            //如果调用源来自场景， 原testName是 案例<->场景 ，需要进行切分，只保留案例名
-            String[] testNameArr = testName.split("<->");
-            if (testNameArr.length > 0) {
-                testName = testNameArr[0];
-            }
-        }
+    public String updateJmxString(String jmxString, String testNameParam, boolean isFromScenario) {
         try {
             //将ThreadGroup的testname改为接口名称
             Document doc = DocumentHelper.parseText(jmxString);// 获取可续保保单列表报文模板
             Element root = doc.getRootElement();
             Element rootHashTreeElement = root.element("hashTree");
             Element innerHashTreeElement = rootHashTreeElement.elements("hashTree").get(0);
-            Element theadGroupElement = innerHashTreeElement.elements("ThreadGroup").get(0);
-            theadGroupElement.attribute("testname").setText(testName);
-
             List<Element> thirdHashTreeElementList = innerHashTreeElement.elements("hashTree");
+
+            Element theadGroupElement = innerHashTreeElement.elements("ThreadGroup").get(0);
+            theadGroupElement.attribute("testname").setText(testNameParam);
+
             for (Element element : thirdHashTreeElementList) {
+                String testName = testNameParam;
                 List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
                 for (Element itemElement : sampleProxyElementList) {
+                    if(isFromScenario){
+                        testName = itemElement.attributeValue("testname");
+                        String[] testNameArr = testName.split("<->");
+                        if (testNameArr.length > 0) {
+                            testName = testNameArr[0];
+                        }
+                    }
                     itemElement.attribute("testname").setText(testName);
                 }
+                List<Element> tcpSamplerList = element.elements("TCPSampler");
+                for (Element itemElement : tcpSamplerList) {
+                    if(isFromScenario){
+                        testName = itemElement.attributeValue("testname");
+                        String[] testNameArr = testName.split("<->");
+                        if (testNameArr.length > 0) {
+                            testName = testNameArr[0];
+                        }
+                    }
+                    itemElement.attribute("testname").setText(testName);
+                }
+                List<Element> jdbcSamplerList = element.elements("JDBCSampler");
+                for (Element itemElement : jdbcSamplerList) {
+                    if(isFromScenario){
+                        testName = itemElement.attributeValue("testname");
+                        String[] testNameArr = testName.split("<->");
+                        if (testNameArr.length > 0) {
+                            testName = testNameArr[0];
+                        }
+                    }
+                    itemElement.attribute("testname").setText(testName);
+                }
+                List<Element> dubboSampleList = element.elements("DubboSample");
+                for (Element itemElement : dubboSampleList) {
+                    if(isFromScenario){
+                        testName = itemElement.attributeValue("testname");
+                        String[] testNameArr = testName.split("<->");
+                        if (testNameArr.length > 0) {
+                            testName = testNameArr[0];
+                        }
+                    }
+                    itemElement.attribute("testname").setText(testName);
+                }
+
                 //检查有没有自定义参数
                 List<Element> scriptHashTreeElementList = element.elements("hashTree");
                 for (Element scriptHashTreeElement : scriptHashTreeElementList) {

From 91c8509a0682198f0eee37a0608fbb5b8a8349a5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 15:58:17 +0800
Subject: [PATCH 06/13] Merge branch 'master' of
 https://github.com/metersphere/metersphere

# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
---
 .../api/controller/APITestController.java         | 15 ---------------
 1 file changed, 15 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 85b1bc768c..883f90772c 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -10,16 +10,11 @@ import io.metersphere.api.dto.datacount.response.ApiDataCountDTO;
 import io.metersphere.api.dto.datacount.response.ExecutedCaseInfoDTO;
 import io.metersphere.api.dto.datacount.response.TaskInfoResult;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
-import io.metersphere.api.dto.definition.request.MsTestElement;
 import io.metersphere.api.dto.scenario.request.dubbo.RegistryCenter;
 import io.metersphere.api.service.*;
-import io.metersphere.base.domain.ApiDefinition;
 import io.metersphere.base.domain.ApiTest;
-import io.metersphere.base.domain.LoadTest;
 import io.metersphere.base.domain.Schedule;
-import io.metersphere.commons.constants.PerformanceTestStatus;
 import io.metersphere.commons.constants.RoleConstants;
-import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.utils.CronUtils;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
@@ -28,24 +23,14 @@ import io.metersphere.controller.request.QueryScheduleRequest;
 import io.metersphere.dto.ScheduleDao;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.service.CheckPermissionService;
-import io.metersphere.service.FileService;
 import io.metersphere.service.ScheduleService;
-import io.metersphere.track.request.testplan.SaveTestPlanRequest;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.entity.ContentType;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;

From 85cd5077f5213baf29cd534f9bebda7b497aa698 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Sat, 20 Feb 2021 18:00:56 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=9F?=
 =?UTF-8?q?=E6=88=90jmx=E6=96=87=E4=BB=B6=E5=87=BD=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=BD=AC=E5=8C=96Dubbl=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改生成jmx文件函数的逻辑，转化Dubbl标签的参数
---
 .../java/io/metersphere/api/service/APITestService.java    | 7 +++++++
 1 file changed, 7 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 97cb243d15..fe6cfde712 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -35,6 +35,7 @@ import org.aspectj.util.FileUtil;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
+import org.dom4j.QName;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -524,6 +525,12 @@ public class APITestService {
                         }
                     }
                     itemElement.attribute("testname").setText(testName);
+
+                    //dubbo节点要更新 标签、guiClass 和 testClass
+                    itemElement.setName("io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample");
+                    itemElement.attribute("testclass").setText("io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample");
+                    itemElement.attribute("guiclass").setText("io.github.ningyu.jmeter.plugin.dubbo.gui.DubboSampleGui");
+
                 }
 
                 //检查有没有自定义参数

From e6e71a0f1e24a4d969e62b748cf42e28973e8777 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 18:25:39 +0800
Subject: [PATCH 08/13] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AE=8C=E6=88=90=E5=AF=BC=E5=87=BAjmx=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  |  2 +-
 .../dto/definition/request/MsTestElement.java |  5 +-
 .../request/sampler/MsJDBCSampler.java        |  7 ++-
 .../api/service/ApiAutomationService.java     |  5 +-
 .../api/automation/ApiAutomation.vue          |  5 +-
 .../automation/scenario/ApiScenarioModule.vue | 61 ++++++++++---------
 .../component/ApiScenarioComponent.vue        | 36 +++++------
 7 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 067a2478d2..4b200fa4cd 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -88,7 +88,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             preInitPool(request.getProjectId(), testPlan);
 
             MsScenario scenario = new MsScenario();
-            scenario.setReferenced("REF");
+            scenario.setReferenced("IMPORT");
             jmterHashTree(testPlan, scenario);
             this.projectId = request.getProjectId();
             ScenarioImport scenarioImport = new ScenarioImport();
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
index fc98f55213..28368aa8ee 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
@@ -164,9 +164,9 @@ public abstract class MsTestElement {
     }
 
     public Arguments addArguments(ParameterConfig config) {
-        Arguments arguments = new Arguments();
         if (config != null && config.getConfig() != null && config.getConfig().getCommonConfig() != null
                 && CollectionUtils.isNotEmpty(config.getConfig().getCommonConfig().getVariables())) {
+            Arguments arguments = new Arguments();
             arguments.setEnabled(true);
             arguments.setName(name + "Variables");
             arguments.setProperty(TestElement.TEST_CLASS, Arguments.class.getName());
@@ -174,8 +174,9 @@ public abstract class MsTestElement {
             config.getConfig().getCommonConfig().getVariables().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
                     arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")
             );
+            return arguments;
         }
-        return arguments;
+        return null;
     }
 
     protected EnvironmentConfig getEnvironmentConfig(String environmentId) {
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
index dcd0bb5f19..8cc2ed852e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
@@ -95,17 +95,18 @@ public class MsJDBCSampler extends MsTestElement {
     }
 
     private Arguments arguments(String name, List<KeyValue> variables) {
-        Arguments arguments = new Arguments();
         if (CollectionUtils.isNotEmpty(variables)) {
+            Arguments arguments = new Arguments();
             arguments.setEnabled(true);
-            arguments.setName(name);
+            arguments.setName(name + "JDBC_Argument");
             arguments.setProperty(TestElement.TEST_CLASS, Arguments.class.getName());
             arguments.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("ArgumentsPanel"));
             variables.stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
                     arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")
             );
+            return arguments;
         }
-        return arguments;
+        return null;
     }
 
     private JDBCSampler jdbcSampler(ParameterConfig config) {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 661e607b61..444b309f3e 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -556,7 +556,6 @@ public class ApiAutomationService {
         ParameterConfig config = new ParameterConfig();
         config.setConfig(envConfig);
         HashTree hashTree = request.getTestElement().generateHashTree(config);
-        System.out.println(request.getTestElement().getJmx(hashTree));
         // 调用执行方法
         createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
                 SessionUtils.getUserId());
@@ -709,7 +708,7 @@ public class ApiAutomationService {
         HashTree jmeterHashTree = generateHashTree(apiScenarios, request, null);
         String jmx = testPlan.getJmx(jmeterHashTree);
 
-        jmx = apiTestService.updateJmxString(jmx,testName,true);
+        jmx = apiTestService.updateJmxString(jmx, testName, true);
 
         //将ThreadGroup的testname改为接口名称
 //        Document doc = DocumentHelper.parseText(jmx);// 获取可续保保单列表报文模板
@@ -868,7 +867,7 @@ public class ApiAutomationService {
         // 生成jmx
         List<ApiScenrioExportJmx> resList = new ArrayList<>();
         apiScenarioWithBLOBs.forEach(item -> {
-            ApiScenrioExportJmx scenrioExportJmx = new ApiScenrioExportJmx(item.getName(), generateJmx(item));
+            ApiScenrioExportJmx scenrioExportJmx = new ApiScenrioExportJmx(item.getName(), apiTestService.updateJmxString(generateJmx(item), item.getName(), true));
             resList.add(scenrioExportJmx);
         });
         return resList;
diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 44ee0dafdc..2979c5140c 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -9,6 +9,7 @@
         @setNodeTree="setNodeTree"
         @enableTrash="enableTrash"
         @exportAPI="exportAPI"
+        @exportJmx="exportJmx"
         @refreshAll="refreshAll"
         :type="'edit'"
         ref="nodeTree"/>
@@ -69,7 +70,6 @@
   import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
   import MsEditApiScenario from "./scenario/EditApiScenario";
   import {getCurrentProjectID} from "../../../../common/js/utils";
-  import {PROJECT_NAME} from "../../../../common/js/constants";
 
   export default {
     name: "ApiAutomation",
@@ -133,6 +133,9 @@
       exportAPI() {
         this.$refs.apiScenarioList.exportApi();
       },
+      exportJmx(){
+        this.$refs.apiScenarioList.exportJmx();
+      },
       checkRedirectEditPage(redirectParam) {
         if (redirectParam != null) {
           let selectParamArr = redirectParam.split("edit:");
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index a841f44564..3e53c9b4a5 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -25,7 +25,8 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="add-scenario">{{ $t('api_test.automation.add_scenario') }}</el-dropdown-item>
                 <el-dropdown-item command="import">{{ $t('api_test.api_import.label') }}</el-dropdown-item>
-                <el-dropdown-item command="export">{{ $t('report.export') }}</el-dropdown-item>
+                <el-dropdown-item command="export">{{ $t('report.export') }}MS</el-dropdown-item>
+                <el-dropdown-item command="exportJmx">{{ $t('report.export') }}JMX</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -33,14 +34,14 @@
         <module-trash-button v-if="!isReadOnly" :condition="condition" :exe="enableTrash"/>
         <!-- 是否保留这个 -->
         <!--<api-scenario-module-header-->
-          <!--:condition="condition"-->
-          <!--:current-module="currentModule"-->
-          <!--:is-read-only="isReadOnly"-->
-          <!--:project-id="projectId"-->
-          <!--@exportAPI="exportAPI"-->
-          <!--@addScenario="addScenario"-->
-          <!--@refreshTable="$emit('refreshTable')"-->
-          <!--@refresh="refresh"/>-->
+        <!--:condition="condition"-->
+        <!--:current-module="currentModule"-->
+        <!--:is-read-only="isReadOnly"-->
+        <!--:project-id="projectId"-->
+        <!--@exportAPI="exportAPI"-->
+        <!--@addScenario="addScenario"-->
+        <!--@refreshTable="$emit('refreshTable')"-->
+        <!--@refresh="refresh"/>-->
       </template>
 
     </ms-node-tree>
@@ -56,27 +57,26 @@
 </template>
 
 <script>
-import SelectMenu from "../../../track/common/SelectMenu";
-import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
-import {getCurrentProjectID} from "@/common/js/utils";
-import MsNodeTree from "../../../track/common/NodeTree";
-import {buildNodePath} from "../../definition/model/NodeTree";
-import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
-import ApiScenarioModuleHeader from "@/business/components/api/automation/scenario/module/ApiScenarioModuleHeader";
-import ApiImport from "./common/ScenarioImport";
+  import SelectMenu from "../../../track/common/SelectMenu";
+  import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
+  import {getCurrentProjectID} from "@/common/js/utils";
+  import MsNodeTree from "../../../track/common/NodeTree";
+  import {buildNodePath} from "../../definition/model/NodeTree";
+  import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
+  import ApiImport from "./common/ScenarioImport";
 
-export default {
-  name: 'MsApiScenarioModule',
-  components: {
-    ApiImport,
-    ModuleTrashButton,
-    MsNodeTree,
-    MsAddBasisScenario,
-    SelectMenu,
-  },
-  props: {
-    isReadOnly: {
-      type: Boolean,
+  export default {
+    name: 'MsApiScenarioModule',
+    components: {
+      ApiImport,
+      ModuleTrashButton,
+      MsNodeTree,
+      MsAddBasisScenario,
+      SelectMenu,
+    },
+    props: {
+      isReadOnly: {
+        type: Boolean,
         default() {
           return false
         }
@@ -145,6 +145,9 @@ export default {
           case "export":
             this.$emit('exportAPI');
             break;
+          case "exportJmx":
+            this.$emit('exportJmx');
+            break;
         }
       },
       list() {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 1a0aa9f25e..6e37b464ba 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -22,23 +22,23 @@
 </template>
 
 <script>
-import MsSqlBasisParameters from "../../../definition/components/request/database/BasisParameters";
-import MsTcpBasisParameters from "../../../definition/components/request/tcp/TcpBasisParameters";
-import MsDubboBasisParameters from "../../../definition/components/request/dubbo/BasisParameters";
-import MsApiRequestForm from "../../../definition/components/request/http/ApiHttpRequestForm";
-import ApiBaseComponent from "../common/ApiBaseComponent";
+  import MsSqlBasisParameters from "../../../definition/components/request/database/BasisParameters";
+  import MsTcpBasisParameters from "../../../definition/components/request/tcp/TcpBasisParameters";
+  import MsDubboBasisParameters from "../../../definition/components/request/dubbo/BasisParameters";
+  import MsApiRequestForm from "../../../definition/components/request/http/ApiHttpRequestForm";
+  import ApiBaseComponent from "../common/ApiBaseComponent";
 
-export default {
-  name: "ApiScenarioComponent",
-  props: {
-    scenario: {},
-    node: {},
-    draggable: {
-      type: Boolean,
-      default: false,
+  export default {
+    name: "ApiScenarioComponent",
+    props: {
+      scenario: {},
+      node: {},
+      draggable: {
+        type: Boolean,
+        default: false,
+      },
     },
-  },
-  watch: {},
+    watch: {},
     created() {
       if (this.scenario.id && this.scenario.referenced === 'REF' && !this.scenario.loaded) {
         this.result = this.$get("/api/automation/getApiScenario/" + this.scenario.id, response => {
@@ -79,8 +79,10 @@ export default {
         this.$emit('remove', this.scenario, this.node);
       },
       active(item) {
-        item.active = !item.active;
-        this.reload();
+        if (item && item.active) {
+          item.active = !item.active;
+          this.reload();
+        }
       },
       copyRow() {
         this.$emit('copyRow', this.scenario, this.node);

From 188cdbf6e39f9a93d4a12d93803dda44abf6346f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 18:26:06 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/ApiScenarioList.vue   | 108 ++++++----
 .../scenario/api/ScenarioRelevance.vue        | 184 +++++++++---------
 2 files changed, 159 insertions(+), 133 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 317795503a..5561ad19cd 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -167,50 +167,50 @@
 </template>
 
 <script>
-import MsTableHeader from "@/business/components/common/components/MsTableHeader";
-import MsTablePagination from "@/business/components/common/pagination/TablePagination";
-import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
-import MsTag from "../../../common/components/MsTag";
-import {downloadFile, getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
-import MsApiReportDetail from "../report/ApiReportDetail";
-import MsTableMoreBtn from "./TableMoreBtn";
-import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
-import MsTestPlanList from "./testplan/TestPlanList";
-import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
-import {API_SCENARIO_CONFIGS} from "@/business/components/common/components/search/search-components";
-import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
-import PriorityTableItem from "../../../track/common/tableItems/planview/PriorityTableItem";
-import PlanStatusTableItem from "../../../track/common/tableItems/plan/PlanStatusTableItem";
-import BatchEdit from "../../../track/case/components/BatchEdit";
-import {API_SCENARIO_LIST, TEST_CASE_LIST, TEST_PLAN_LIST, WORKSPACE_ID} from "../../../../../common/js/constants";
-import {PROJECT_NAME} from "../../../../../common/js/constants";
-import EnvironmentSelect from "../../definition/components/environment/EnvironmentSelect";
-import BatchMove from "../../../track/case/components/BatchMove";
-import {_sort} from "@/common/js/tableUtils";
-import {Api_Scenario_List} from "@/business/components/common/model/JsonData";
-import HeaderCustom from "@/business/components/common/head/HeaderCustom";
-import {
-  _filter,
-  _handleSelect,
-  _handleSelectAll,
-  getSelectDataCounts,
-  setUnSelectIds, toggleAllSelection
-} from "@/common/js/tableUtils";
+  import MsTableHeader from "@/business/components/common/components/MsTableHeader";
+  import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+  import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
+  import MsTag from "../../../common/components/MsTag";
+  import {downloadFile, getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
+  import MsApiReportDetail from "../report/ApiReportDetail";
+  import MsTableMoreBtn from "./TableMoreBtn";
+  import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
+  import MsTestPlanList from "./testplan/TestPlanList";
+  import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
+  import {API_SCENARIO_CONFIGS} from "@/business/components/common/components/search/search-components";
+  import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
+  import PriorityTableItem from "../../../track/common/tableItems/planview/PriorityTableItem";
+  import PlanStatusTableItem from "../../../track/common/tableItems/plan/PlanStatusTableItem";
+  import BatchEdit from "../../../track/case/components/BatchEdit";
+  import {API_SCENARIO_LIST, TEST_CASE_LIST, TEST_PLAN_LIST, WORKSPACE_ID} from "../../../../../common/js/constants";
+  import {PROJECT_NAME} from "../../../../../common/js/constants";
+  import EnvironmentSelect from "../../definition/components/environment/EnvironmentSelect";
+  import BatchMove from "../../../track/case/components/BatchMove";
+  import {_sort} from "@/common/js/tableUtils";
+  import {Api_Scenario_List} from "@/business/components/common/model/JsonData";
+  import HeaderCustom from "@/business/components/common/head/HeaderCustom";
+  import {
+    _filter,
+    _handleSelect,
+    _handleSelectAll,
+    getSelectDataCounts,
+    setUnSelectIds, toggleAllSelection
+  } from "@/common/js/tableUtils";
 
-export default {
-  name: "MsApiScenarioList",
-  components: {
-    HeaderCustom,
-    BatchMove,
-    EnvironmentSelect,
-    BatchEdit,
-    PlanStatusTableItem,
-    PriorityTableItem,
-    MsTableHeaderSelectPopover,
-    MsTablePagination,
-    MsTableMoreBtn,
-    ShowMoreBtn,
-    MsTableHeader,
+  export default {
+    name: "MsApiScenarioList",
+    components: {
+      HeaderCustom,
+      BatchMove,
+      EnvironmentSelect,
+      BatchEdit,
+      PlanStatusTableItem,
+      PriorityTableItem,
+      MsTableHeaderSelectPopover,
+      MsTablePagination,
+      MsTableMoreBtn,
+      ShowMoreBtn,
+      MsTableHeader,
       MsTag,
       MsApiReportDetail,
       MsScenarioExtendButtons,
@@ -554,12 +554,15 @@ export default {
         _handleSelectAll(this, selection, this.tableData, this.selectRows);
         setUnSelectIds(this.tableData, this.condition, this.selectRows);
         this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
+        this.$emit('selection', selection);
       },
       handleSelect(selection, row) {
         _handleSelect(this, selection, row, this.selectRows);
         setUnSelectIds(this.tableData, this.condition, this.selectRows);
         this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
+        this.$emit('selection', selection);
       },
+
       isSelectDataAll(data) {
         this.condition.selectAll = data;
         setUnSelectIds(this.tableData, this.condition, this.selectRows);
@@ -672,6 +675,25 @@ export default {
           downloadFile("Metersphere_Scenario_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
         });
       },
+      exportJmx() {
+        let param = {};
+        this.buildBatchParam(param);
+        if (param.ids === undefined || param.ids.length < 1) {
+          this.$warning(this.$t("api_test.automation.scenario.check_case"));
+          return;
+        }
+        this.loading = true;
+        this.result = this.$post("/api/automation/export/jmx", param, response => {
+          this.loading = false;
+          let obj = response.data;
+          console.log(obj)
+          if (obj && obj.length > 0) {
+            obj.forEach(item => {
+              downloadFile(item.name + ".jmx", item.jmx);
+            })
+          }
+        });
+      },
       buildApiPath(scenarios) {
         scenarios.forEach((scenario) => {
           this.moduleOptions.forEach(item => {
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index bdeb6bac3e..ac296dc661 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -2,13 +2,13 @@
   <relevance-dialog :title="$t('api_test.automation.scenario_import')" ref="relevanceDialog">
 
     <template v-slot:aside>
-        <ms-api-scenario-module
-          @nodeSelectEvent="nodeChange"
-          @refreshTable="refresh"
-          @setModuleOptions="setModuleOptions"
-          @enableTrash="false"
-          :is-read-only="true"
-          ref="nodeTree"/>
+      <ms-api-scenario-module
+        @nodeSelectEvent="nodeChange"
+        @refreshTable="refresh"
+        @setModuleOptions="setModuleOptions"
+        @enableTrash="false"
+        :is-read-only="true"
+        ref="nodeTree"/>
     </template>
 
     <ms-api-scenario-list
@@ -27,94 +27,98 @@
 </template>
 
 <script>
-    import ScenarioRelevanceCaseList from "./RelevanceCaseList";
-    import MsApiModule from "../../../definition/components/module/ApiModule";
-    import MsContainer from "../../../../common/components/MsContainer";
-    import MsAsideContainer from "../../../../common/components/MsAsideContainer";
-    import MsMainContainer from "../../../../common/components/MsMainContainer";
-    import ScenarioRelevanceApiList from "./RelevanceApiList";
-    import MsApiScenarioModule from "../ApiScenarioModule";
-    import MsApiScenarioList from "../ApiScenarioList";
-    import {getUUID} from "../../../../../../common/js/utils";
-    import RelevanceDialog from "../../../../track/plan/view/comonents/base/RelevanceDialog";
-    export default {
-      name: "ScenarioRelevance",
-      components: {
-        RelevanceDialog,
-        MsApiScenarioList,
-        MsApiScenarioModule,
-        MsMainContainer, MsAsideContainer, MsContainer},
-      data() {
-          return {
-            result: {},
-            currentProtocol: null,
-            selectNodeIds: [],
-            moduleOptions: {},
-            isApiListEnable: true,
-            currentScenario: [],
-            currentScenarioIds: [],
-          }
+  import ScenarioRelevanceCaseList from "./RelevanceCaseList";
+  import MsApiModule from "../../../definition/components/module/ApiModule";
+  import MsContainer from "../../../../common/components/MsContainer";
+  import MsAsideContainer from "../../../../common/components/MsAsideContainer";
+  import MsMainContainer from "../../../../common/components/MsMainContainer";
+  import ScenarioRelevanceApiList from "./RelevanceApiList";
+  import MsApiScenarioModule from "../ApiScenarioModule";
+  import MsApiScenarioList from "../ApiScenarioList";
+  import {getUUID} from "../../../../../../common/js/utils";
+  import RelevanceDialog from "../../../../track/plan/view/comonents/base/RelevanceDialog";
+
+  export default {
+    name: "ScenarioRelevance",
+    components: {
+      RelevanceDialog,
+      MsApiScenarioList,
+      MsApiScenarioModule,
+      MsMainContainer, MsAsideContainer, MsContainer
+    },
+    data() {
+      return {
+        result: {},
+        currentProtocol: null,
+        selectNodeIds: [],
+        moduleOptions: {},
+        isApiListEnable: true,
+        currentScenario: [],
+        currentScenarioIds: [],
+      }
+    },
+    methods: {
+      reference() {
+        let scenarios = [];
+        if (!this.currentScenario || this.currentScenario.length < 1) {
+          this.$emit('请选择场景');
+          return;
+        }
+        this.currentScenario.forEach(item => {
+          let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'REF', resourceId: getUUID()};
+          scenarios.push(obj);
+        });
+        this.$emit('save', scenarios);
+        this.close();
       },
-      methods: {
-        reference() {
-          let scenarios = [];
-          if (!this.currentScenario || this.currentScenario.length < 1) {
-            this.$emit('请选择场景');
-            return;
-          }
-          this.currentScenario.forEach(item => {
-            let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'REF', resourceId: getUUID()};
-            scenarios.push(obj);
-          });
-          this.$emit('save', scenarios);
-          this.close();
-        },
-        copy() {
-          let scenarios = [];
-          if (!this.currentScenarioIds || this.currentScenarioIds.length < 1) {
-            this.$emit('请选择场景');
-            return;
-          }
-          this.result = this.$post("/api/automation/getApiScenarios/", this.currentScenarioIds, response => {
-            if (response.data) {
-              response.data.forEach(item => {
-                let scenarioDefinition = JSON.parse(item.scenarioDefinition);
+      copy() {
+        let scenarios = [];
+        if (!this.currentScenarioIds || this.currentScenarioIds.length < 1) {
+          this.$warning('请选择场景');
+          return;
+        }
+        this.result = this.$post("/api/automation/getApiScenarios/", this.currentScenarioIds, response => {
+          if (response.data) {
+            response.data.forEach(item => {
+              let scenarioDefinition = JSON.parse(item.scenarioDefinition);
+              if (scenarioDefinition && scenarioDefinition.hashTree) {
                 let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'Copy', resourceId: getUUID(), hashTree: scenarioDefinition.hashTree};
                 scenarios.push(obj);
-              });
-              this.$emit('save', scenarios);
-              this.close();
-            }
-          })
-        },
-        close() {
-          this.refresh();
-          this.$refs.relevanceDialog.close();
-        },
-        open() {
-          this.$refs.relevanceDialog.open();
-          if (this.$refs.apiScenarioList) {
-            this.$refs.apiScenarioList.search();
+              }
+            });
+            this.$emit('save', scenarios);
+            this.close();
           }
-        },
-        nodeChange(node, nodeIds, pNodes) {
-          this.selectNodeIds = nodeIds;
-        },
-        handleProtocolChange(protocol) {
-          this.currentProtocol = protocol;
-        },
-        setModuleOptions(data) {
-          this.moduleOptions = data;
-        },
-        refresh() {
-            this.$refs.apiScenarioList.search();
-        },
-        setData(data) {
-          this.currentScenario = Array.from(data).map(row => row);
-          this.currentScenarioIds = Array.from(data).map(row => row.id);
-        },
-      }
+        })
+      },
+      close() {
+        this.refresh();
+        this.$refs.relevanceDialog.close();
+      },
+      open() {
+        this.$refs.relevanceDialog.open();
+        if (this.$refs.apiScenarioList) {
+          this.$refs.apiScenarioList.search();
+        }
+      },
+      nodeChange(node, nodeIds, pNodes) {
+        this.selectNodeIds = nodeIds;
+      },
+      handleProtocolChange(protocol) {
+        this.currentProtocol = protocol;
+      },
+      setModuleOptions(data) {
+        this.moduleOptions = data;
+      },
+      refresh() {
+        this.$refs.apiScenarioList.search();
+      },
+      setData(data) {
+        this.currentScenario = Array.from(data).map(row => row);
+        this.currentScenarioIds = Array.from(data).map(row => row.id);
+      },
     }
+  }
 </script>
 
 <style scoped>

From 08a3c98ed6e5c9cd5695ac3030561c920a6113ca Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 18:50:40 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8Djmx=E5=AF=BC=E5=85=A5dubbo?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=8F=82=E6=95=B0=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/parse/MsJmeterParser.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 4b200fa4cd..95073d5b45 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -233,24 +233,24 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         elementNode.setConsumerAndService(consumerAndService);
 
         List<MethodArgument> methodArguments = Constants.getMethodArgs(sampler);
+        List<KeyValue> methodArgs = new LinkedList<>();
         if (CollectionUtils.isNotEmpty(methodArguments)) {
-            List<KeyValue> methodArgs = new LinkedList<>();
             methodArguments.forEach(item -> {
                 KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
                 methodArgs.add(keyValue);
             });
-            elementNode.setArgs(methodArgs);
         }
+        elementNode.setArgs(methodArgs);
 
         List<MethodArgument> arguments = Constants.getAttachmentArgs(sampler);
+        List<KeyValue> attachmentArgs = new LinkedList<>();
         if (CollectionUtils.isNotEmpty(arguments)) {
-            List<KeyValue> methodArgs = new LinkedList<>();
             arguments.forEach(item -> {
                 KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
-                methodArgs.add(keyValue);
+                attachmentArgs.add(keyValue);
             });
-            elementNode.setAttachmentArgs(methodArgs);
         }
+        elementNode.setAttachmentArgs(attachmentArgs);
     }
 
     /**

From 0922859f64700fbbd0dad1e99a604e37bc860886 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 22 Feb 2021 09:43:15 +0800
Subject: [PATCH 11/13] chore: sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 5e0b365f10..44bcc98930 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 5e0b365f1080197e84055e80071165787e2e79c5
+Subproject commit 44bcc9893033900f95c99068cd4edec740465dfe

From 11be6a7b5fe6c3cbb9433c6fba1780e1c98c8a63 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 22 Feb 2021 11:32:22 +0800
Subject: [PATCH 12/13] =?UTF-8?q?feat:=20K8S=20=E8=B5=84=E6=BA=90=E6=B1=A0?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81nodeSelector?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 44bcc98930..b9042074b7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 44bcc9893033900f95c99068cd4edec740465dfe
+Subproject commit b9042074b780205e275c674f64417799110519fd

From c737b01c272ee7db5c90f834e8e98424ea6124b4 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Mon, 22 Feb 2021 11:41:19 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0jmx=E6=96=87=E4=BB=B6=E6=97=B6=E6=9C=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0dubbo=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复更新jmx文件时未更新dubbo节点信息的缺陷
---
 .../api/service/APITestService.java           | 172 +++++++++---------
 1 file changed, 86 insertions(+), 86 deletions(-)

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 fe6cfde712..b0b4387f3d 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -463,108 +463,43 @@ public class APITestService {
     }
 
     /**
+     * 更新jmx数据，处理jmx里的各种参数
+     *
+     * 注： 与1.7分支合并时，如果该方法产生冲突，请以master为准
+     * @author song tianyang
      * @param jmxString      原JMX文件
      * @param testNameParam       某些节点要替换的testName
      * @param isFromScenario 是否来源于场景 （来源于场景的话，testName要进行处理）
      * @return
      */
     public String updateJmxString(String jmxString, String testNameParam, boolean isFromScenario) {
+        //注： 与1.7分支合并时，如果该方法产生冲突，请以master为准
+        String attribute_testName = "testname";
+        String [] requestElementNameArr = new String[]{"HTTPSamplerProxy","TCPSampler","JDBCSampler","DubboSample"};
+
         try {
             //将ThreadGroup的testname改为接口名称
             Document doc = DocumentHelper.parseText(jmxString);// 获取可续保保单列表报文模板
             Element root = doc.getRootElement();
             Element rootHashTreeElement = root.element("hashTree");
-            Element innerHashTreeElement = rootHashTreeElement.elements("hashTree").get(0);
-            List<Element> thirdHashTreeElementList = innerHashTreeElement.elements("hashTree");
 
-            Element theadGroupElement = innerHashTreeElement.elements("ThreadGroup").get(0);
-            theadGroupElement.attribute("testname").setText(testNameParam);
-
-            for (Element element : thirdHashTreeElementList) {
-                String testName = testNameParam;
-                List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
-                for (Element itemElement : sampleProxyElementList) {
-                    if(isFromScenario){
-                        testName = itemElement.attributeValue("testname");
-                        String[] testNameArr = testName.split("<->");
-                        if (testNameArr.length > 0) {
-                            testName = testNameArr[0];
-                        }
+            List<Element> innerHashTreeElementList = rootHashTreeElement.elements("hashTree");
+            for (Element innerHashTreeElement : innerHashTreeElementList) {
+                List<Element> thirdHashTreeElementList = innerHashTreeElement.elements("hashTree");
+                List<Element> theadGroupElementList = innerHashTreeElement.elements("ThreadGroup");
+                for (Element theadGroupElement : theadGroupElementList) {
+                    if(StringUtils.isNotEmpty(testNameParam)){
+                        theadGroupElement.attribute(attribute_testName).setText(testNameParam);
                     }
-                    itemElement.attribute("testname").setText(testName);
-                }
-                List<Element> tcpSamplerList = element.elements("TCPSampler");
-                for (Element itemElement : tcpSamplerList) {
-                    if(isFromScenario){
-                        testName = itemElement.attributeValue("testname");
-                        String[] testNameArr = testName.split("<->");
-                        if (testNameArr.length > 0) {
-                            testName = testNameArr[0];
-                        }
-                    }
-                    itemElement.attribute("testname").setText(testName);
-                }
-                List<Element> jdbcSamplerList = element.elements("JDBCSampler");
-                for (Element itemElement : jdbcSamplerList) {
-                    if(isFromScenario){
-                        testName = itemElement.attributeValue("testname");
-                        String[] testNameArr = testName.split("<->");
-                        if (testNameArr.length > 0) {
-                            testName = testNameArr[0];
-                        }
-                    }
-                    itemElement.attribute("testname").setText(testName);
-                }
-                List<Element> dubboSampleList = element.elements("DubboSample");
-                for (Element itemElement : dubboSampleList) {
-                    if(isFromScenario){
-                        testName = itemElement.attributeValue("testname");
-                        String[] testNameArr = testName.split("<->");
-                        if (testNameArr.length > 0) {
-                            testName = testNameArr[0];
-                        }
-                    }
-                    itemElement.attribute("testname").setText(testName);
-
-                    //dubbo节点要更新 标签、guiClass 和 testClass
-                    itemElement.setName("io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample");
-                    itemElement.attribute("testclass").setText("io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample");
-                    itemElement.attribute("guiclass").setText("io.github.ningyu.jmeter.plugin.dubbo.gui.DubboSampleGui");
-
                 }
 
-                //检查有没有自定义参数
-                List<Element> scriptHashTreeElementList = element.elements("hashTree");
-                for (Element scriptHashTreeElement : scriptHashTreeElementList) {
-                    boolean isRemove = false;
-                    List<Element> removeElement = new ArrayList<>();
-                    List<Element> scriptElementItemList = scriptHashTreeElement.elements();
-                    for (Element hashTreeItemElement : scriptElementItemList) {
-                        String className = hashTreeItemElement.attributeValue("testclass");
-                        String qname = hashTreeItemElement.getQName().getName();
+                for (Element element : thirdHashTreeElementList) {
+                    String testName = testNameParam;
 
-                        if (isRemove) {
-                            if (org.apache.commons.lang3.StringUtils.equals("hashTree", qname)) {
-                                removeElement.add(hashTreeItemElement);
-                            }
-                        }
-                        isRemove = false;
-                        if (org.apache.commons.lang3.StringUtils.equals(className, "JSR223PostProcessor")) {
-                            List<Element> scriptElements = hashTreeItemElement.elements("stringProp");
-                            for (Element scriptElement : scriptElements) {
-                                String scriptName = scriptElement.attributeValue("name");
-                                String contentValue = scriptElement.getStringValue();
-
-                                if ("script".equals(scriptName) && contentValue.startsWith("io.metersphere.api.jmeter.JMeterVars.addVars")) {
-                                    isRemove = true;
-                                    removeElement.add(hashTreeItemElement);
-                                }
-                            }
-                        }
-                    }
-                    for (Element itemElement : removeElement) {
-                        scriptHashTreeElement.remove(itemElement);
-                    }
+                    //更新请求类节点的部份属性
+                    this.updateRequestElementInfo(element,testNameParam,requestElementNameArr,isFromScenario);
+                    //检查有无jmeter不是别的自定义参数
+                    this.checkPrivateFunctionNode(element);
                 }
             }
             jmxString = root.asXML();
@@ -573,4 +508,69 @@ public class APITestService {
         }
         return jmxString;
     }
+
+    private void checkPrivateFunctionNode(Element element) {
+        List<Element> scriptHashTreeElementList = element.elements("hashTree");
+        for (Element scriptHashTreeElement : scriptHashTreeElementList) {
+            boolean isRemove = false;
+            List<Element> removeElement = new ArrayList<>();
+            List<Element> scriptElementItemList = scriptHashTreeElement.elements();
+            for (Element hashTreeItemElement : scriptElementItemList) {
+                String className = hashTreeItemElement.attributeValue("testclass");
+                String qname = hashTreeItemElement.getQName().getName();
+
+                if (isRemove) {
+                    if (org.apache.commons.lang3.StringUtils.equals("hashTree", qname)) {
+                        removeElement.add(hashTreeItemElement);
+                    }
+                }
+
+                isRemove = false;
+                if (org.apache.commons.lang3.StringUtils.equals(className, "JSR223PostProcessor")) {
+                    List<Element> scriptElements = hashTreeItemElement.elements("stringProp");
+                    for (Element scriptElement : scriptElements) {
+                        String scriptName = scriptElement.attributeValue("name");
+                        String contentValue = scriptElement.getStringValue();
+
+                        if ("script".equals(scriptName) && contentValue.startsWith("io.metersphere.api.jmeter.JMeterVars.addVars")) {
+                            isRemove = true;
+                            removeElement.add(hashTreeItemElement);
+                        }
+                    }
+                }
+            }
+            for (Element itemElement : removeElement) {
+                scriptHashTreeElement.remove(itemElement);
+            }
+        }
+    }
+
+    private void updateRequestElementInfo(Element element,String testNameParam,String [] requestElementNameArr,boolean isFromScenario){
+        String attribute_testName = "testname";
+        String scenarioCaseNameSplit = "<->";
+        String testName = testNameParam;
+
+        for(String requestElementName : requestElementNameArr){
+            List<Element> sampleProxyElementList = element.elements(requestElementName);
+            for (Element itemElement : sampleProxyElementList) {
+                if(isFromScenario){
+                    testName = itemElement.attributeValue(attribute_testName);
+                    String[] testNameArr = testName.split(scenarioCaseNameSplit);
+                    if (testNameArr.length > 0) {
+                        testName = testNameArr[0];
+                    }
+                }
+                itemElement.attribute(attribute_testName).setText(testName);
+
+                //double的话有额外处理方式
+                if(StringUtils.equals(requestElementName,"DubboSample")){
+                    //dubbo节点要更新 标签、guiClass 和 testClass
+                    itemElement.setName("io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample");
+                    itemElement.attribute("testclass").setText("io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample");
+                    itemElement.attribute("guiclass").setText("io.github.ningyu.jmeter.plugin.dubbo.gui.DubboSampleGui");
+                }
+
+            }
+        }
+    }
 }