增加清除传cookie节点

tax-token/token-common/src/main/java/com/tax/token/model/CookieReq.java

@@ -19,6 +19,7 @@ public class CookieReq extends SafeModel implements MqMessage {
       private String site;
       private String target;
       private Object userInfoJson;
+      private Object cookieInfoJson;
 
       @Override
       public String toString() {
@@ -32,6 +33,7 @@ public class CookieReq extends SafeModel implements MqMessage {
                     ", site='" + site + '\'' +
                     ", target='" + target + '\'' +
                     ", userInfoJson=" + userInfoJson +
+                    ", cookieInfoJson=" + cookieInfoJson +
                     '}';
       }
 

tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java

@@ -936,18 +936,25 @@ public class TkTokenServiceImpl implements TkTokenService {
                     } else {
                         newUserInfo = JSON.parseObject(JSON.toJSONString(cookieReq.getUserInfoJson()), TaxUserInfo.class).toString();
                     }
-                    logger.info(uuId + " cleanCookie taxno is " + taxno + ", newUserInfo is " + newUserInfo);
-                } else {
-                    String oldUserInfo = cookieReq.getUserInfo();
-                    if (StringUtils.isNotEmpty(oldUserInfo)) {
-                        try {
-                            newUserInfo = new String(Base64Util.decode(oldUserInfo), "UTF-8");
-                            logger.info(uuId + " cleanCookie taxno is " + taxno + ", newUserInfo is " + newUserInfo);
-                        } catch (UnsupportedEncodingException e) {
-                            e.printStackTrace();
-                            logger.error(uuId + " cleanCookie taxno is " + taxno + " parse userInfo is error!" + e.getMessage());
+                    logger.info(uuId + " cleanCookie taxno is " + taxno + ", userInfoJson newUserInfo is " + newUserInfo);
+                }
+                //CookieInfo优先级高于UserInfo
+                if(null != cookieReq.getCookieInfoJson()) {
+                    JSONObject cookieInfoJson = JSON.parseObject(JSON.toJSONString(cookieReq.getCookieInfoJson()));
+                    if (cookieInfoJson.containsKey("cookie")) {
+                        String cookie = cookieInfoJson.getString("cookie");
+                        if(cookie.startsWith(EncryptUtil.FKEY)) {
+                            String cookieString = EncryptUtil.decryptAesCk(cookie);
+                            logger.info(uuId + " cleanCookie taxno is " + taxno + ", cookieString is " + cookieString);
+                            JSONObject cookieJson = JSON.parseObject(cookieString);
+                            if (cookieJson.containsKey("session")) {
+                                newUserInfo = cookieJson.getString("session");
+                            }
+                        } else if(cookieInfoJson.containsKey("session")) {
+                            newUserInfo = cookieInfoJson.getString("session");
                         }
                     }
+                    logger.info(uuId + " cleanCookie taxno is " + taxno + ", cookieInfoJson newUserInfo is " + newUserInfo);
                 }
                 if(StringUtil.isEmpty(newUserInfo)) {
                     result.errorResponse(ResultEnum.param_error);