From d6db7bf90599e1e6d88c3e869e6fe6d6ea164c22 Mon Sep 17 00:00:00 2001 From: zj Date: Thu, 30 Jul 2026 09:51:59 +0800 Subject: [PATCH] update --- .../Handler/JsonRpcBusinessExceptionHandler.php | 13 ++----------- src/Library/Logger.php | 1 + 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Exception/Handler/JsonRpcBusinessExceptionHandler.php b/src/Exception/Handler/JsonRpcBusinessExceptionHandler.php index 1530bf5..dfce0d7 100644 --- a/src/Exception/Handler/JsonRpcBusinessExceptionHandler.php +++ b/src/Exception/Handler/JsonRpcBusinessExceptionHandler.php @@ -15,7 +15,6 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Hyperf\HttpMessage\Stream\SwooleStream; -use Hyperf\RpcClient\Exception\RequestException; use Dhd\Micro\Core\Exception\BusinessException; use Dhd\Micro\Core\Trait\RpcContextTrait; @@ -34,16 +33,8 @@ class JsonRpcBusinessExceptionHandler extends ExceptionHandler // 关键优化:从 Request 属性中动态获取 ID $id = $request ? $request->getAttribute('request_id', null) : null; // Hyperf 注入的 ID - $code = 500; - $message = '服务器内部错误'; - - if ( - $throwable instanceof RequestException - || $throwable instanceof BusinessException - ) { - $code = $throwable->getCode(); - $message = $throwable->getMessage(); - } + $code = $throwable->getCode() ?? 500; + $message = $throwable->getMessage() ?? '服务器内部错误'; Util::logger()->setErrorStatus(!($throwable instanceof BusinessException)) ->setMessage($message) diff --git a/src/Library/Logger.php b/src/Library/Logger.php index 5d1f1ec..d86f967 100644 --- a/src/Library/Logger.php +++ b/src/Library/Logger.php @@ -66,6 +66,7 @@ class Logger $logger = $fatory->get('log', 'default'); $content = [ 'message' => $this->message, + 'timestamp' => date('Y-m-d H:i:s'), 'trace_id' => $this->traceId, 'data' => $this->data, 'context' => $this->context,