From 302d814a3c6638d545a6374c9836b1de0a22a3a0 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 7 Apr 2021 08:22:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E8=87=AA=E5=8A=A8=E5=81=9C=E6=AD=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                          | 6 ++++++
 .../test/components/PerformancePressureConfig.vue        | 6 +++---
 frontend/src/i18n/en-US.js                               | 5 ++++-
 frontend/src/i18n/zh-CN.js                               | 3 +++
 frontend/src/i18n/zh-TW.js                               | 9 ++++++---
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 7c5cb8a95..e7d128496 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -223,6 +223,12 @@
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
             <version>3.4.14</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 72e060032..408b24926 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -17,10 +17,10 @@
             <el-switch v-model="serializeThreadGroups"/>
           </el-form-item>
           <br>
-          <el-form-item :label="$t('自动停止开启')">
+          <el-form-item :label="$t('load_test.autostop_threadgroups')">
             <el-switch v-model="autoStop"/>
           </el-form-item>
-          <el-form-item :label="$t('到达执行时间')">
+          <el-form-item :label="$t('load_test.reaches_duration')">
             <el-input-number
               :disabled="isReadOnly || !autoStop"
               v-model="autoStopDelay"
@@ -28,7 +28,7 @@
               :max="9999"
               size="mini"/>
           </el-form-item>
-          <el-form-item :label="$t('秒后停止测试')"/>
+          <el-form-item :label="$t('load_test.autostop_delay')"/>
         </el-form>
       </el-col>
     </el-row>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d9d718645..b5de13575 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -523,7 +523,10 @@ export default {
     response_timeout: 'Timeout to response',
     custom_http_code: 'Custom HTTP response success status code',
     separated_by_commas: 'Separated by commas',
-    serialize_threadgroups:'Whether the scene is executed sequentially',
+    serialize_threadgroups: 'Whether the scene is executed sequentially',
+    autostop_threadgroups: 'Auto stop enable',
+    reaches_duration: 'Delay',
+    autostop_delay: 'seconds before stopping the test',
     create: 'Create Test',
     select_resource_pool: 'Please Select Resource Pool',
     resource_pool_is_null: 'Resource Pool is empty',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e7f549eff..d5afb6efa 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -524,6 +524,9 @@ export default {
     run: '一键运行',
     select_resource_pool: '请选择资源池',
     serialize_threadgroups: '场景是否顺序执行',
+    autostop_threadgroups: '自动停止开启',
+    reaches_duration: '到达执行时间',
+    autostop_delay: '秒后停止测试',
     resource_pool_is_null: '资源池为空',
     download_log_file: '下载完整日志文件',
     pressure_prediction_chart: '压力预估图',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 305cd0506..f0c7d77b5 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -401,7 +401,7 @@ export default {
     apikey_delete_confirm: '這個 API Key 確定要刪除嗎?',
     input_id_placeholder: '請輸入ID (不支持中文)',
     source: '用戶來源',
-    button:{
+    button: {
       add_workspace_batch: '批量添加到工作空間',
       add_user_role_batch: '批量添加角色',
     }
@@ -524,6 +524,9 @@ export default {
     run: '壹鍵運行',
     select_resource_pool: '請選擇資源池',
     serialize_threadgroups: '場景是否順序執行',
+    autostop_threadgroups: '自動停止開啟',
+    reaches_duration: '到達執行時間',
+    autostop_delay: '秒後停止測試',
     resource_pool_is_null: '資源池為空',
     download_log_file: '下載完整日誌文件',
     pressure_prediction_chart: '壓力預估圖',
@@ -909,8 +912,8 @@ export default {
         code_template_get_response_header: "獲取響應頭",
         code_template_get_response_code: "獲取響應碼",
         code_template_get_response_result: "獲取響應結果",
-        code_add_report_length : "報文头添加長度",
-        code_hide_report_length : "隱藏報文長度"
+        code_add_report_length: "報文头添加長度",
+        code_hide_report_length: "隱藏報文長度"
       },
       dubbo: {
         protocol: "協議",
-- 
GitLab