From 8b9888f4b526c5b6ffa5e9759295da0ab9fc1ac2 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 19 Oct 2021 10:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=87=8D=E5=AE=9A=E5=90=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wgink/common/advice/ResponseAdvice.java   |  5 +++--
 .../common/base/DefaultBaseController.java    |  7 ------
 .../common/base/ErrorExceptionController.java | 22 +++++++++++++++++++
 .../error/{error.html => exception.html}      |  0
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 common/src/main/java/ink/wgink/common/base/ErrorExceptionController.java
 rename common/src/main/resources/templates/error/{error.html => exception.html} (100%)

diff --git a/common/src/main/java/ink/wgink/common/advice/ResponseAdvice.java b/common/src/main/java/ink/wgink/common/advice/ResponseAdvice.java
index 057b269e..cf5668a9 100644
--- a/common/src/main/java/ink/wgink/common/advice/ResponseAdvice.java
+++ b/common/src/main/java/ink/wgink/common/advice/ResponseAdvice.java
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -119,8 +120,8 @@ public class ResponseAdvice {
                 }
                 try {
                     request.getSession().setAttribute("errorStackTraces", errorStackTraces);
-                    response.sendRedirect(String.format("%s/system-error", request.getContextPath()));
-                } catch (IOException ioException) {
+                    request.getRequestDispatcher("/error/exception").forward(request, response);
+                } catch (IOException | ServletException ioException) {
                     ioException.printStackTrace();
                 }
                 return;
diff --git a/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java b/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java
index 57786823..c9c1385e 100644
--- a/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java
+++ b/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java
@@ -7,8 +7,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -35,11 +33,6 @@ public class DefaultBaseController {
     @Autowired
     protected HttpServletResponse httpServletResponse;
 
-    @GetMapping("system-error")
-    public ModelAndView error() {
-        return new ModelAndView("error/error");
-    }
-
     /**
      * 获取请求参数
      *
diff --git a/common/src/main/java/ink/wgink/common/base/ErrorExceptionController.java b/common/src/main/java/ink/wgink/common/base/ErrorExceptionController.java
new file mode 100644
index 00000000..44b1f3b1
--- /dev/null
+++ b/common/src/main/java/ink/wgink/common/base/ErrorExceptionController.java
@@ -0,0 +1,22 @@
+package ink.wgink.common.base;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * @ClassName: ErrorExceptionController
+ * @Description: 错误异常
+ * @Author: wanggeng
+ * @Date: 2021/10/19 9:58 上午
+ * @Version: 1.0
+ */
+@Controller
+public class ErrorExceptionController {
+
+    @GetMapping("error/exception")
+    public ModelAndView error() {
+        return new ModelAndView("error/exception");
+    }
+
+}
diff --git a/common/src/main/resources/templates/error/error.html b/common/src/main/resources/templates/error/exception.html
similarity index 100%
rename from common/src/main/resources/templates/error/error.html
rename to common/src/main/resources/templates/error/exception.html