as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-06-08 13:55:41 +08:00
parent 5e9df58276
commit 53cbc714ed
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnRequest.php
+7 -4
View File
@@ -16,6 +16,7 @@ use Snowflake\Snowflake;
use Swoole\Error; use Swoole\Error;
use Swoole\Http\Request; use Swoole\Http\Request;
use Swoole\Http\Response; use Swoole\Http\Response;
use Throwable;
/** /**
* Class OnRequest * Class OnRequest
@@ -59,7 +60,7 @@ class OnRequest extends Callback
return $response->close(404); return $response->close(404);
} }
return $this->router->dispatch(); return $this->router->dispatch();
} catch (ExitException | Error | \Throwable $exception) { } catch (ExitException | Error | Throwable $exception) {
$this->addError($exception, 'throwable'); $this->addError($exception, 'throwable');
return $this->sendErrorMessage($request, $response, $exception); return $this->sendErrorMessage($request, $response, $exception);
} }
@@ -81,11 +82,11 @@ class OnRequest extends Callback
/** /**
* @param $sRequest * @param $sRequest
* @param $sResponse * @param $sResponse
* @param $exception * @param Throwable $exception
* @return bool|string * @return bool|string
* @throws Exception * @throws Exception
*/ */
protected function sendErrorMessage($sRequest, $sResponse, $exception): bool|string protected function sendErrorMessage($sRequest, $sResponse, Throwable $exception): bool|string
{ {
$this->addError($exception, 'throwable'); $this->addError($exception, 'throwable');
if ($sResponse instanceof Response) { if ($sResponse instanceof Response) {
@@ -95,14 +96,16 @@ class OnRequest extends Callback
$headers = $sRequest->headers->get('access-control-request-headers'); $headers = $sRequest->headers->get('access-control-request-headers');
$methods = $sRequest->headers->get('access-control-request-method'); $methods = $sRequest->headers->get('access-control-request-method');
/** @var HResponse $sResponse */
$sResponse->addHeader('Access-Control-Allow-Origin', '*'); $sResponse->addHeader('Access-Control-Allow-Origin', '*');
$sResponse->addHeader('Access-Control-Allow-Headers', $headers); $sResponse->addHeader('Access-Control-Allow-Headers', $headers);
$sResponse->addHeader('Access-Control-Request-Method', $methods); $sResponse->addHeader('Access-Control-Request-Method', $methods);
return $sResponse->send($exception->getMessage(), $exception->getCode());
if (!($exception instanceof ExitException)) { if (!($exception instanceof ExitException)) {
return $sResponse->send(\logger()->exception($exception), 200); return $sResponse->send(\logger()->exception($exception), 200);
} else { } else {
return $sResponse->send($exception->getMessage(), $exception?->getCode() ?? 200);
} }
} }