update:其他异常统一处理

Author: jnewer

src/BaseExceptionHandler.php

@@ -17,11 +17,15 @@ public function render(Request $request, Throwable $exception): Response
             return new Response($exception->statusCode, [], $message);
         }
 
-        $jsonMessage = ['code' => $exception->code ?: $exception->statusCode, 'message' => $message, 'success' => false, 'data' => []];
         return new Response(
             $exception->statusCode,
             ['Content-Type' => 'application/json'],
-            json_encode($jsonMessage, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+            json_encode([
+                'code' => $exception->code ?: $exception->statusCode,
+                'message' => $message,
+                'success' => false,
+                'data' => []
+            ], JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
         );
     }
 }

src/Handler.php

@@ -7,7 +7,8 @@
 use Webman\Http\Response;
 use support\exception\Handler as ExceptionHandler;
 
-class Handler extends ExceptionHandler{
+class Handler extends ExceptionHandler
+{
     public $dontReport = [];
 
     public function report(Throwable $exception)
@@ -40,6 +41,15 @@ public function render(Request $request, Throwable $exception): Response
             return (new $handler($this->logger, $this->debug))->render($request, $exception);
         }
 
-        return parent::render($request, $exception);
+        return new Response(
+            200,
+            ['Content-Type' => 'application/json'],
+            json_encode([
+                'code' => $exception->code ?: 1,
+                'message' => $exception->getMessage(),
+                'success' => false,
+                'data' => []
+            ], JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+        );
     }
-}
+}

src/ValidationExceptionHandler.php

@@ -19,11 +19,15 @@ public function render(Request $request, Throwable $exception): Response
             return new Response($exception->status, [], $message);
         }
 
-        $jsonMessage = ['code' => $exception->status, 'message' => $message, 'success' => false, 'data' => []];
         return new Response(
             $exception->status,
             ['Content-Type' => 'application/json'],
-            json_encode($jsonMessage, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+            json_encode([
+                'code' => $exception->status,
+                'message' => $message,
+                'success' => false,
+                'data' => []
+            ], JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
         );
     }
 }