'commit'

src/main/java/com/dsideal/sso/Controller/AppLoginController.java

@@ -8,7 +8,6 @@ import com.dsideal.sso.Util.CommonUtil;
 import com.dsideal.sso.Util.SsoLoginHelper;
 import com.jfinal.aop.Before;
 import com.jfinal.ext.interceptor.POST;
-import com.jfinal.kit.StrKit;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.core.Controller;
 
@@ -30,60 +29,21 @@ 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);
         if (loginMap != null) {
-            resultJson.put("personId", loginMap.get("person_id"));
+            resultJson.put("identity_id", loginMap.get("identity_id"));
         }
         if (loginMap != null) {
-            resultJson.put("personName", loginMap.get("person_name"));
+            resultJson.put("person_id", loginMap.get("person_id"));
         }
         if (loginMap != null) {
-            resultJson.put("bureauId", loginMap.get("bureau_id"));
+            resultJson.put("person_name", loginMap.get("person_name"));
         }
         if (loginMap != null) {
-            resultJson.put("identityId", loginMap.get("identity_id"));
-        }
-        renderJson(resultJson);
-    }
-
-    /**
-     * 功能：登录检查
-     */
-    public void loginCheck() {
-        JSONObject resultJson = new JSONObject();
-        boolean flag = true;
-        if (flag) {
-            String sessionId = getPara("sessionId");
-            if (!sessionId.equals("null") && sessionId != null && sessionId.length() != 0) {
-                Map loginMap = SsoLoginHelper.loginCheck(sessionId);
-                if (loginMap == null) {
-                    resultJson.put("success", false);
-                    resultJson.put("msg", "sessionId 已失效！");
-                } else {
-                    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());
-                    resultJson.put("city_id", loginMap.get("city_id").toString());
-                    resultJson.put("area_id", loginMap.get("area_id").toString());
-                    //loginType 1：正常登录  2：切换登录 	如果为切换登录main_person_id不能写-1
-                    String loginType = loginMap.get("login_type").toString();
-                    if (loginType.equals("1")) {
-                        resultJson.put("mainPersonId", loginMap.get("main_person_id").toString());
-                    } else {
-                        resultJson.put("mainPersonId", Login.dao.getMainAccountPersonIdByPersonId(loginMap.get("person_id").toString()));
-                    }
-                }
-            } else {
-                resultJson.put("success", false);
-                resultJson.put("msg", "sessionId 已失效！");
-            }
+            resultJson.put("bureau_id", loginMap.get("bureau_id"));
         }
         renderJson(resultJson);
     }