From 53f6b6a4254b6b35de0c0f3bdb514369da4cbcbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=A1=E7=89=99=E7=9A=84=E5=B0=8F=E6=9C=8B=E5=8F=8B?= Date: Tue, 1 Jun 2021 08:58:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84JbootShiroInvokeListener=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当用户未登录时保存被拦截的请求，以便Shiro过滤器在用户登录成功后跳转至被拦截请求的原URL --- .../io/jboot/support/shiro/JbootShiroInvokeListener.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java b/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java index 890eb451..1ea3a9d6 100644 --- a/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java +++ b/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java @@ -20,6 +20,9 @@ import com.jfinal.core.Controller; import io.jboot.Jboot; import io.jboot.support.shiro.processer.AuthorizeResult; import io.jboot.utils.StrUtil; +import org.apache.shiro.web.util.WebUtils; + +import javax.servlet.http.HttpServletRequest; /** * @author Michael Yang 杨福海 （fuhai999@gmail.com） @@ -79,8 +82,11 @@ public interface JbootShiroInvokeListener { public void doProcessUnauthenticated(Controller controller) { if (StrUtil.isBlank(config.getLoginUrl())) { controller.renderError(401); - return; + return; } + HttpServletRequest request = controller.getRequest(); + //保存被拦截的请求 Shiro将在登录成功后跳转到原请求 + WebUtils.saveRequest(request); controller.redirect(config.getLoginUrl()); } -- Gitee From 3240a259b2fe8b10ae4784fdbd6e67635839f129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=A1=E7=89=99=E7=9A=84=E5=B0=8F=E6=9C=8B=E5=8F=8B?= Date: Tue, 1 Jun 2021 09:03:25 +0800 Subject: [PATCH 2/3] This reverts commit 53f6b6a4254b6b35de0c0f3bdb514369da4cbcbb. --- .../io/jboot/support/shiro/JbootShiroInvokeListener.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java b/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java index 1ea3a9d6..890eb451 100644 --- a/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java +++ b/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java @@ -20,9 +20,6 @@ import com.jfinal.core.Controller; import io.jboot.Jboot; import io.jboot.support.shiro.processer.AuthorizeResult; import io.jboot.utils.StrUtil; -import org.apache.shiro.web.util.WebUtils; - -import javax.servlet.http.HttpServletRequest; /** * @author Michael Yang 杨福海 （fuhai999@gmail.com） @@ -82,11 +79,8 @@ public interface JbootShiroInvokeListener { public void doProcessUnauthenticated(Controller controller) { if (StrUtil.isBlank(config.getLoginUrl())) { controller.renderError(401); - return; + return; } - HttpServletRequest request = controller.getRequest(); - //保存被拦截的请求 Shiro将在登录成功后跳转到原请求 - WebUtils.saveRequest(request); controller.redirect(config.getLoginUrl()); } -- Gitee From cc0916a5ec5e23a9577a67e1997de9d137bf1eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=A1=E7=89=99=E7=9A=84=E5=B0=8F=E6=9C=8B=E5=8F=8B?= Date: Tue, 1 Jun 2021 09:16:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84JbootShiroInvokeListener=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当用户未登录时保存被拦截的请求，以便Shiro过滤器在用户登录成功后跳转至被拦截请求的原URL --- .../io/jboot/support/shiro/JbootShiroInvokeListener.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java b/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java index 890eb451..b93931f1 100644 --- a/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java +++ b/src/main/java/io/jboot/support/shiro/JbootShiroInvokeListener.java @@ -20,6 +20,9 @@ import com.jfinal.core.Controller; import io.jboot.Jboot; import io.jboot.support.shiro.processer.AuthorizeResult; import io.jboot.utils.StrUtil; +import org.apache.shiro.web.util.WebUtils; + +import javax.servlet.http.HttpServletRequest; /** * @author Michael Yang 杨福海 （fuhai999@gmail.com） @@ -81,6 +84,9 @@ public interface JbootShiroInvokeListener { controller.renderError(401); return; } + HttpServletRequest request = controller.getRequest(); + //保存被拦截的请求 Shiro将在登录成功后跳转到原请求 + WebUtils.saveRequest(request); controller.redirect(config.getLoginUrl()); } -- Gitee