From d95ded1f38458ad06001d78cf367bee3d78cbc3c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 28 Sep 2020 15:04:31 +0800
Subject: [PATCH 1/3] refactor: i18n

---
 backend/src/main/java/io/metersphere/xpack           |  2 +-
 .../components/track/home/components/ReviewList.vue  | 12 ++++++------
 frontend/src/business/components/xpack               |  2 +-
 frontend/src/i18n/en-US.js                           |  5 +++++
 frontend/src/i18n/zh-CN.js                           |  5 +++++
 frontend/src/i18n/zh-TW.js                           |  5 +++++
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index cf6b065263..c2dacf960c 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8
diff --git a/frontend/src/business/components/track/home/components/ReviewList.vue b/frontend/src/business/components/track/home/components/ReviewList.vue
index 308cdada39..9029225708 100644
--- a/frontend/src/business/components/track/home/components/ReviewList.vue
+++ b/frontend/src/business/components/track/home/components/ReviewList.vue
@@ -1,11 +1,11 @@
 <template>
-  <home-base-component title="我的评审" v-loading>
+  <home-base-component :title="$t('test_track.review.my_review')" v-loading>
     <template slot="header-area">
       <div style="float: right">
         <ms-table-button :is-tester-permission="true" v-if="!showMyCreator" icon="el-icon-view"
-                         content="我创建的评审" @click="searchMyCreator"/>
+                         :content="$t('test_track.review.my_create')" @click="searchMyCreator"/>
         <ms-table-button :is-tester-permission="true" v-if="showMyCreator" icon="el-icon-view"
-                         content="待我评审" @click="searchMyCreator"/>
+                         :content="$t('test_track.review.reviewed_by_me')" @click="searchMyCreator"/>
       </div>
 
     </template>
@@ -24,13 +24,13 @@
       <el-table-column
         prop="creator"
         fixed
-        label="创建人"
+        :label="$t('test_track.review.creator')"
         show-overflow-tooltip>
       </el-table-column>
       <el-table-column
         prop="reviewerName"
         fixed
-        label="评审人"
+        :label="$t('test_track.review.reviewer')"
         show-overflow-tooltip>
       </el-table-column>
 
@@ -45,7 +45,7 @@
 
       <el-table-column
         prop="projectName"
