diff --git a/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java b/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java index 08d51a49..462d1f55 100644 --- a/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java +++ b/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java @@ -37,14 +37,13 @@ public class IsLoginInterceptor implements Interceptor { //1、读取cookie,获取所有本域下的配置值 boolean isTrue; if ((con.getCookie("person_id") == null) || (con.getCookie("bureau_id") == null) || - (con.getCookie("identity_id") == null || (con.getCookie("org_code") == null))) { + (con.getCookie("identity_id") == null )) { isTrue = false; } else { Map loginMap = new HashMap(); loginMap.put("identity_id", con.getCookie("identity_id")); loginMap.put("person_id", con.getCookie("person_id")); loginMap.put("bureau_id", con.getCookie("bureau_id")); - loginMap.put("org_code", con.getCookie("org_code")); //2、根据cookie中获取到的map,得到一个 share String token = CommonUtil.Sign(loginMap, BaseApplication.PropKit.get("jwt.CookieMd5SingPwd")); //3、与cookie中的token进行对比 @@ -55,7 +54,6 @@ public class IsLoginInterceptor implements Interceptor { con.setCookie("bureau_id", null, 0, true); con.setCookie("identity_id", null, 0, true); con.setCookie("person_id", null, 0, true); - con.setCookie("org_code", null, 0, true); con.setCookie("token", null, 0, true); isTrue = false; } diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java index 32c1cd0f..27b5d188 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java @@ -94,13 +94,11 @@ public class LoginPersonController extends Controller { _map.put("identity_id", loginMap.get("identity_id")); _map.put("person_id", loginMap.get("person_id")); _map.put("bureau_id", loginMap.get("bureau_id")); - _map.put("org_code", loginMap.get("org_code")); String token = CommonUtil.Sign(_map, BaseApplication.PropKit.get("jwt.CookieMd5SingPwd")); CookieUtil.set(getResponse(), "identity_id", loginMap.get("identity_id").toString(), false, true); CookieUtil.set(getResponse(), "person_id", loginMap.get("person_id").toString(), false, true); CookieUtil.set(getResponse(), "bureau_id", loginMap.get("bureau_id").toString(), false, true); - CookieUtil.set(getResponse(), "org_code", loginMap.get("org_code").toString(), false, true); CookieUtil.set(getResponse(), "token", token, false, true); resultJson.put("success", true); @@ -108,7 +106,6 @@ public class LoginPersonController extends Controller { resultJson.put("person_id", loginMap.get("person_id").toString()); resultJson.put("bureau_id", loginMap.get("bureau_id").toString()); resultJson.put("person_name", loginMap.get("person_name").toString()); - resultJson.put("org_code", loginMap.get("org_code").toString()); //根据人员id,获取所有单位信息 Record r = bm.getBureauInfoByPersonId(loginMap.get("person_id").toString()); if (r != null) resultJson.put("bureau_name", r.getStr("bureau_name")); @@ -126,7 +123,6 @@ public class LoginPersonController extends Controller { CookieUtil.remove(getRequest(), getResponse(), "identity_id"); CookieUtil.remove(getRequest(), getResponse(), "person_id"); CookieUtil.remove(getRequest(), getResponse(), "bureau_id"); - CookieUtil.remove(getRequest(), getResponse(), "org_code"); CookieUtil.remove(getRequest(), getResponse(), "token"); redirect("/html/login.html"); }