diff --git a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java index 6411c72..3b80461 100644 --- a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java +++ b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java @@ -37,7 +37,7 @@ public class WebLoginController extends Controller { * 接入统一认证的系统,跳转到统一认证的地址 */ public void login(String redirect_url) { - Map loginMap = SsoLoginHelper.loginCheck(getRequest()); + Map loginMap = SsoLoginHelper.loginCheck(getRequest()); if (loginMap != null) { if (!redirect_url.contains("?")) { redirect301(redirect_url + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); @@ -175,7 +175,7 @@ public class WebLoginController extends Controller { @EmptyInterface({"sessionId"}) public void loginCheck(String sessionId) { JSONObject resultJson = new JSONObject(); - Map loginMap = SsoLoginHelper.loginCheck(sessionId); + Map loginMap = SsoLoginHelper.loginCheck(sessionId); if (loginMap == null) { resultJson.put("success", false); resultJson.put("msg", "sessionId 已失效!"); diff --git a/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java b/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java index 4409e8b..006ba93 100644 --- a/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java +++ b/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java @@ -9,7 +9,7 @@ import com.jfinal.kit.PropKit; public class SsoLoginHelper { - public static Map loginCheck(HttpServletRequest request) { + public static Map loginCheck(HttpServletRequest request) { String cookieSessionId = getSessionIdByCookie(request); if (cookieSessionId != null && !cookieSessionId.trim().isEmpty()) { return loginCheck(cookieSessionId); @@ -17,7 +17,7 @@ public class SsoLoginHelper { return null; } - public static Map loginCheck(String sessionId) { + public static Map loginCheck(String sessionId) { if (sessionId != null && !sessionId.trim().isEmpty()) { return SsoLoginStore.get(sessionId); } diff --git a/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java index 59e2ea1..52a37bf 100644 --- a/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java +++ b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java @@ -7,13 +7,12 @@ import java.util.List; import java.util.Map; public class SsoLoginStore { - public static Map get(String sessionId) { + public static Map get(String sessionId) { String redisKey = redisKey(sessionId); - var x = Redis.use().hmget(redisKey); + Map x = Redis.use().hgetAll(redisKey); if (x != null) { - var q = (Map) x; - q.put("session_id", sessionId); - return q; + x.put("session_id", sessionId); + return x; } return null; } diff --git a/target/classes/com/dsideal/sso/Controller/WebLoginController.class b/target/classes/com/dsideal/sso/Controller/WebLoginController.class index 91cc2e5..36aa3be 100644 Binary files a/target/classes/com/dsideal/sso/Controller/WebLoginController.class and b/target/classes/com/dsideal/sso/Controller/WebLoginController.class differ diff --git a/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class b/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class index 15d61c6..d494d68 100644 Binary files a/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class and b/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class differ diff --git a/target/classes/com/dsideal/sso/Util/SsoLoginStore.class b/target/classes/com/dsideal/sso/Util/SsoLoginStore.class index 2e6fc81..6c87215 100644 Binary files a/target/classes/com/dsideal/sso/Util/SsoLoginStore.class and b/target/classes/com/dsideal/sso/Util/SsoLoginStore.class differ