增加清理cookie的log记录

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

+package com.tax.token.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ProjectName: tax-sys-nacos
+ * @Package: com.tax.token.model
+ * @ClassName: CleanCookieVo
+ * @Author: ddx
+ * @Description:
+ * @Date: 2024-12-12 10:15
+ * @Version: 1.0
+ */
+@Getter
+@Setter
+public class CleanCookieVo {
+
+    private String code;
+    private String message;
+    private String requestContext;
+    private String responseContext;
+
+}

tax-token/token-common/src/main/java/com/tax/token/utils/CleanCookieUtil.java

@@ -3,6 +3,7 @@ package com.tax.token.utils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.tax.token.constants.TokenConstants;
+import com.tax.token.model.CleanCookieVo;
 import com.tax.token.model.CookieReq;
 import com.yxcheng.token.utils.*;
 import org.apache.commons.lang.StringUtils;
@@ -18,8 +19,8 @@ public class CleanCookieUtil {
 
     private static final Logger logger = LoggerFactory.getLogger(CleanCookieUtil.class);
 
-    public static Map<String, Object> cleanCookie(String uuIdFlag, CookieReq cookieReq, String type)  throws IOException, HttpException {
-        Map<String,Object> resultMap = new HashMap<>();
+    public static CleanCookieVo cleanCookie(String uuIdFlag, CookieReq cookieReq, String type)  throws IOException, HttpException {
+        CleanCookieVo cleanCookieVo = new CleanCookieVo();
         String taxno = cookieReq.getTaxno();
         JSONObject json = new JSONObject();
         json.put("userCode", cookieReq.getUserCode());
@@ -43,16 +44,20 @@ public class CleanCookieUtil {
         }
 
         String url = TokenConstants.CLEAN_COOKIE_URL;
-        logger.info(uuIdFlag + " taxno is " + taxno + " url is " + url + ",param is " + json.toString());
+        logger.info(uuIdFlag + " cleanCookie taxno is " + taxno + " url is " + url + ",param is " + json.toString());
+        cleanCookieVo.setRequestContext(json.toString());
+        
         ResponseContent ret = HttpHelper.postJsonEntity(url,json.toString());
         String resultStr = ret.getContent();
-        logger.info(uuIdFlag + " taxno is " + taxno + ",result is " + resultStr);
+
+        cleanCookieVo.setResponseContext(resultStr);
+        logger.info(uuIdFlag + " cleanCookie taxno is " + taxno + ",result is " + resultStr);
         if(StringUtils.isNotEmpty(resultStr)) {
             Map<String, Object> resultStrMap = JSONHelper.parserToMap(resultStr);
-            resultMap.put("code", ObjectUtil.fixNull(resultStrMap.get("code")));
-            resultMap.put("message", ObjectUtil.fixNull(resultStrMap.get("message")));
+            cleanCookieVo.setCode(ObjectUtil.fixNull(resultStrMap.get("code")));
+            cleanCookieVo.setMessage(ObjectUtil.fixNull(resultStrMap.get("message")));
         }
-        return resultMap;
+        return cleanCookieVo;
     }
 
 }

tax-token/token-service/src/main/java/com/tax/token/service/api/TkRealTokenLogService.java

 package com.tax.token.service.api;
 
+import com.tax.token.model.CleanCookieVo;
+import com.tax.token.model.CookieReq;
 import com.tax.token.model.TkToken;
+import com.yxcheng.token.common.model.JsonResult;
+
+import java.util.Date;
 
 public interface TkRealTokenLogService {
 
     void saveRealTokenLog(String uuId, TkToken token, String tokenFrom);
+    void saveRealTokenLog(String uuId, Date reqDate, CleanCookieVo cleanCookieVo, CookieReq cookieReq, JsonResult result);
 }

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

@@ -2,9 +2,12 @@ package com.tax.token.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.tax.token.mapper.TkRealTokenLogMapper;
+import com.tax.token.model.CleanCookieVo;
+import com.tax.token.model.CookieReq;
 import com.tax.token.model.TkRealTokenLog;
 import com.tax.token.model.TkToken;
 import com.tax.token.service.api.TkRealTokenLogService;
+import com.yxcheng.token.common.model.JsonResult;
 import com.yxcheng.token.utils.DateUtils;
 import com.yxcheng.token.utils.StringUtil;
 import org.slf4j.Logger;
@@ -14,6 +17,8 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+
 @Transactional
 @Component
 @ComponentScan(basePackages = {"com.tax.token.dao", "com.tax.token.integration"})
@@ -56,4 +61,36 @@ public class TkRealTokenLogServiceImpl implements TkRealTokenLogService {
             logger.error(uuId + " saveRealTokenLog is error! " + e.getMessage());
         }
     }
