From 5e933119f3d51c73b84f30e2a6c3a93f75f71960 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 6 Jul 2024 10:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20=5F=5Furl=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/shiro/filter/FormFilter.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
index 9375c9cf..b86fa129 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
@@ -298,15 +298,10 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 		HttpServletRequest request = (HttpServletRequest)servletRequest;
 		// 登录成功后初始化授权信息并处理登录后的操作
 		authorizingRealm.onLoginSuccess(UserUtils.getLoginInfo(), request);
-		// 跳转到登录成功页面
-		String successUrl = getSuccessUrl(); // shiro.successUrl in application.yml
-		if (StringUtils.contains((request).getRequestURI(), "/oauth2/callback/")) {
-			successUrl = Global.getConfig("oauth2.successUrl", successUrl);
-		} else if (StringUtils.contains((request).getRequestURI(), "/sso")) {
-			String ssoSuccessUrl = (String)request.getAttribute("__url");
-			if (StringUtils.isNotBlank(ssoSuccessUrl)) {
-				successUrl = ssoSuccessUrl;
-			}
+		// 跳转到登录成功页面，若未指定则获取默认 shiro.successUrl in application.yml
+		String successUrl = (String)request.getAttribute("__url");
+		if (StringUtils.isBlank(successUrl)) {
+			successUrl = getSuccessUrl();
 		}
 		ServletUtils.redirectUrl(request, (HttpServletResponse)response, successUrl);
 		return false;