From 0c2015e08427e3437768795c1ece6cb04b2d6731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Mon, 8 Mar 2021 16:33:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Events/OnPacket.php | 6 +++++- HttpServer/Events/OnReceive.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/HttpServer/Events/OnPacket.php b/HttpServer/Events/OnPacket.php index ba4f637f..c5f8117a 100644 --- a/HttpServer/Events/OnPacket.php +++ b/HttpServer/Events/OnPacket.php @@ -44,7 +44,11 @@ class OnPacket extends Callback if (($node = $router->find_path($request)) === null) { return $server->sendto($host, $port, Json::encode(['state' => 404])); } - return $server->sendto($host, $port, $node->dispatch()); + + $dispatch = $node->dispatch(); + if (!is_string($dispatch)) $dispatch = Json::encode($dispatch); + + return $server->sendto($host, $port, $dispatch); } catch (\Throwable $exception) { $response = Json::encode(['state' => 500, 'message' => $exception->getMessage()]); diff --git a/HttpServer/Events/OnReceive.php b/HttpServer/Events/OnReceive.php index fa1c60a9..4a37a572 100644 --- a/HttpServer/Events/OnReceive.php +++ b/HttpServer/Events/OnReceive.php @@ -42,7 +42,11 @@ class OnReceive extends Callback if (($node = $router->find_path($request)) === null) { return $server->send($fd, Json::encode(['state' => 404])); } - return $server->send($fd, $node->dispatch()); + + $dispatch = $node->dispatch(); + if (!is_string($dispatch)) $dispatch = Json::encode($dispatch); + + return $server->send($fd, $dispatch); } catch (\Throwable $exception) { return $server->send($fd, Json::encode(['state' => 500, 'message' => $exception->getMessage()])); } finally {