Merge branch 'script_gj' into 'master'

优化日志存储:class net.sf.json.JSONNull无法存储

See merge request !1190
This commit is contained in:
2025-11-16 10:04:50 +08:00
@@ -1,6 +1,7 @@
package com.fangjia.open.interceptors;
import com.fangjia.core.util.AnalyticsUtil;
import com.fangjia.core.util.JsonUtils;
import com.fangjia.dal.mongo.open.model.OpenResource;
import com.fangjia.dal.mongo.tool.model.OpenUriLog;
import com.fangjia.dal.sql.model.ApiUser;
@@ -12,6 +13,8 @@ import com.fangjia.open.model.BasicModel;
import com.fangjia.open.model.RestfulModelAndView;
import com.fangjia.service.open.OpenResourceService;
import com.fangjia.service.open.OpenUriLogService;
import com.fasterxml.jackson.databind.ObjectMapper;
import net.sf.json.JSONNull;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
import net.sf.json.processors.JsonValueProcessor;
@@ -22,17 +25,13 @@ import org.sothis.web.mvc.ActionContext;
import org.sothis.web.mvc.ActionInvocation;
import org.sothis.web.mvc.ActionInvocationException;
import org.sothis.web.mvc.Interceptor;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
/**
* API审计日志监控器
*
@@ -116,7 +115,6 @@ public class AuditInterceptor implements Interceptor {
}
return params;
}
/**
* @param request
* @param apiUser
@@ -163,7 +161,7 @@ public class AuditInterceptor implements Interceptor {
if(isSaveResult(request)){
JSONObject json = JSONObject.fromObject(result, DEFAULT_JSON_CONFIG);
json.remove("tid");
openUriLog.setResMap(json);
openUriLog.setResMap((Map<String, Object>)JsonUtils.convertJsonToJavaObj(json, Map.class));
}
} catch (Exception e) {
LOGGER.error("", e);