refactor(exception): 重构异常处理逻辑

- 移除 CommonHandler 中的 $request 属性
- 使用 make 函数创建 RequestInterface 实例
- 优化异常日志输出格式
- 调整请求数据和查询字符串的获取方式

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>

src/Exceptions/Handler/CommonHandler.php

@@ -42,6 +42,7 @@ use Teapot\StatusCode\RFC\RFC7231;
 use Throwable;
 
 use function Hyperf\Config\config;
+use function Hyperf\Support\make;
 use function Hyperf\Translation\__;
 
 /**
@@ -54,9 +55,6 @@ use function Hyperf\Translation\__;
  */
 class CommonHandler extends ExceptionHandler
 {
-    #[Inject(required: false)]
-    private ?RequestInterface $request;
-
     #[Inject]
     private StdoutLogger $logger;
 
@@ -70,18 +68,23 @@ class CommonHandler extends ExceptionHandler
     {
         // 阻止异常冒泡
         $this->stopPropagation();
+        if ($throwable instanceof BadRequestHttpException) {
+            $request = $throwable->getRequest();
+        } else {
+            $request = make(RequestInterface::class);
+        }
         $restful = $this->apiStyleService->get();
         // $restful = config('common.response.restful');
         $code_name = config('common.response.code_name');
         $message_name = config('common.response.message_name');
         $is_testing = config('app_status') === true;
-        $this->request?->url();
+        $request?->url();
 
         $is_debug = $is_testing;
         $error_type = $throwable::class;
         $request_time = Carbon::now()->toDateTimeString();
-        $request_data = Json::encode($this->request?->getParsedBody());
+        $request_data = $request?->getBody()->getContents();
-        $request_headers = Json::encode($this->request?->getHeaders());
+        $request_headers = Json::encode($request?->getHeaders());
         // 901 程序语法错误
         // 902 SQL 语法错误
         if ($throwable instanceof QueryException) {
@@ -125,7 +128,7 @@ class CommonHandler extends ExceptionHandler
             $data = [
                 $code_name => $code,
                 $message_name => CommonErrorCode::getMessage($code, ['methods' => join(', ', $allow_method)]),
-                'currentMethod' => $this->request?->getMethod(),
+                'currentMethod' => $request?->getMethod(),
                 'allowedMethod' => $allow_method,
             ];
             $status_code = RFC7231::METHOD_NOT_ALLOWED;
@@ -257,7 +260,7 @@ class CommonHandler extends ExceptionHandler
         if ($is_debug && $is_testing) {
             $data += ['errorType' => $error_type, 'errorTrack' => $throwable->getTrace()];
         }
-        $cookies = json_encode($this->request->getCookieParams(), JSON_UNESCAPED_UNICODE);
+        $cookies = json_encode($request->getCookieParams(), JSON_UNESCAPED_UNICODE);
         $this->logger->error(
             <<<ERROR_LOG
                 TYPE: {$error_type}
@@ -273,13 +276,13 @@ REQUEST_COOKIES:
                 {$cookies}
                 -------------------------------
                 REQUEST_METHOD:
-{$this->request?->getMethod()}
+                {$request?->getMethod()}
                 -------------------------------
                 REQUEST_URL:
-{$this->request?->getUri()}
+                {$request?->getUri()}
                 -------------------------------
                 REQUEST_QUERY:
-{$this->request?->getQueryString()}
+                {$request?->getUri()->getQuery()}
                 -------------------------------
                 REQUEST_DATA:
                 {$request_data}