From 03625cb60150c4f0d6b830f0ac98b956b50d809f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 29 May 2024 09:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DExceptionHandler=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=B9json=E8=AF=B7=E6=B1=82=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/ExceptionHandler.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/ExceptionHandler.php b/app/ExceptionHandler.php
index e50718f..25cce4e 100644
--- a/app/ExceptionHandler.php
+++ b/app/ExceptionHandler.php
@@ -17,9 +17,14 @@ class ExceptionHandler extends Handler
 
     public function render(Request $request, Throwable $exception): Response
     {
-       if ($exception instanceof Dumper) {
-           return \response(self::convertToHtml($exception));
-       }
-       return parent::render($request, $exception);
+        if ($exception instanceof Dumper) {
+            return \response(self::convertToHtml($exception));
+        }
+        // json请求返回json数据
+        if ($request->expectsJson()) {
+            return json(['code' => $exception->getCode() ?: 500, 'msg' => $exception->getMessage(), 'show' => 1]);
+        }
+        // 非json请求则返回一个页面
+        return new Response(200, [], $exception->getMessage());
     }
-}
\ No newline at end of file
+}