From 5ece3a3d683717f287a3bfa998f10b856e2da014 Mon Sep 17 00:00:00 2001
From: zhuon <zhuonai@hotmail.com>
Date: Fri, 24 May 2019 10:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=9A=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0catch=E5=86=8Dthrow=20new=20Exception=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=83=A8=E5=88=86=E5=A0=86=E6=A0=88=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/handler/GlobalExceptionHandler.java         | 4 ++--
 .../src/main/java/me/zhengjie/aspect/LogAspect.java       | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java b/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
index 0f4ecf19..65a4937a 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
+++ b/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
@@ -26,8 +26,8 @@ public class GlobalExceptionHandler {
      * @param e
      * @return
      */
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity handleException(Exception e){
+    @ExceptionHandler(Throwable.class)
+    public ResponseEntity handleException(Throwable e){
         // 打印堆栈信息
         log.error(ThrowableUtil.getStackTrace(e));
         ApiError apiError = new ApiError(BAD_REQUEST.value(),e.getMessage());
diff --git a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
index b864423a..7c448316 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
+++ b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
@@ -42,14 +42,10 @@ public class LogAspect {
      * @param joinPoint join point for advice
      */
     @Around("logPointcut()")
-    public Object logAround(ProceedingJoinPoint joinPoint){
+    public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable {
         Object result = null;
         currentTime = System.currentTimeMillis();
-        try {
-            result = joinPoint.proceed();
-        } catch (Throwable e) {
-            throw new BadRequestException(e.getMessage());
-        }
+        result = joinPoint.proceed();
         Log log = new Log("INFO",System.currentTimeMillis() - currentTime);
         logService.save(joinPoint, log);
         return result;