From 6cdfe1d568d06bc63bb513ce0ef1df6aac3c7c3d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 20 Feb 2021 15:32:12 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/excoin/configurations/GlobalExceptionHandler.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/configurations/GlobalExceptionHandler.java b/src/main/java/com/xcong/excoin/configurations/GlobalExceptionHandler.java
index 97ed2d9..99efc56 100644
--- a/src/main/java/com/xcong/excoin/configurations/GlobalExceptionHandler.java
+++ b/src/main/java/com/xcong/excoin/configurations/GlobalExceptionHandler.java
@@ -1,5 +1,6 @@
 package com.xcong.excoin.configurations;
 
+import com.xcong.excoin.common.exception.GlobalException;
 import com.xcong.excoin.common.response.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
@@ -49,11 +50,6 @@
         return null;
     }
 
-    @ExceptionHandler(value = {Exception.class})
-    public Result handleException(Exception e) {
-        log.error(e.getMessage(), e);
-        return Result.fail("系统异常");
-    }
 
     /**
      * spring security 账户密码验证异常
@@ -67,4 +63,15 @@
         return Result.fail("用户名或密码错误");
     }
 
+    @ExceptionHandler(value = {GlobalException.class})
+    public Result handleException(GlobalException e) {
+        return Result.fail(e.getMessage());
+    }
+
+    @ExceptionHandler(value = {Exception.class})
+    public Result handleException(Exception e) {
+        log.error(e.getMessage(), e);
+        return Result.fail("系统异常");
+    }
+
 }

--
Gitblit v1.9.1