From 1695aa136a89421b1cff75d672888e81d2a24d9a Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 29 八月 2023 18:30:23 +0800
Subject: [PATCH] bug

---
 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
index b764fec..9b060f6 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
@@ -1,6 +1,8 @@
 package com.ruoyi.common.log.aspect;
 
 import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.ip.IpUtils;
@@ -28,6 +30,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -174,7 +177,43 @@
                 && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)))
         {
             String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
-            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+            if(operLog.getOperContent().equals("编辑商户")){
+                // 将JSON字符串转换为Map
+                ObjectMapper objectMapper = new ObjectMapper();
+                Map<String, String> jsonMap = new HashMap<>();
+                try {
+                    jsonMap = objectMapper.readValue(params, HashMap.class);
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+                // 从Map中删除指定的元素
+                jsonMap.remove("shopDetail");
+                // 将Map转换回JSON字符串
+                try {
+                    params = objectMapper.writeValueAsString(jsonMap);
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+            }
+            if(operLog.getOperContent().equals("编辑商品")){
+                // 将JSON字符串转换为Map
+                ObjectMapper objectMapper = new ObjectMapper();
+                Map<String, String> jsonMap = new HashMap<>();
+                try {
+                    jsonMap = objectMapper.readValue(params, HashMap.class);
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+                // 从Map中删除指定的元素
+                jsonMap.remove("goodsDetail");
+                // 将Map转换回JSON字符串
+                try {
+                    params = objectMapper.writeValueAsString(jsonMap);
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+            }
+            operLog.setOperParam(StringUtils.substring(params, 0, 5000));
         }
         else
         {

--
Gitblit v1.7.1