'commit'

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

@@ -116,10 +116,11 @@ public class WebLoginController extends Controller {
 
     /**
      * WEB登出
+     *
+     * @param redirect_url 接入的系统回调地址
      */
-    public void logout() {
+    public void logout(String redirect_url) {
         SsoLoginHelper.logout(getRequest(), getResponse());
-        String redirect_url = getRequest().getParameter("redirect_url");
         redirect(redirect_url);
     }
 
@@ -182,13 +183,12 @@ public class WebLoginController extends Controller {
         } else {
             resultJson.put("success", true);
             resultJson.put("sessionId", sessionId);
-            resultJson.put("personId", loginMap.get("person_id"));
+            resultJson.put("person_id", loginMap.get("person_id"));
-            resultJson.put("personName", loginMap.get("person_name"));
+            resultJson.put("person_name", loginMap.get("person_name"));
-            resultJson.put("bureauId", loginMap.get("bureau_id"));
+            resultJson.put("bureau_id", loginMap.get("bureau_id"));
-            resultJson.put("identityId", loginMap.get("identity_id"));
+            resultJson.put("identity_id", loginMap.get("identity_id"));
             resultJson.put("city_id", loginMap.get("city_id"));
             resultJson.put("area_id", loginMap.get("area_id"));
-            resultJson.put("mainPersonId", loginMap.get("main_person_id"));
         }
         renderJson(resultJson);
     }