Skip to content

T
tax-sys-nacos
Commit 775b3661 by ddx
Options

清除cache修改

parent d6ce64e1
Showing with 18 additions and 42 deletions
tax-token/token-common/src/main/java/com/tax/token/utils/CleanCookieUtil.java
...@@ -35,19 +35,22 @@ public class CleanCookieUtil { ...@@ -35,19 +35,22 @@ public class CleanCookieUtil {
json.put("site", cookieReq.getSite()); json.put("site", cookieReq.getSite());
} }
} else { } else {
JSONArray jsonArray = new JSONArray(); if(StringUtil.isNotEmpty(cookieReq.getUserInfo())) {
if (type.equals("3")) { JSONArray jsonArray = new JSONArray();
jsonArray.add(cookieReq.getZoneCode() + ":" + cookieReq.getUserInfo()); if (type.equals("3")) {
jsonArray.add(cookieReq.getZoneCode() + ":" + cookieReq.getUserInfo());
} else {
jsonArray.add(cookieReq.getZoneCode() + ":" + taxno + ":" + cookieReq.getUserInfo());
}
json.put("keyList", jsonArray);
} else { } else {
jsonArray.add(cookieReq.getZoneCode() + ":" + taxno + ":" + cookieReq.getUserInfo()); if(null!=cookieReq.getUserInfoJson()) {
JSONObject loginInfoJson = JSON.parseObject(JSON.toJSONString(cookieReq.getUserInfoJson()));
loginInfoJson.put("taxno", cookieReq.getTaxno());
loginInfoJson.put("dqdm", cookieReq.getZoneCode());
json.put("loginInfoJson", loginInfoJson);
}
} }
json.put("keyList", jsonArray);
}
if(null!=cookieReq.getUserInfoJson()) {
JSONObject loginInfoJson = JSON.parseObject(JSON.toJSONString(cookieReq.getUserInfoJson()));
loginInfoJson.put("taxno", cookieReq.getTaxno());
loginInfoJson.put("dqdm", cookieReq.getZoneCode());
json.put("loginInfoJson", loginInfoJson);
} }
String url = TokenConstants.CLEAN_COOKIE_URL; String url = TokenConstants.CLEAN_COOKIE_URL;
logger.info(uuIdFlag + " cleanCookie taxno is " + taxno + " url is " + url + ",param is " + json.toString()); logger.info(uuIdFlag + " cleanCookie taxno is " + taxno + " url is " + url + ",param is " + json.toString());
......
tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java
...@@ -914,35 +914,6 @@ public class TkTokenServiceImpl implements TkTokenService { ...@@ -914,35 +914,6 @@ public class TkTokenServiceImpl implements TkTokenService {
} else { } else {
try { try {
String newUserInfo = ""; String newUserInfo = "";
if(null != cookieReq.getUserInfoJson()) {
JSONObject loginInfoJson = JSON.parseObject(JSON.toJSONString(cookieReq.getUserInfoJson()));
TaxUserInfo bean;
String loginType = "";
if (loginInfoJson.containsKey("loginType")) {
loginType = loginInfoJson.getString("loginType");
}
if ("b".equals(loginType)) {
bean = new TaxUserInfo();
if (loginInfoJson.containsKey("password")) {
bean.setPassword(loginInfoJson.getString("password"));
}
if (loginInfoJson.containsKey("username")) {
bean.setUsername(loginInfoJson.getString("username"));
}
if (loginInfoJson.containsKey("phone")) {
bean.setPhone(loginInfoJson.getString("phone"));
}
if (loginInfoJson.containsKey("userType")) {
bean.setUserType(loginInfoJson.getString("userType"));
}
bean.setLoginType("b");
newUserInfo= bean.toString();
} else {
newUserInfo = JSON.parseObject(JSON.toJSONString(cookieReq.getUserInfoJson()), TaxUserInfo.class).toString();
}
logger.info(uuId + " cleanCookie taxno is " + taxno + ", userInfoJson newUserInfo is " + newUserInfo);
}
//CookieInfo优先级高于UserInfo
if(null != cookieReq.getCookieInfoJson()) { if(null != cookieReq.getCookieInfoJson()) {
JSONObject cookieInfoJson = JSON.parseObject(JSON.toJSONString(cookieReq.getCookieInfoJson())); JSONObject cookieInfoJson = JSON.parseObject(JSON.toJSONString(cookieReq.getCookieInfoJson()));
if (cookieInfoJson.containsKey("cookie")) { if (cookieInfoJson.containsKey("cookie")) {
...@@ -960,10 +931,12 @@ public class TkTokenServiceImpl implements TkTokenService { ...@@ -960,10 +931,12 @@ public class TkTokenServiceImpl implements TkTokenService {
} }
logger.info(uuId + " cleanCookie taxno is " + taxno + ", cookieInfoJson newUserInfo is " + newUserInfo); logger.info(uuId + " cleanCookie taxno is " + taxno + ", cookieInfoJson newUserInfo is " + newUserInfo);
} }
if(StringUtil.isEmpty(newUserInfo)) { if(null == cookieReq.getUserInfoJson() && StringUtil.isEmpty(newUserInfo)) {
result.errorResponse(ResultEnum.param_error); result.errorResponse(ResultEnum.param_error);
} else { } else {
cookieReq.setUserInfo(MD5Util.MD5Encode(newUserInfo)); if(StringUtil.isNotEmpty(newUserInfo)) {
cookieReq.setUserInfo(MD5Util.MD5Encode(newUserInfo));
}
if(!tkUser.getDefaultCleanType().equals("9")) { if(!tkUser.getDefaultCleanType().equals("9")) {
resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, tkUser.getDefaultCleanType()); resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, tkUser.getDefaultCleanType());
if (!(resMap!=null && "0".equals(resMap.getCode()))) { if (!(resMap!=null && "0".equals(resMap.getCode()))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment