From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
index f26d109..558bec6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -81,6 +81,18 @@
@ResponseBody
+ @ExceptionHandler(RuntimeException.class)
+ public R runtimeExceptionHandler(RuntimeException e, HttpServletResponse response) {
+ CommonUtil.addCrossHeaders(response);
+ Throwable cause = e.getCause();
+ if (cause instanceof CoolException) {
+ return R.error(cause.getMessage());
+ }
+ logger.error(e.getMessage(), e);
+ return R.error(Constants.RESULT_ERROR_MSG);
+ }
+
+ @ResponseBody
@ExceptionHandler(Throwable.class)
public R exceptionHandler(Throwable e, HttpServletResponse response) {
logger.error(e.getMessage(), e);
@@ -89,3 +101,4 @@
}
}
+
--
Gitblit v1.9.1