From 3941e2170a3ae1b459a84bf90195baa9e4a5910e Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Wed, 27 Jan 2021 14:55:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile       | 4 ++--
 backend/pom.xml  | 2 +-
 frontend/pom.xml | 2 +-
 pom.xml          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 832764cb3d..586ae05fbc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ ARG MS_VERSION=dev
 
 RUN mkdir -p /opt/apps && mkdir -p /opt/jmeter/lib/junit
 
-COPY backend/target/backend-1.6.jar /opt/apps
+COPY backend/target/backend-1.7.jar /opt/apps
 
 COPY backend/target/classes/jmeter/ /opt/jmeter/
 
-ENV JAVA_APP_JAR=/opt/apps/backend-1.6.jar
+ENV JAVA_APP_JAR=/opt/apps/backend-1.7.jar
 
 ENV AB_OFF=true
 
diff --git a/backend/pom.xml b/backend/pom.xml
index 74617336e4..aee9f307b3 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>metersphere-server</artifactId>
         <groupId>io.metersphere</groupId>
-        <version>1.6</version>
+        <version>1.7</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 43af035ce4..e49799d450 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>metersphere-server</artifactId>
     <groupId>io.metersphere</groupId>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index dfccba1d83..5cee597699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.metersphere</groupId>
     <artifactId>metersphere-server</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <packaging>pom</packaging>
 
     <parent>

From 215a181d2337e40a70055d65c0fefa9b624b0fa2 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 28 Jan 2021 14:58:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=BA=90=E5=90=8D=E7=A7=B0=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/xpack | 2 +-
 frontend/src/i18n/en-US.js             | 3 ++-
 frontend/src/i18n/zh-CN.js             | 3 ++-
 frontend/src/i18n/zh-TW.js             | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2b0af7c05f..53bd821bee 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2b0af7c05f8148046fd17e4f2c06129367d69ac9
+Subproject commit 53bd821bee65be3374f1ccc9a299cef9ac44b985
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 95a0c0321e..2cc47aeab8 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1502,6 +1502,7 @@ export default {
   },
   auth_source: {
     delete_prompt: 'This operation will delete the authentication source, do you want to continue? ',
-    title: 'Auth Source'
+    title: 'Auth Source',
+    auth_name_valid: 'Name does not support special characters',
   }
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 881973e90d..c33bef9ed2 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1505,6 +1505,7 @@ export default {
   },
   auth_source: {
     delete_prompt: '此操作会删除认证源，是否继续？',
-    title: '认证设置'
+    title: '认证设置',
+    auth_name_valid: '名称不支持特殊字符',
   }
 };
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 5be7ccd98a..e0ad97d891 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1503,6 +1503,7 @@ export default {
   },
   auth_source: {
     delete_prompt: '此操作會刪除認證源，是否繼續？ ',
-    title: '認證設置'
+    title: '認證設置',
+    auth_name_valid: '名稱不支持特殊字符',
   }
 };