From e076b30635f3564ac188438dd5047383ed28eb1f Mon Sep 17 00:00:00 2001 From: lengleng Date: Wed, 3 Mar 2021 22:04:51 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=20|=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=97=A0=E7=94=A8=E5=8F=82=E6=95=B0=E9=81=BF=E5=85=8D?= =?UTF-8?q?NPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :zap: 优化 | 去掉无用参数避免NPE --- ...nantSavedRequestAwareAuthenticationSuccessHandler.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/TenantSavedRequestAwareAuthenticationSuccessHandler.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/TenantSavedRequestAwareAuthenticationSuccessHandler.java index 098bff18d..955dc334d 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/TenantSavedRequestAwareAuthenticationSuccessHandler.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/TenantSavedRequestAwareAuthenticationSuccessHandler.java @@ -6,7 +6,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import cn.hutool.core.util.StrUtil; import com.pig4cloud.pigx.common.core.util.KeyStrResolver; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import lombok.extern.slf4j.Slf4j; @@ -44,8 +43,7 @@ public class TenantSavedRequestAwareAuthenticationSuccessHandler extends SimpleU super.onAuthenticationSuccess(request, response, authentication); } - String targetUrlParameter = this.getTargetUrlParameter(); - if (isAlwaysUseDefaultTargetUrl() || StrUtil.isBlank(request.getParameter(targetUrlParameter))) { + if (isAlwaysUseDefaultTargetUrl()) { this.requestCache.removeRequest(request, response); super.onAuthenticationSuccess(request, response, authentication); } @@ -53,8 +51,8 @@ public class TenantSavedRequestAwareAuthenticationSuccessHandler extends SimpleU this.clearAuthenticationAttributes(request); // 增加租户信息 assert savedRequest != null; - String targetUrl = String.format(savedRequest.getRedirectUrl() + "&TENANT-ID=%s", - SpringContextHolder.getBean(KeyStrResolver.class).key()); + String targetUrl = savedRequest.getRedirectUrl() + "&TENANT-ID=" + + SpringContextHolder.getBean(KeyStrResolver.class).key(); this.getRedirectStrategy().sendRedirect(request, response, targetUrl); }