Ver código fonte

日志记录增加过滤多文件场景

RuoYi 5 anos atrás
pai
commit
2cde98a01b

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -812,7 +812,7 @@ public class ExcelUtil<T>
812
      */
812
      */
813
     private Object getValue(Object o, String name) throws Exception
813
     private Object getValue(Object o, String name) throws Exception
814
     {
814
     {
815
-        if (StringUtils.isNotEmpty(name))
815
+        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
816
         {
816
         {
817
             Class<?> clazz = o.getClass();
817
             Class<?> clazz = o.getClass();
818
             Field field = clazz.getDeclaredField(name);
818
             Field field = clazz.getDeclaredField(name);

+ 26 - 0
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

@@ -1,6 +1,9 @@
1
 package com.ruoyi.common.log.aspect;
1
 package com.ruoyi.common.log.aspect;
2
 
2
 
3
 import java.lang.reflect.Method;
3
 import java.lang.reflect.Method;
4
+import java.util.Collection;
5
+import java.util.Iterator;
6
+import java.util.Map;
4
 import javax.servlet.http.HttpServletRequest;
7
 import javax.servlet.http.HttpServletRequest;
5
 import javax.servlet.http.HttpServletResponse;
8
 import javax.servlet.http.HttpServletResponse;
6
 import org.aspectj.lang.JoinPoint;
9
 import org.aspectj.lang.JoinPoint;
@@ -209,8 +212,31 @@ public class LogAspect
209
      * @param o 对象信息。
212
      * @param o 对象信息。
210
      * @return 如果是需要过滤的对象,则返回true;否则返回false。
213
      * @return 如果是需要过滤的对象,则返回true;否则返回false。
211
      */
214
      */
215
+    @SuppressWarnings("rawtypes")
212
     public boolean isFilterObject(final Object o)
216
     public boolean isFilterObject(final Object o)
213
     {
217
     {
218
+        Class<?> clazz = o.getClass();
219
+        if (clazz.isArray())
220
+        {
221
+            return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
222
+        }
223
+        else if (Collection.class.isAssignableFrom(clazz))
224
+        {
225
+            Collection collection = (Collection) o;
226
+            for (Iterator iter = collection.iterator(); iter.hasNext();)
227
+            {
228
+                return iter.next() instanceof MultipartFile;
229
+            }
230
+        }
231
+        else if (Map.class.isAssignableFrom(clazz))
232
+        {
233
+            Map map = (Map) o;
234
+            for (Iterator iter = map.entrySet().iterator(); iter.hasNext();)
235
+            {
236
+                Map.Entry entry = (Map.Entry) iter.next();
237
+                return entry.getValue() instanceof MultipartFile;
238
+            }
239
+        }
214
         return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;
240
         return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;
215
     }
241
     }
216
 }
242
 }