From 6ec40dc71bdce4dd21ee8c6436a43b7fc20c422c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 12 May 2021 14:34:00 +0800
Subject: [PATCH] conflect
---
src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 2a39a9f..c6ceec5 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,7 +52,7 @@
@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;
}
@@ -59,6 +60,10 @@
throw ex;
}
+ if ("dev".equals(profiles)) {
+ throw ex;
+ }
+
SysExceptionDetailEntity exceptionData = new SysExceptionDetailEntity();
String exStr = printStackTraceToString(ex);
ThreadPoolUtils.EXECUTOR.execute(new Runnable(){
--
Gitblit v1.9.1