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 | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 d88a301..c6ceec5 100644
--- a/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
+++ b/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
@@ -3,6 +3,7 @@
import com.xcong.excoin.common.exception.GlobalException;
import com.xcong.excoin.common.system.bean.SysExceptionDetailEntity;
import com.xcong.excoin.modules.platform.dao.SysExceptionDetailDao;
+import com.xcong.excoin.utils.ThreadPoolUtils;
import com.xcong.excoin.utils.dingtalk.DingTalkUtils;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
@@ -16,7 +17,9 @@
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;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -49,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) {
+ 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;
}
@@ -57,15 +60,30 @@
throw ex;
}
- SysExceptionDetailEntity exceptionData = new SysExceptionDetailEntity();
- exceptionData.setCreateTime(new Date());
- exceptionData.setMachine(InetAddress.getLocalHost().getHostName()+"-"+profiles);
- exceptionData.setAddress(InetAddress.getLocalHost().getHostAddress());
- exceptionData.setExceptionMsg(printStackTraceToString(ex));
- exceptionData.setSimpleMsg(ex.getMessage());
- sysExceptionDetailDao.insert(exceptionData);
+ if ("dev".equals(profiles)) {
+ throw ex;
+ }
- DingTalkUtils.sendActionCard(6);
+ SysExceptionDetailEntity exceptionData = new SysExceptionDetailEntity();
+ String exStr = printStackTraceToString(ex);
+ ThreadPoolUtils.EXECUTOR.execute(new Runnable(){
+ @Override
+ public void run() {
+ try {
+ log.info("插入");
+ exceptionData.setCreateTime(new Date());
+ exceptionData.setMachine(InetAddress.getLocalHost().getHostName() + "-" + profiles);
+ exceptionData.setAddress(InetAddress.getLocalHost().getHostAddress());
+ exceptionData.setExceptionMsg(exStr);
+ exceptionData.setSimpleMsg(ex.getMessage());
+ sysExceptionDetailDao.insert(exceptionData);
+
+ DingTalkUtils.sendMsg(profiles + "--" + ex.getMessage(), exStr.substring(0, 200), exceptionData.getId());
+ } catch (Exception e) {
+ log.error("exception aop", e);
+ }
+ }
+ });
throw ex;
}
--
Gitblit v1.9.1