From 2c02514fcff7b003ffb858c3b10bd1e828415499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E6=9C=AC=E4=BC=9F?= <wangiegie@163.com>
Date: Mon, 11 Apr 2022 17:36:02 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20cl?=
 =?UTF-8?q?ose=20#3794=20=E3=80=90=E6=96=B0=E9=9C=80=E6=B1=82=E3=80=91?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=94=99=E8=AF=AF=E6=AC=A1=E6=95=B0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E8=BF=9E=E7=BB=AD=E7=99=BB=E5=BD=95=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=94=81=E5=AE=9A=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/AuthenticationFailureEventListener.java       | 7 +++++--
 .../listener/AuthenticationSuccessEventListener.java       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java
index 79e11ea69..d3c21c409 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java
@@ -17,6 +17,7 @@
 
 package com.pig4cloud.pigx.common.security.listener;
 
+import cn.hutool.core.collection.CollUtil;
 import com.pig4cloud.pigx.common.security.handler.AuthenticationFailureHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
@@ -60,8 +61,10 @@ public class AuthenticationFailureEventListener implements ApplicationListener<A
 		Authentication authentication = (Authentication) event.getSource();
 
 		// 调用自定义业务链实现
-		failureHandlerList.forEach(
-				failureHandler -> failureHandler.handle(authenticationException, authentication, request, response));
+		if (CollUtil.isNotEmpty(failureHandlerList)) {
+			failureHandlerList.forEach(failureHandler -> failureHandler.handle(authenticationException, authentication,
+					request, response));
+		}
 	}
 
 }
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java
index 85962a21c..4e949624c 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java
@@ -47,7 +47,7 @@ public class AuthenticationSuccessEventListener implements ApplicationListener<A
 	@Override
 	public void onApplicationEvent(AuthenticationSuccessEvent event) {
 		Authentication authentication = (Authentication) event.getSource();
-		if (isUserAuthentication(authentication)) {
+		if (CollUtil.isNotEmpty(successHandlerList) && isUserAuthentication(authentication)) {
 			ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder
 					.getRequestAttributes();
 			HttpServletRequest request = requestAttributes.getRequest();