Merge branch 'v1.7'

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
 

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>

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>

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 2b0af7c05f8148046fd17e4f2c06129367d69ac9
+Subproject commit 53bd821bee65be3374f1ccc9a299cef9ac44b985

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',
   }
 };

frontend/src/i18n/zh-CN.js

@@ -1505,6 +1505,7 @@ export default {
   },
   auth_source: {
     delete_prompt: '此操作会删除认证源，是否继续？',
-    title: '认证设置'
+    title: '认证设置',
+    auth_name_valid: '名称不支持特殊字符',
   }
 };

frontend/src/i18n/zh-TW.js

@@ -1503,6 +1503,7 @@ export default {
   },
   auth_source: {
     delete_prompt: '此操作會刪除認證源，是否繼續？ ',
-    title: '認證設置'
+    title: '認證設置',
+    auth_name_valid: '名稱不支持特殊字符',
   }
 };

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>