From e0c0b05ace8d4e65be02b4f8f0de5732bb55502b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 5 Nov 2020 09:34:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack          | 2 +-
 frontend/src/business/components/settings/router.js | 4 +++-
 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                          | 3 +++
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index ee74568be0..597a1681d1 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit ee74568be0beba46da19616f5832e83f9164c688
+Subproject commit 597a1681d1327a622b2a38bac3f17ae9daf95442
diff --git a/frontend/src/business/components/settings/router.js b/frontend/src/business/components/settings/router.js
index 93da75f536..884418855f 100644
--- a/frontend/src/business/components/settings/router.js
+++ b/frontend/src/business/components/settings/router.js
@@ -32,7 +32,9 @@ export default {
       component: () => import('@/business/components/settings/system/SystemParameterSetting'),
       meta: {system: true, title: 'commons.system_parameter_setting'}
     },
-    ...requireContext.keys().map(key => requireContext(key).system),...requireContext.keys().map(key => requireContext(key).license),
+    ...requireContext.keys().map(key => requireContext(key).system),
+    ...requireContext.keys().map(key => requireContext(key).license),
+    ...requireContext.keys().map(key => requireContext(key).display),
     {
       path: 'organizationmember',
       component: () => import('@/business/components/settings/organization/OrganizationMember'),
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index cc38137a69..f6f172c645 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
+Subproject commit f6f172c6451d0f9c51f5e3246a66dde9edcd7a5d
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 1646d9d562..aba963ed85 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -180,6 +180,9 @@ export default {
     invalid: 'invalid',
     expired: 'expired',
   },
+  display: {
+    title: 'Theme'
+  },
   system_config: {
     base_config: 'Base Config',
     base: {
@@ -228,7 +231,7 @@ export default {
       mail: 'mail',
       nail_robot: 'Nail robot',
       enterprise_wechat_robot: 'Enterprise wechat robot',
-      notes:'Note: 1. Nail and create a custom robot in the enterprise group, and then copy the webhook address on our platform;\n' +
+      notes: 'Note: 1. Nail and create a custom robot in the enterprise group, and then copy the webhook address on our platform;\n' +
         '\n' +
         '2. Robots are selected as swarm robots, and "custom keyword" is selected for security verification: "task notification";\n' +
         '\n' +
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 0357884451..ae58f1510c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -180,6 +180,9 @@ export default {
     invalid: '无效',
     expired: '已过期',
   },
+  display: {
+    title: '显示设置'
+  },
   system_config: {
     base_config: '基本配置',
     base: {
@@ -229,7 +232,7 @@ export default {
       mail: '邮件',
       nail_robot: '钉钉机器人',
       enterprise_wechat_robot: '企业微信机器人',
-      notes:'注意:1.钉钉和企业群里新建一个自定义机器人，然后复制 webhook 地址在我们平台上;\n' +
+      notes: '注意:1.钉钉和企业群里新建一个自定义机器人，然后复制 webhook 地址在我们平台上;\n' +
         '       2.机器人选择为群机器人，安全验证选择“自定义关键词” ："任务通知";\n' +
         '       3.选择接收人时必须是你所建的群里包含的人,接收人手机号为必填项且为钉钉企业所使用的手机号,',
       message: '事件，接收人，接收方式为必填项',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 79149605e7..9427fd6e1d 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -180,6 +180,9 @@ export default {
     invalid: '無效',
     expired: '已過期',
   },
+  display: {
+    title: '顯示設置'
+  },
   system_config: {
     base_config: '基本配置',
     base: {