From 8e3a07a1420792ca3906bb05ba64f3265d6cde19 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 7 Jul 2021 17:29:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E5=9B=BA=E5=AE=9A=20rampup=20=E5=8D=95=E4=BD=8D=20(#4465)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Captain.B <bin@fit2cloud.com>
---
 .../parse/xml/reader/jmx/JmeterDocumentParser.java            | 4 ----
 frontend/src/i18n/zh-CN.js                                    | 4 ++--
 frontend/src/i18n/zh-TW.js                                    | 4 ++--
 3 files changed, 4 insertions(+), 8 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 60e01119d1..a84688d048 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
@@ -871,11 +871,9 @@ public class JmeterDocumentParser implements DocumentParser {
         switch (unit) {
             case "M":
                 duration = String.valueOf(Long.parseLong(duration) * 60);
-                rampUp = String.valueOf(Long.parseLong(rampUp) * 60);
                 break;
             case "H":
                 duration = String.valueOf(Long.parseLong(duration) * 60 * 60);
-                rampUp = String.valueOf(Long.parseLong(rampUp) * 60 * 60);
                 break;
             default:
                 break;
@@ -988,11 +986,9 @@ public class JmeterDocumentParser implements DocumentParser {
         switch (unit) {
             case "M":
                 hold = String.valueOf(Long.parseLong(hold) * 60);
-                rampUp = String.valueOf(Long.parseLong(rampUp) * 60);
                 break;
             case "H":
                 hold = String.valueOf(Long.parseLong(hold) * 60 * 60);
-                rampUp = String.valueOf(Long.parseLong(rampUp) * 60 * 60);
                 break;
             default:
                 break;
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 13ad41ec95..61a8ecc096 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -607,8 +607,8 @@ export default {
     rps_limit: 'RPS上限：',
     input_rps_limit: '请输入限制',
     ramp_up_time_within: '在',
-    ramp_up_time_minutes: '{0}内，分',
-    ramp_up_time_seconds: '{0}内增加并发用户',
+    ramp_up_time_minutes: '秒内，分',
+    ramp_up_time_seconds: '秒内增加并发用户',
     iterate_num: '迭代次数 (次): ',
     by_iteration: '按迭代次数',
     by_duration: '按持续时间',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index ac88f34752..a10330bfe0 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -607,8 +607,8 @@ export default {
     rps_limit: 'RPS上限：',
     input_rps_limit: '請輸入限制',
     ramp_up_time_within: '在',
-    ramp_up_time_minutes: '{0}內，分',
-    ramp_up_time_seconds: '{0}內增加並發用戶',
+    ramp_up_time_minutes: '秒內，分',
+    ramp_up_time_seconds: '秒內增加並發用戶',
     iterate_num: '叠代次數 (次): ',
     by_iteration: '按叠代次數',
     by_duration: '按持續時間',