zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-23 08:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix Route annotation wrong response bug

Browse Source
This commit is contained in:
crazywhalecc
2023-02-12 19:23:25 +08:00
committed by Jerry
parent 817b81f900
commit a354a2fd11
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ZM/Event/Listener/HttpEventListener.php
View File

@@ -8,6 +8,7 @@ use Choir\Http\HttpFactory;
use Choir\Http\Stream; use Choir\Http\Stream;
use OneBot\Driver\Event\Http\HttpRequestEvent; use OneBot\Driver\Event\Http\HttpRequestEvent;
use OneBot\Util\Singleton; use OneBot\Util\Singleton;
use Psr\Http\Message\ResponseInterface;
use ZM\Annotation\AnnotationHandler; use ZM\Annotation\AnnotationHandler;
use ZM\Annotation\Framework\BindEvent; use ZM\Annotation\Framework\BindEvent;
use ZM\Annotation\Http\Route; use ZM\Annotation\Http\Route;
@@ -51,7 +52,10 @@ class HttpEventListener
// $div->request_method = $node['request_method']; // $div->request_method = $node['request_method'];
$div->class = $node['class']; $div->class = $node['class'];
$route_handler->handle($div, null, $params, $event->getRequest(), $event); $route_handler->handle($div, null, $params, $event->getRequest(), $event);
if (is_string($val = $route_handler->getReturnVal()) || ($val instanceof \Stringable)) { $val = $route_handler->getReturnVal();
if ($val instanceof ResponseInterface) {
$event->withResponse($val);
} elseif (is_string($val)) {
// 返回的内容是可以被字符串化的，就当作 Body 来返回，状态码 200 // 返回的内容是可以被字符串化的，就当作 Body 来返回，状态码 200
$event->withResponse(HttpFactory::createResponse(200, null, [], Stream::create($val))); $event->withResponse(HttpFactory::createResponse(200, null, [], Stream::create($val)));
} elseif ($event->getResponse() === null) { } elseif ($event->getResponse() === null) {