From d4aced9886ecbba5d923a24a75d7449c29bde4b5 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Fri, 5 Nov 2021 11:58:34 +0800 Subject: [PATCH] fix --- .../org/maxkey/persistence/db/PasswordPolicyValidator.java | 4 ++-- .../resources/templates/views/authorize/cas_sso_submint.ftl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java b/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java index a8b089a07..4e97e1177 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java @@ -253,8 +253,8 @@ public class PasswordPolicyValidator { passwordPolicy.getDuration(), (intDuration > passwordPolicy.getDuration()) ); - //auto unlock attempts when intDuration > set Duration - if(intDuration > passwordPolicy.getDuration()) { + //auto unlock attempts when intDuration >= set Duration + if(intDuration >= passwordPolicy.getDuration()) { _logger.debug("resetAttempts ..."); resetAttempts(userInfo); }else { diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl index b6b1b2464..efab39ee6 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl @@ -9,7 +9,7 @@ srcUrl = srcUrl.substring(srcUrl.indexOf("#")); var callbackUrl = "${callbackUrl}"; if(srcUrl.indexOf("#") >-1 ){ - callbackUrl =callbackUrl.replace("?",srcUrl + "&"); + callbackUrl =callbackUrl + srcUrl; } window.top.location.href = callbackUrl; }