diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java index 7aa4f6ca..a3b6e492 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ package cn.odboy.exception.handler; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; import cn.odboy.exception.EntityNotFoundException; -import cn.odboy.exception.util.ThrowableUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -26,7 +26,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(Throwable.class) public ResponseEntity handleException(Throwable e) { // 打印堆栈信息 - log.error(ThrowableUtil.getStackTrace(e)); + log.error(ExceptionUtil.stacktraceToString(e)); return buildResponseEntity(ApiError.error(e.getMessage())); } @@ -47,7 +47,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(value = BadRequestException.class) public ResponseEntity badRequestException(BadRequestException e) { // 打印堆栈信息 - log.error(ThrowableUtil.getStackTrace(e)); + log.error(ExceptionUtil.stacktraceToString(e)); return buildResponseEntity(ApiError.error(e.getStatus(), e.getMessage())); } @@ -57,7 +57,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(value = EntityExistException.class) public ResponseEntity entityExistException(EntityExistException e) { // 打印堆栈信息 - log.error(ThrowableUtil.getStackTrace(e)); + log.error(ExceptionUtil.stacktraceToString(e)); return buildResponseEntity(ApiError.error(e.getMessage())); } @@ -67,7 +67,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(value = EntityNotFoundException.class) public ResponseEntity entityNotFoundException(EntityNotFoundException e) { // 打印堆栈信息 - log.error(ThrowableUtil.getStackTrace(e)); + log.error(ExceptionUtil.stacktraceToString(e)); return buildResponseEntity(ApiError.error(NOT_FOUND.value(), e.getMessage())); } @@ -77,7 +77,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(MethodArgumentNotValidException.class) public ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { // 打印堆栈信息 - log.error(ThrowableUtil.getStackTrace(e)); + log.error(ExceptionUtil.stacktraceToString(e)); ObjectError objectError = e.getBindingResult().getAllErrors().get(0); String message = objectError.getDefaultMessage(); if (objectError instanceof FieldError) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/util/ThrowableUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/util/ThrowableUtil.java deleted file mode 100644 index e766e658..00000000 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/util/ThrowableUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.odboy.exception.util; - -import java.io.PrintWriter; -import java.io.StringWriter; - -/** - * 异常工具 - */ -public class ThrowableUtil { - - /** - * 获取堆栈信息 - */ - public static String getStackTrace(Throwable throwable) { - StringWriter sw = new StringWriter(); - try (PrintWriter pw = new PrintWriter(sw)) { - throwable.printStackTrace(pw); - return sw.toString(); - } - } -} diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/ExecutionJob.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/ExecutionJob.java index 09936b4d..8d5d435a 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/ExecutionJob.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/ExecutionJob.java @@ -1,5 +1,6 @@ package cn.odboy.application.job.util; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; @@ -8,7 +9,6 @@ import cn.odboy.application.job.mapper.QuartzLogMapper; import cn.odboy.application.job.service.QuartzJobService; import cn.odboy.application.tools.service.EmailService; import cn.odboy.context.SpringBeanHolder; -import cn.odboy.exception.util.ThrowableUtil; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; import cn.odboy.model.tools.dto.EmailDto; @@ -79,7 +79,7 @@ public class ExecutionJob extends QuartzJobBean { quartzLog.setTime(times); // 任务状态 0:成功 1:失败 quartzLog.setIsSuccess(false); - quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e)); + quartzLog.setExceptionDetail(ExceptionUtil.stacktraceToString(e)); // 任务如果失败了则暂停 if (quartzJob.getPauseAfterFailure() != null && quartzJob.getPauseAfterFailure()) { quartzJob.setIsPause(false); @@ -90,7 +90,7 @@ public class ExecutionJob extends QuartzJobBean { EmailService emailService = SpringBeanHolder.getBean(EmailService.class); // 邮箱报警 if (StringUtil.isNoneBlank(quartzJob.getEmail())) { - EmailDto emailDto = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e)); + EmailDto emailDto = taskAlarm(quartzJob, ExceptionUtil.stacktraceToString(e)); emailService.sendEmail(emailDto); } }