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

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-08-04 01:30:02 +08:00
parent da977a547a
commit e3f81d83b1
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Http/Response.php
+14 -21
View File
@@ -175,13 +175,20 @@ class Response extends HttpService
public function send(mixed $context = '', int $statusCode = 200): mixed public function send(mixed $context = '', int $statusCode = 200): mixed
{ {
$sendData = $this->parseData($context); $sendData = $this->parseData($context);
$this->statusCode = $statusCode;
/** @var SResponse|null $response */
$response = Context::getContext(SResponse::class); $response = Context::getContext(SResponse::class);
if ($response === null) { if ($response === null) {
$this->printResult($sendData); return $this->printResult($sendData);
} else {
$this->sendData($response, $sendData);
} }
$response->setStatusCode($statusCode);
if (!isset($response->header['Content-Type'])) {
$response->header('Content-Type', 'application/json;charset=utf-8');
}
$response->header('Run-Time', $this->getRuntime());
$response->end($sendData);
Context::remove(SResponse::class);
return $sendData; return $sendData;
} }
@@ -207,12 +214,12 @@ class Response extends HttpService
* @return void * @return void
* @throws Exception * @throws Exception
*/ */
private function printResult($result): void private function printResult($result): mixed
{ {
$result = Help::toString($result); $result = Help::toString($result);
fire('CONSOLE_END'); fire('CONSOLE_END');
if (str_contains((string)$result, 'Event::rshutdown(): Event::wait()')) { if (str_contains((string)$result, 'Event::rshutdown(): Event::wait()')) {
return; return $result;
} }
$string = 'Command Result: ' . PHP_EOL . PHP_EOL; $string = 'Command Result: ' . PHP_EOL . PHP_EOL;
if (empty($result)) { if (empty($result)) {
@@ -221,23 +228,9 @@ class Response extends HttpService
$string .= $result . PHP_EOL . PHP_EOL; $string .= $result . PHP_EOL . PHP_EOL;
} }
echo $string . 'Command End!' . PHP_EOL; echo $string . 'Command End!' . PHP_EOL;
return $result;
} }
/**
* @param $sendData
* @throws Exception
*/
private function sendData(SResponse $response, $sendData): void
{
if (!isset($response->header['Content-Type'])) {
$response->header('Content-Type', 'application/json;charset=utf-8');
}
$response->header('Run-Time', $this->getRuntime());
$response->status($this->statusCode);
$response->end($sendData);
Context::remove(SResponse::class);
}
/** /**