From d98faaffee6627655bf584a79e968656012adf84 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 13 六月 2021 15:39:35 +0800
Subject: [PATCH] update 移除 fastjson 增加 jackson 工具类 重写相关业务
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 280a60c..d5c0fe8 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -2,11 +2,11 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessStatus;
import com.ruoyi.common.enums.HttpMethod;
+import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.web.service.AsyncService;
@@ -30,7 +30,6 @@
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -94,7 +93,7 @@
String ip = ServletUtils.getClientIP();
operLog.setOperIp(ip);
// 杩斿洖鍙傛暟
- operLog.setJsonResult(JSON.toJSONString(jsonResult));
+ operLog.setJsonResult(JsonUtils.toJsonString(jsonResult));
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
if (loginUser != null)
@@ -192,19 +191,16 @@
*/
private String argsArrayToString(Object[] paramsArray)
{
- String params = "";
+ StringBuilder params = new StringBuilder();
if (paramsArray != null && paramsArray.length > 0)
{
- for (int i = 0; i < paramsArray.length; i++)
- {
- if (Validator.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
- {
- Object jsonObj = JSON.toJSON(paramsArray[i]);
- params += jsonObj.toString() + " ";
- }
- }
+ for (Object o : paramsArray) {
+ if (Validator.isNotNull(o) && !isFilterObject(o)) {
+ params.append(JsonUtils.toJsonString(o)).append(" ");
+ }
+ }
}
- return params.trim();
+ return params.toString().trim();
}
/**
@@ -224,19 +220,17 @@
else if (Collection.class.isAssignableFrom(clazz))
{
Collection collection = (Collection) o;
- for (Iterator iter = collection.iterator(); iter.hasNext();)
- {
- return iter.next() instanceof MultipartFile;
- }
+ for (Object value : collection) {
+ return value instanceof MultipartFile;
+ }
}
else if (Map.class.isAssignableFrom(clazz))
{
Map map = (Map) o;
- for (Iterator iter = map.entrySet().iterator(); iter.hasNext();)
- {
- Map.Entry entry = (Map.Entry) iter.next();
- return entry.getValue() instanceof MultipartFile;
- }
+ for (Object value : map.entrySet()) {
+ Map.Entry entry = (Map.Entry) value;
+ return entry.getValue() instanceof MultipartFile;
+ }
}
return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
|| o instanceof BindingResult;
--
Gitblit v1.9.3