'commit'

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<Object, Object> loginMap = SsoLoginHelper.loginCheck(getRequest());
+        Map<String, Object> 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<Object, Object> loginMap = SsoLoginHelper.loginCheck(sessionId);
+        Map<String, Object> loginMap = SsoLoginHelper.loginCheck(sessionId);
         if (loginMap == null) {
             resultJson.put("success", false);
             resultJson.put("msg", "sessionId 已失效！");

src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java

@@ -9,7 +9,7 @@ import com.jfinal.kit.PropKit;
 
 public class SsoLoginHelper {
 
-    public static Map<Object, Object> loginCheck(HttpServletRequest request) {
+    public static Map<String, Object> 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<Object, Object> loginCheck(String sessionId) {
+    public static Map<String, Object> loginCheck(String sessionId) {
         if (sessionId != null && !sessionId.trim().isEmpty()) {
             return SsoLoginStore.get(sessionId);
         }

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<Object, Object> get(String sessionId) {
+    public static Map<String, Object> get(String sessionId) {
         String redisKey = redisKey(sessionId);
-        var x = Redis.use().hmget(redisKey);
+        Map<String, Object> x = Redis.use().hgetAll(redisKey);
         if (x != null) {
-            var q = (Map<Object, Object>) x;
+            x.put("session_id", sessionId);
-            q.put("session_id", sessionId);
+            return x;
-            return q;
         }
         return null;
     }