优化异常处理

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);
     }
 
     /**