From eecc351061396bcac31427de9bb746a3a767c975 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 17 Sep 2020 15:52:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/reader/jmx/JmeterDocumentParser.java  |   6 +-
 .../components/PerformanceAdvancedConfig.vue  | 297 +++++++++---------
 frontend/src/i18n/en-US.js                    |   1 +
 frontend/src/i18n/zh-CN.js                    |   1 +
 frontend/src/i18n/zh-TW.js                    |   1 +
 5 files changed, 163 insertions(+), 143 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
index fa090c5af1..3b19b1b30b 100644
--- a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
@@ -442,8 +442,10 @@ public class JmeterDocumentParser implements DocumentParser {
             // 增加一个response_timeout，避免目标网站不反回结果导致测试不能结束
             if (item instanceof Element && nodeNameEquals(item, STRING_PROP)
                     && StringUtils.equals(((Element) item).getAttribute("name"), "HTTPSampler.response_timeout")) {
-                removeChildren(item);
-                item.appendChild(ele.getOwnerDocument().createTextNode(""));
+                if (context.getProperty("responseTimeout") != null) {
+                    removeChildren(item);
+                    item.appendChild(ele.getOwnerDocument().createTextNode(context.getProperty("responseTimeout").toString()));
+                }
             }
         }
     }
diff --git a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
index ea28c41c89..5429c37056 100644
--- a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
@@ -90,6 +90,20 @@
           </el-form-item>
         </el-form>
       </el-col>
+      <el-col :span="8">
+        <el-form :inline="true">
+          <el-form-item>
+            <div>{{ $t('load_test.response_timeout') }}</div>
+          </el-form-item>
+          <el-form-item>
+            <el-input-number :disabled="readOnly" size="mini" v-model="responseTimeout" :min="10"
+                             :max="100000"></el-input-number>
+          </el-form-item>
+          <el-form-item>
+            ms
+          </el-form-item>
+        </el-form>
+      </el-col>
     </el-row>
     <el-row>
       <el-col :span="8">
@@ -109,169 +123,170 @@
 </template>
 
 <script>
-  import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
+import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
 