-        label="已评用例"
+        :label="$t('test_track.review.done')"
         show-overflow-tooltip>
         <template v-slot:default="scope">
           {{scope.row.reviewed}}/{{scope.row.total}}
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 06d935cd1d..cc38137a69 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f9678deec3..f5a581b625 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -758,6 +758,11 @@ export default {
       pass: "pass",
       un_pass: "UnPass",
       comment: "Comment",
+      my_review: "My Review",
+      my_create: "My Create",
+      reviewed_by_me: "Review By Me",
+      creator: "Creator",
+      done: "Commented use cases"
     },
     comment: {
       no_comment: "No Comment",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 526bb66233..a194ed09b1 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -764,6 +764,11 @@ export default {
       pass: "通过",
       un_pass: "未通过",
       comment: "评论",
+      my_review: "我的评审",
+      my_create: "我创建的评审",
+      reviewed_by_me: "待我评审",
+      creator: "创建人",
+      done: "已评用例"
     },
     comment: {
       no_comment: "暂无评论",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 3a2ad86d6e..cea09d65c2 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -760,6 +760,11 @@ export default {
       pass: "通過",
       un_pass: "未通過",
       comment: "評論",
+      my_review: "我的評審",
+      my_create: "我創建的評審",
+      reviewed_by_me: "待我評審",
+      creator: "創建人",
+      done: "已評用例"
     },
     comment: {
       no_comment: "暫無評論",

From da17c8448f7fde1790b7286539eeb1958d87fb82 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 28 Sep 2020 15:29:02 +0800
Subject: [PATCH 2/3] fix:i18n

---
 .../src/business/components/settings/system/BaseSetting.vue     | 2 +-
 frontend/src/i18n/en-US.js                                      | 1 +
 frontend/src/i18n/zh-CN.js                                      | 1 +
 frontend/src/i18n/zh-TW.js                                      | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/BaseSetting.vue b/frontend/src/business/components/settings/system/BaseSetting.vue
index ab58b8935c..822951078a 100644
--- a/frontend/src/business/components/settings/system/BaseSetting.vue
+++ b/frontend/src/business/components/settings/system/BaseSetting.vue
@@ -6,7 +6,7 @@
         <el-col>
           <el-form-item :label="$t('system_config.base.url')" prop="url">
             <el-input v-model="formInline.url" :placeholder="$t('system_config.base.url_tip')"/>
-            <i>(示例:https://rdmetersphere.fit2cloud.com)</i>
+            <i>({{$t('commons.examples')}}:https://rdmetersphere.fit2cloud.com)</i>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f9678deec3..55461939e3 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,5 +1,6 @@
 export default {
   commons: {
+    examples: 'examples',
     help_documentation: 'Help documentation',
     delete_cancelled: 'Delete cancelled',
     workspace: 'Workspace',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 526bb66233..a614e85781 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,5 +1,6 @@
 export default {
   commons: {
+    examples: '示例',
     help_documentation: '帮助文档',
     delete_cancelled: '已取消删除',
     workspace: '工作空间',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 3a2ad86d6e..bbdccacda5 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1,5 +1,6 @@
 export default {
   commons: {
+    examples: '示例',
     help_documentation: '幫助文檔',
     delete_cancelled: '已取消刪除',
     workspace: '工作空間',

From 01a9eb3d838afcff9f496a6bb6654ffc0e429eb0 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 28 Sep 2020 15:50:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=80=89=E6=8B=A9json=E6=A8=A1=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=BD=AE=E8=84=9A=E6=9C=AC=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/report/components/ResponseText.vue           |  7 +++++++
 .../test/components/processor/Jsr233Processor.vue    | 10 +++++++++-
 frontend/src/i18n/en-US.js                           | 12 +++++++-----
 frontend/src/i18n/zh-CN.js                           |  2 ++
 frontend/src/i18n/zh-TW.js                           |  2 ++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/api/report/components/ResponseText.vue b/frontend/src/business/components/api/report/components/ResponseText.vue
index 6dc3c409ac..f0978febf5 100644
--- a/frontend/src/business/components/api/report/components/ResponseText.vue
+++ b/frontend/src/business/components/api/report/components/ResponseText.vue
@@ -63,6 +63,13 @@
         this.mode = mode;
       }
     },
+
+    created() {
+      console.log(this.response.headers);
+      if (this.response.headers.indexOf("Content-Type: application/json") > 0) {
+        this.mode = BODY_FORMAT.JSON;
+      }
+    }
   }
 </script>
 
diff --git a/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue b/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue
index 3991e120fc..18b972149d 100644
--- a/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue
+++ b/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue
@@ -38,7 +38,15 @@
             },
             {
               title: this.$t('api_test.request.processor.code_template_set_variable'),
-              value: 'vars.put("variable_name", "variable_value");',
+              value: 'vars.put("variable_name", "variable_value")',
+            },
+            {
+              title: this.$t('api_test.request.processor.code_template_get_global_variable'),
+              value: '${__P("variable_name")}',
+            },
+            {
+              title: this.$t('api_test.request.processor.code_template_set_global_variable'),
+              value: '${__setProperty("variable_name","variable_value",)}',
             },
             {
               title: this.$t('api_test.request.processor.code_template_get_response_header'),
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f9678deec3..76cef3f2fd 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -537,11 +537,13 @@ export default {
         post_exec_script: "PostProcessor",
         code_template: "Code template",
         bean_shell_processor_tip: "Currently only BeanShell scripts are supported",
-        code_template_get_variable: "Get variable",
-        code_template_set_variable: "Set variable",
-        code_template_get_response_header: "Get response header",
-        code_template_get_response_code: "Get response code",
-        code_template_get_response_result: "Get response result"
+        code_template_get_variable: "Get Variable",
+        code_template_set_variable: "Set Variable",
+        code_template_get_global_variable: "Get Global Variable",
+        code_template_set_global_variable: "Set Global variable",
+        code_template_get_response_header: "Get Response Header",
+        code_template_get_response_code: "Get Response Code",
+        code_template_get_response_result: "Get Response Result"
       },
       dubbo: {
         protocol: "protocol",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 526bb66233..664cd1bf24 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -540,6 +540,8 @@ export default {
         bean_shell_processor_tip: "仅支持 BeanShell 脚本",
         code_template_get_variable: "获取变量",
         code_template_set_variable: "设置变量",
+        code_template_get_global_variable: "获取全局变量",
+        code_template_set_global_variable: "设置全局变量",
         code_template_get_response_header: "获取响应头",
         code_template_get_response_code: "获取响应码",
         code_template_get_response_result: "获取响应结果"
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 3a2ad86d6e..0c08734901 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -540,6 +540,8 @@ export default {
         bean_shell_processor_tip: "僅支持 BeanShell 腳本",
         code_template_get_variable: "獲取變量",
         code_template_set_variable: "設置變量",
+        code_template_get_global_variable: "獲取全局變量",
+        code_template_set_global_variable: "設置全局變量",
         code_template_get_response_header: "獲取響應頭",
         code_template_get_response_code: "獲取響應碼",
         code_template_get_response_result: "獲取響應結果"