+
+    @Override
+    public void saveRealTokenLog(String uuId, Date reqDate, CleanCookieVo cleanCookieVo, CookieReq cookieReq, JsonResult result) {
+        try {
+            TkRealTokenLog tokenLog = new TkRealTokenLog();
+            tokenLog.setTaxno(cookieReq.getTaxno());
+            tokenLog.setReqDate(reqDate);
+            if(null!=cookieReq.getUserInfoJson()) {
+                tokenLog.setSecert(JSON.toJSONString(cookieReq.getUserInfoJson()));
+            }
+            tokenLog.setUserCode(cookieReq.getUserCode());
+            tokenLog.setZoneCode(cookieReq.getZoneCode());
+            tokenLog.setResContext(StringUtil.getShortLog(JSON.toJSONString(result), 3000));
+
+            if(null != cleanCookieVo) {
+                tokenLog.setToken(cleanCookieVo.getRequestContext());
+                if(StringUtil.isNotEmpty(cleanCookieVo.getResponseContext())) {
+                    tokenLog.setResContext(StringUtil.getShortLog(cleanCookieVo.getResponseContext(), 3000));
+                }
+            }
+            tokenLog.setIsValid(cookieReq.getCheckType());
+            tokenLog.setIpServerNo(cookieReq.getTarget());
+            tokenLog.setKeyCode(cookieReq.getSite());
+            tokenLog.setResDate(DateUtils.getDate());
+            tokenLog.setLostTime(DateUtils.getMillSecondsDiff(tokenLog.getReqDate(),tokenLog.getResDate()));
+            tokenLog.setTimeFlag(uuId);
+            realTokenLogMapper.insertSelective(tokenLog);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error(uuId + " saveRealTokenLog is error! " + e.getMessage());
+        }
+    }
 }

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

@@ -668,7 +668,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                     cookieReq.setUserCode(userCode);
                     cookieReq.setZoneCode(updateEntity.getZoneCode());
                     cookieReq.setTaxno(taxno);
-                    Map<String, Object> cleanMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, "10");
+                    CleanCookieVo cleanMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, "10");
                     logger.info(uuId + " insertToken taxno is " + taxno + " cleanCookie result is " + JSON.toJSONString(cleanMap));
                 }
             } else {
@@ -871,6 +871,8 @@ public class TkTokenServiceImpl implements TkTokenService {
         JsonResult result = new JsonResult();
         String taxno = cookieReq.getTaxno();
         String userCode = cookieReq.getUserCode();
+        Date reqDate = DateUtils.getDate();
+        CleanCookieVo resMap = null;
 
         TkUser tkUser = tkUserService.getUserByUserCode(userCode, TokenConstants.FUNCTION_NO_FPY);
         if(tkUser == null){
@@ -922,13 +924,11 @@ public class TkTokenServiceImpl implements TkTokenService {
                 } else {
                     cookieReq.setUserInfo(MD5Util.MD5Encode(newUserInfo));
                     if(!tkUser.getDefaultCleanType().equals("9")) {
-                        Map<String, Object> resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, tkUser.getDefaultCleanType());
-                        if (!TokenThirdServiceFactory.isSuccess(resMap)) {
-                            String resMessage = (String)resMap.get("message");
-                            if(StringUtil.isNotEmpty(resMessage)) {
-                                result.setMessage(resMessage);
-                            } else {
-                                result.errorResponse(ResultEnum.flush_error);
+                        resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, tkUser.getDefaultCleanType());
+                        if (!(resMap!=null &&  "0".equals(resMap.getCode()))) {
+                            result.errorResponse(ResultEnum.flush_error);
+                            if(StringUtil.isNotEmpty(resMap.getMessage())) {
+                                result.setMessage(resMap.getMessage());
                             }
                         }
                     }
@@ -940,6 +940,7 @@ public class TkTokenServiceImpl implements TkTokenService {
             }
         }
         logger.info(uuId + " cleanCookie taxno is " + taxno + ", result is " + result);
+        tkRealTokenLogService.saveRealTokenLog(uuId, reqDate, resMap, cookieReq, result);
         return result;
     }
 
@@ -951,13 +952,11 @@ public class TkTokenServiceImpl implements TkTokenService {
             logger.info(uuId + " cleanGroupCookie userInfo is " + userInfo + " to " + userName);
             if(StringUtil.isNotEmpty(userName)){
                 cookieReq.setUserInfo(userName);
-                Map<String, Object> resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, "3");
-                if (!TokenThirdServiceFactory.isSuccess(resMap)) {
-                    String resMessage = (String)resMap.get("message");
-                    if(StringUtil.isNotEmpty(resMessage)) {
-                        result.setMessage(resMessage);
-                    } else {
-                        result.errorResponse(ResultEnum.flush_error);
+                CleanCookieVo resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, "3");
+                if (!(resMap!=null &&  "0".equals(resMap.getCode()))) {
+                    result.errorResponse(ResultEnum.flush_error);
+                    if(StringUtil.isNotEmpty(resMap.getMessage())) {
+                        result.setMessage(resMap.getMessage());
                     }
                 }
             } else {
@@ -1031,13 +1030,11 @@ public class TkTokenServiceImpl implements TkTokenService {
         JsonResult result = new JsonResult();
         String taxno = cookieReq.getTaxno();
         try {
-            Map<String, Object> resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, "10");
-            if (!TokenThirdServiceFactory.isSuccess(resMap)) {
+            CleanCookieVo resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, "10");
+            if (!(resMap!=null &&  "0".equals(resMap.getCode()))) {
                 result.errorResponse(ResultEnum.flush_error);
-
-                String resMessage = (String)resMap.get("message");
-                if(StringUtil.isNotEmpty(resMessage)) {
-                    result.setMessage(resMessage);
+                if(StringUtil.isNotEmpty(resMap.getMessage())) {
+                    result.setMessage(resMap.getMessage());
                 }
             }
         } catch (Exception e) {