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 @@ metersphere-server io.metersphere - 1.6 + 1.7 4.0.0 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 @@ metersphere-server io.metersphere - 1.6 + 1.7 4.0.0 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: '名稱不支持特殊字符', } }; diff --git a/pom.xml b/pom.xml index dfccba1d83..5cee597699 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.metersphere metersphere-server - 1.6 + 1.7 pom