From 31567a1fb97e622d68d2fa09498129548ca0ec2a Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 2 Nov 2020 14:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BC=83=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../events/AuthorizationFailedEvent.java | 20 +------------------ .../basic/web/AuthorizationController.java | 3 +-- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/events/AuthorizationFailedEvent.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/events/AuthorizationFailedEvent.java index 428988548..770f97182 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/events/AuthorizationFailedEvent.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/events/AuthorizationFailedEvent.java @@ -28,11 +28,6 @@ import java.util.function.Function; public class AuthorizationFailedEvent extends AbstractAuthorizationEvent { private static final long serialVersionUID = -101792832265740828L; - /** - * 失败原因 - */ - @Deprecated//已弃用,请根据exception判断 - private Reason reason; /** * 异常信息 @@ -41,10 +36,8 @@ public class AuthorizationFailedEvent extends AbstractAuthorizationEvent { public AuthorizationFailedEvent(String username, String password, - Function parameterGetter, - Reason reason) { + Function parameterGetter) { super(username, password, parameterGetter); - this.reason = reason; } public Throwable getException() { @@ -55,15 +48,4 @@ public class AuthorizationFailedEvent extends AbstractAuthorizationEvent { this.exception = exception; } - public Reason getReason() { - return reason; - } - - @Deprecated//已弃用,请根据exception判断 - public enum Reason { - PASSWORD_ERROR, - USER_DISABLED, - USER_NOT_EXISTS, - OTHER - } } diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/AuthorizationController.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/AuthorizationController.java index 472b074be..08d60df20 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/AuthorizationController.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/AuthorizationController.java @@ -87,7 +87,6 @@ public class AuthorizationController { Assert.hasLength(username_, "用户名不能为空"); Assert.hasLength(password_, "密码不能为空"); - AuthorizationFailedEvent.Reason reason = AuthorizationFailedEvent.Reason.OTHER; Function parameterGetter = parameters::get; return Mono.defer(() -> { AuthorizationDecodeEvent decodeEvent = new AuthorizationDecodeEvent(username_, password_, parameterGetter); @@ -112,7 +111,7 @@ public class AuthorizationController { })); })); }).onErrorResume(err -> { - AuthorizationFailedEvent failedEvent = new AuthorizationFailedEvent(username_, password_, parameterGetter, reason); + AuthorizationFailedEvent failedEvent = new AuthorizationFailedEvent(username_, password_, parameterGetter); failedEvent.setException(err); return failedEvent .publish(eventPublisher)