From 7ad4eafe845cf821248c4939f7a3f985af44f469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Tue, 21 Dec 2021 10:20:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Exceptions/Handler.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 8543b205..1b5674d7 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -107,15 +107,24 @@ class Handler extends ExceptionHandler
      */
     protected function convertExceptionToArray(Throwable $e)
     {
-        return array_merge(
-            parent::convertExceptionToArray($e),
-            $this->isBizException($e) ? [
+        $data = [
+            'errcode' => 500,
+            'message' => config('app.debug') ? $e->getMessage() : '服务器繁忙，请稍后再试',
+        ];
+
+        if ($this->isBizException($e)) {
+            $data = [
                 'errcode' => $e->getCode(),
                 'message' => $e->getMessage(),
-            ] : [
-                'errcode' => $this->isHttpException($e) ? $e->getStatusCode() : 500,
-            ]
-        );
+            ];
+        } elseif ($this->isHttpException($e)) {
+            $data = [
+                'errcode' => $e->getStatusCode(),
+                'message' => $e->getMessage(),
+            ];
+        }
+
+        return array_merge(parent::convertExceptionToArray($e), $data);
     }
 
     /**