'commit'

dsSso/src/main/java/com/dsideal/Sso/Controller/AppLoginController.java

@@ -33,19 +33,26 @@ public class AppLoginController extends Controller {
             resultJson.put("msg", "用户名或密码错误！");
             renderJson(resultJson);
         }
-
         String sessionId = UUID.randomUUID().toString();
-
         SsoLoginHelper.login(sessionId, loginMap);
-
         resultJson.put("success", true);
         resultJson.put("sessionId", sessionId);
-        resultJson.put("personId", loginMap.get("person_id").toString());
-        resultJson.put("personName", loginMap.get("person_name").toString());
-        resultJson.put("bureauId", loginMap.get("bureau_id").toString());
-        resultJson.put("identityId", loginMap.get("identity_id").toString());
+        if (loginMap != null) {
+            resultJson.put("personId", loginMap.get("person_id").toString());
+        }
+        if (loginMap != null) {
+            resultJson.put("personName", loginMap.get("person_name").toString());
+        }
+        if (loginMap != null) {
+            resultJson.put("bureauId", loginMap.get("bureau_id").toString());
+        }
+        if (loginMap != null) {
+            resultJson.put("identityId", loginMap.get("identity_id").toString());
+        }
         //记录人员登录日志
-        LoginLogUtil.WriteLoginLog(loginMap.get("identity_id").toString(), loginMap.get("person_id").toString(), LoginLogUtil.getIpAddr(getRequest()));
+        if (loginMap != null) {
+            LoginLogUtil.WriteLoginLog(loginMap.get("identity_id").toString(), loginMap.get("person_id").toString(), LoginLogUtil.getIpAddr(getRequest()));
+        }
         renderJson(resultJson);
     }
 

dsSso/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java

@@ -15,8 +15,6 @@ import com.dsideal.Sso.Util.*;
 import com.jfinal.aop.Before;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
-import com.jfinal.kit.Kv;
-import com.jfinal.kit.StrKit;
 import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
@@ -34,25 +32,18 @@ public class WebLoginController extends Controller {
      * 登录
      */
     @Before(GET.class)
-    public void login() {
+    @EmptyInterface({"redirect_url"})
+    public void login(String redirect_url) {
         Map<String, String> 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"));
+            if (!redirect_url.contains("?")) {
+                redirect301(redirect_url + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id"));
             } else {
-                redirect301(redirectUrl + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id"));
+                redirect301(redirect_url + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id"));
             }
         } else {
-            if (StrKit.isBlank(redirectUrl)) {
-                Kv kv = new Kv();
-                kv.set("success", false);
-                kv.set("message", "参数redirectUrl回调为空，请检查后再试。");
-                renderJson(kv);
-                return;
-            }
-            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);
         }
     }