diff --git a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java index 152e98d..6411c72 100644 --- a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java +++ b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java @@ -34,20 +34,19 @@ public class WebLoginController extends Controller { } /** - * 登录跳转 + * 接入统一认证的系统,跳转到统一认证的地址 */ - public void login() { + public void login(String redirect_url) { Map loginMap = SsoLoginHelper.loginCheck(getRequest()); - String redirectUrl = getRequest().getParameter("redirect_url"); if (loginMap != null) { - if (!redirectUrl.contains("?")) { - redirect301(redirectUrl + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); + if (!redirect_url.contains("?")) { + redirect301(redirect_url + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); } else { - redirect301(redirectUrl + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); + redirect301(redirect_url + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); } } else { - redirectUrl = CommonUtil.handleRedirectUrlParas(redirectUrl); - redirect("/html/login.html?redirect_url=" + redirectUrl); + redirect_url = CommonUtil.handleRedirectUrlParas(redirect_url); + redirect("/html/login.html?redirect_url=" + redirect_url); } } diff --git a/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java index d619285..59e2ea1 100644 --- a/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java +++ b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java @@ -2,6 +2,8 @@ package com.dsideal.sso.Util; import com.jfinal.kit.PropKit; import com.jfinal.plugin.redis.Redis; + +import java.util.List; import java.util.Map; public class SsoLoginStore {