-  export default {
-    name: "PerformanceAdvancedConfig",
-    components: {MsTableOperatorButton},
-    data() {
-      return {
-        timeout: 2000,
-        statusCode: [],
-        domains: [],
-        params: [],
-        statusCodeStr: '',
-      }
+export default {
+  name: "PerformanceAdvancedConfig",
+  components: {MsTableOperatorButton},
+  data() {
+    return {
+      timeout: 2000,
+      responseTimeout: null,
+      statusCode: [],
+      domains: [],
+      params: [],
+      statusCodeStr: '',
+    }
+  },
+  props: {
+    readOnly: {
+      type: Boolean,
+      default: false
     },
-    props: {
-      readOnly: {
-        type: Boolean,
-        default: false
-      },
-      testId: String,
-    },
-    mounted() {
+    testId: String,
+  },
+  mounted() {
+    if (this.testId) {
+      this.getAdvancedConfig();
+    }
+  },
+  watch: {
+    testId() {
       if (this.testId) {
         this.getAdvancedConfig();
       }
-    },
-    watch: {
-      testId() {
-        if (this.testId) {
-          this.getAdvancedConfig();
+    }
+  },
+  methods: {
+    getAdvancedConfig() {
+      this.$get('/performance/get-advanced-config/' + this.testId, (response) => {
+        if (response.data) {
+          let data = JSON.parse(response.data);
+          this.timeout = data.timeout || 10;
+          this.responseTimeout = data.responseTimeout;
+          this.statusCode = data.statusCode || [];
+          this.statusCodeStr = this.statusCode.join(',');
+          this.domains = data.domains || [];
+          this.params = data.params || [];
         }
+      });
+    },
+    add(dataName) {
+      if (dataName === 'domains') {
+        this[dataName].push({
+          domain: 'fit2cloud.com',
+          enable: true,
+          ip: '127.0.0.1',
+          edit: true,
+        });
+      }
+      if (dataName === 'params') {
+        this[dataName].push({
+          name: 'param1',
+          enable: true,
+          value: '0',
+          edit: true,
+        });
       }
     },
-    methods: {
-      getAdvancedConfig() {
-        this.$get('/performance/get-advanced-config/' + this.testId, (response) => {
-          if (response.data) {
-            let data = JSON.parse(response.data);
-            this.timeout = data.timeout || 10;
-            this.statusCode = data.statusCode || [];
-            this.statusCodeStr = this.statusCode.join(',');
-            this.domains = data.domains || [];
-            this.params = data.params || [];
-            /*this.domains.forEach(d => d.edit = false);
-            this.params.forEach(d => d.edit = false);*/
-          }
-        });
-      },
-      add(dataName) {
-        if (dataName === 'domains') {
-          this[dataName].push({
-            domain: 'fit2cloud.com',
-            enable: true,
-            ip: '127.0.0.1',
-            edit: true,
-          });
+    edit(row) {
+      row.edit = !row.edit
+    },
+    del(row, dataName, index) {
+      this[dataName].splice(index, 1);
+    },
+    confirmEdit(row) {
+      row.edit = false;
+      row.enable = true;
+    },
+    groupBy(data, key) {
+      return data.reduce((p, c) => {
+        let name = c[key];
+        if (!p.hasOwnProperty(name)) {
+          p[name] = 0;
         }
-        if (dataName === 'params') {
-          this[dataName].push({
-            name: 'param1',
-            enable: true,
-            value: '0',
-            edit: true,
-          });
-        }
-      },
-      edit(row) {
-        row.edit = !row.edit
-      },
-      del(row, dataName, index) {
-        this[dataName].splice(index, 1);
-      },
-      confirmEdit(row) {
-        row.edit = false;
-        row.enable = true;
-      },
-      groupBy(data, key) {
-        return data.reduce((p, c) => {
-          let name = c[key];
-          if (!p.hasOwnProperty(name)) {
-            p[name] = 0;
-          }
-          p[name]++;
-          return p;
-        }, {});
-      },
-      validConfig() {
-        let counts = this.groupBy(this.domains, 'domain');
-        for (let c in counts) {
-          if (counts[c] > 1) {
-            this.$error(this.$t('load_test.domain_is_duplicate'));
-            return false;
-          }
-        }
-        counts = this.groupBy(this.params, 'name');
-        for (let c in counts) {
-          if (counts[c] > 1) {
-            this.$error(this.$t('load_test.param_is_duplicate'));
-            return false;
-          }
-        }
-        if (this.domains.filter(d => !d.domain || !d.ip).length > 0) {
-          this.$error(this.$t('load_test.domain_ip_is_empty'));
+        p[name]++;
+        return p;
+      }, {});
+    },
+    validConfig() {
+      let counts = this.groupBy(this.domains, 'domain');
+      for (let c in counts) {
+        if (counts[c] > 1) {
+          this.$error(this.$t('load_test.domain_is_duplicate'));
           return false;
         }
-        if (this.params.filter(d => !d.name || !d.value).length > 0) {
-          this.$error(this.$t('load_test.param_name_value_is_empty'));
+      }
+      counts = this.groupBy(this.params, 'name');
+      for (let c in counts) {
+        if (counts[c] > 1) {
+          this.$error(this.$t('load_test.param_is_duplicate'));
           return false;
         }
-        return true;
-      },
-      checkStatusCode() {
-        let license_num = this.statusCodeStr;
-        license_num = license_num.replace(/[^\d,]/g, ''); // 清除“数字”和“.”以外的字符
-        this.statusCodeStr = license_num;
-      },
-      cancelAllEdit() {
-        this.domains.forEach(d => d.edit = false);
-        this.params.forEach(d => d.edit = false);
-      },
-      configurations() {
-        let statusCode = [];
-        if (this.statusCodeStr) {
-          statusCode = this.statusCodeStr.split(',');
-        }
-        return {
-          timeout: this.timeout,
-          statusCode: statusCode,
-          params: this.params,
-          domains: this.domains,
-        };
-      },
-    }
+      }
+      if (this.domains.filter(d => !d.domain || !d.ip).length > 0) {
+        this.$error(this.$t('load_test.domain_ip_is_empty'));
+        return false;
+      }
+      if (this.params.filter(d => !d.name || !d.value).length > 0) {
+        this.$error(this.$t('load_test.param_name_value_is_empty'));
+        return false;
+      }
+      return true;
+    },
+    checkStatusCode() {
+      let license_num = this.statusCodeStr;
+      license_num = license_num.replace(/[^\d,]/g, ''); // 清除“数字”和“.”以外的字符
+      this.statusCodeStr = license_num;
+    },
+    cancelAllEdit() {
+      this.domains.forEach(d => d.edit = false);
+      this.params.forEach(d => d.edit = false);
+    },
+    configurations() {
+      let statusCode = [];
+      if (this.statusCodeStr) {
+        statusCode = this.statusCodeStr.split(',');
+      }
+      return {
+        timeout: this.timeout,
+        responseTimeout: this.responseTimeout,
+        statusCode: statusCode,
+        params: this.params,
+        domains: this.domains,
+      };
+    },
   }
+}
 </script>
 
 <style scoped>
-  .el-row {
-    margin-bottom: 10px;
-  }
+.el-row {
+  margin-bottom: 10px;
+}
 
-  .edit-input {
-    padding-right: 0px;
-  }
+.edit-input {
+  padding-right: 0px;
+}
 
-  .tb-edit .el-textarea {
-    display: none;
-  }
+.tb-edit .el-textarea {
+  display: none;
+}
 
-  .tb-edit .current-row .el-textarea {
-    display: block;
-  }
+.tb-edit .current-row .el-textarea {
+  display: block;
+}
 
-  .tb-edit .current-row .el-textarea + span {
-    display: none;
-  }
+.tb-edit .current-row .el-textarea + span {
+  display: none;
+}
 
-  .el-col {
-    text-align: left;
-  }
+.el-col {
+  text-align: left;
+}
 
-  .el-col .el-table {
-    align: center;
-  }
+.el-col .el-table {
+  align: center;
+}
 
 </style>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c580a0f5e0..dc26cbd7f1 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -378,6 +378,7 @@ export default {
     domain_ip_is_empty: 'Domain and IP cannot be empty',
     param_name_value_is_empty: 'Parameters cannot be empty',
     connect_timeout: 'Timeout to establish a connection',
+    response_timeout: 'Timeout to response',
     custom_http_code: 'Custom HTTP response success status code',
     separated_by_commas: 'Separated by commas',
     create: 'Create Test',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 619d479765..d1857d72d6 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -377,6 +377,7 @@ export default {
     domain_ip_is_empty: '域名和IP不能为空',
     param_name_value_is_empty: '参数名和参数值不能为空',
     connect_timeout: '建立连接超时时间',
+    response_timeout: '响应超时时间',
     custom_http_code: '自定义 HTTP 响应成功状态码',
     separated_by_commas: '按逗号分隔',
     create: '创建测试',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index ffed703ea6..13897a56bf 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -377,6 +377,7 @@ export default {
     domain_ip_is_empty: '域名和IP不能為空',
     param_name_value_is_empty: '參數名和參數值不能為空',
     connect_timeout: '建立連接超時時間',
+    response_timeout: '響應超時時間',
     custom_http_code: '自定義 HTTP 響應成功狀態碼',
     separated_by_commas: '按逗號分隔',
     create: '創建測試',