From 10673abd11b3ade3be86c1c422453c70de7dfef8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 15:22:56 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java b/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
index 6db4756..4f838da 100644
--- a/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
+++ b/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
@@ -17,6 +17,7 @@
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.client.ResourceAccessException;
 
 import javax.net.ssl.SSLException;
 import javax.validation.ValidationException;
@@ -51,11 +52,15 @@
 
     @AfterThrowing(pointcut = "exceptionCatch()", throwing = "ex")
     public void afterThrows(JoinPoint jp, Exception ex) throws Exception {
-        if (ex instanceof GlobalException || ex instanceof MethodArgumentNotValidException || ex instanceof ValidationException || ex instanceof DuplicateKeyException || ex instanceof BadCredentialsException || ex instanceof UsernameNotFoundException || ex instanceof SSLException) {
+        if (ex instanceof ResourceAccessException || ex instanceof GlobalException || ex instanceof MethodArgumentNotValidException || ex instanceof ValidationException || ex instanceof DuplicateKeyException || ex instanceof BadCredentialsException || ex instanceof UsernameNotFoundException || ex instanceof SSLException) {
             throw ex;
         }
 
         if (EXCLUDE_EXCEPTION.contains(ex.getMessage())) {
+            throw ex;
+        }
+
+        if (profiles.equals("dev") || profiles.equals("test")) {
             throw ex;
         }
 
@@ -73,9 +78,15 @@
                     exceptionData.setSimpleMsg(ex.getMessage());
                     sysExceptionDetailDao.insert(exceptionData);
 
-                    DingTalkUtils.sendMsg(profiles + "--" + ex.getMessage(), exStr.substring(0, 200), exceptionData.getId());
+                    String msg = "";
+                    if (exStr.length() > 200) {
+                        msg = exStr.substring(0, 200);
+                    } else {
+                        msg = exStr;
+                    }
+                    DingTalkUtils.sendMsg(profiles + "--" + ex.getMessage(), msg, exceptionData.getId());
                 } catch (Exception e) {
-                    log.error("exception aop");
+                    log.error("exception aop", e);
                 }
             }
         });

--
Gitblit v1.9.1