From 70920a9220a8cd11d95ea94ba1a9576b2b62625c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E5=85=AB?= <jiqi.tjq@alibaba-inc.com>
Date: Mon, 13 Jul 2020 19:46:11 +0800
Subject: [PATCH] [fix] fix the bug of aop web log for file upload

---
 pom.xml                                                    | 6 +++---
 .../github/kfcfans/powerjob/server/web/WebLogAspect.java   | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab2a2670..99022ea4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <version>1.0.0</version>
     <packaging>pom</packaging>
     <name>powerjob</name>
-    <url>https://github.com/KFCFans/OhMyScheduler</url>
+    <url>https://github.com/KFCFans/PowerJob</url>
     <description>Distributed scheduling and execution framework</description>
     <licenses>
         <license>
@@ -19,8 +19,8 @@
         </license>
     </licenses>
     <scm>
-        <url>https://github.com/KFCFans/OhMyScheduler</url>
-        <connection>https://github.com/KFCFans/OhMyScheduler.git</connection>
+        <url>https://github.com/KFCFans/PowerJob</url>
+        <connection>https://github.com/KFCFans/PowerJob.git</connection>
     </scm>
 
     <developers>
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java
index d8693f46..1b83499a 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java
@@ -8,9 +8,11 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -86,6 +88,11 @@ public class WebLogAspect {
             if (obj instanceof HttpServletRequest || obj instanceof HttpServletResponse) {
                 break;
             }
+            // FatJar
+            if (obj instanceof MultipartFile || obj instanceof Resource) {
+                break;
+            }
+
             objList.add(obj);
         }
         return JSONObject.toJSONString(objList);