From b9d4b9443565f4669139c0f712f64877015d6688 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Thu, 28 Jan 2021 14:05:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=94=B6=E4=B8=8D=E5=88=B0=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/metersphere/notice/service/MailService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java index ea5627da9b..dbc8894db4 100644 --- a/backend/src/main/java/io/metersphere/notice/service/MailService.java +++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java @@ -53,14 +53,14 @@ public class MailService { props.put("mail.smtp.starttls.enable", result); props.put("mail.smtp.starttls.required", result); break; - case "smtp.anon": + /* case "smtp.anon": boolean isAnon = BooleanUtils.toBoolean(p.getParamValue()); if (isAnon) { props.put("mail.smtp.auth", "false"); javaMailSender.setUsername(null); javaMailSender.setPassword(null); } - break; + break;*/ default: break; } From 801e07da1a860631468d94030b50520045fcf602 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 28 Jan 2021 14:10:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E7=94=A8=E4=BE=8Btag=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../track/plan/view/comonents/api/RelevanceScenarioList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue index b762b58922..976e6d1ef3 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue @@ -20,7 +20,7 @@ From 05f543cb51a305a7f9b29ead63b11a926a7724c1 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Thu, 28 Jan 2021 14:23:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8E=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?-=E6=98=BE=E7=A4=BA=E8=AE=BE=E7=BD=AE=E5=92=8C=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E8=AE=BE=E7=BD=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/commons/utils/ShiroUtils.java | 1 + frontend/src/login/Login.vue | 243 +++++++++--------- 2 files changed, 125 insertions(+), 119 deletions(-) diff --git a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java index f6f8fd71ca..27430e98ae 100644 --- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java +++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java @@ -28,6 +28,7 @@ public class ShiroUtils { filterChainDefinitionMap.put("/authsource/list/allenable", "anon"); filterChainDefinitionMap.put("/sso/signin", "anon"); filterChainDefinitionMap.put("/sso/callback", "anon"); + filterChainDefinitionMap.put("/license/valid", "anon"); // for swagger filterChainDefinitionMap.put("/swagger-ui.html", "anon"); diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue index 666462ea7e..c121db1877 100644 --- a/frontend/src/login/Login.vue +++ b/frontend/src/login/Login.vue @@ -3,45 +3,45 @@ -
-
- -
-
- Metersphere - {{ $t('commons.welcome') }} -
+
+
+
+
+ Metersphere + {{ $t('commons.welcome') }} +
+
-
-
- - - - LDAP - 普通登录 - {{ auth.type }} {{ auth.name }} - - - - - - - - - -
-
- - {{ $t('commons.login') }} - -
-
- {{ msg }} -
+
+
+ + + + LDAP + 普通登录 + {{ auth.type }} {{ auth.name }} + + + + + + + + +
+
+ + {{ $t('commons.login') }} + +
+
+ {{ msg }} +
+
@@ -62,6 +62,7 @@ import {DEFAULT_LANGUAGE} from "@/common/js/constants"; const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/); const display = requireComponent.keys().length > 0 ? requireComponent("./display/Display.vue") : {}; const auth = requireComponent.keys().length > 0 ? requireComponent("./auth/Auth.vue") : {}; +const license = requireComponent.keys().length > 0 ? requireComponent("./license/LicenseMessage.vue") : null; export default { name: "Login", @@ -117,6 +118,10 @@ export default { created: function () { // 主页添加键盘事件,注意,不能直接在焦点事件上添加回车 document.addEventListener("keydown", this.watchEnter); + // + if (license.default) { + license.default.valid(this) + } }, destroyed() { @@ -182,106 +187,106 @@ export default {