This commit is contained in:
2021-04-27 18:15:03 +08:00
parent fe63bf4fdd
commit f749f28954
+5 -21
View File
@@ -15,9 +15,7 @@ use HttpServer\Http\Formatter\HtmlFormatter;
use HttpServer\Http\Formatter\JsonFormatter; use HttpServer\Http\Formatter\JsonFormatter;
use HttpServer\Http\Formatter\XmlFormatter; use HttpServer\Http\Formatter\XmlFormatter;
use JetBrains\PhpStorm\Pure; use JetBrains\PhpStorm\Pure;
use ReflectionException;
use Snowflake\Core\Help; use Snowflake\Core\Help;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
use Swoole\Http\Response as SResponse; use Swoole\Http\Response as SResponse;
use Swoole\Http2\Response as S2Response; use Swoole\Http2\Response as S2Response;
@@ -227,43 +225,29 @@ class Response extends HttpService
if (!Snowflake::getWebSocket()->exist($response->fd)) { if (!Snowflake::getWebSocket()->exist($response->fd)) {
return; return;
} }
$response->end($this->setHeaders($response, $status) $this->setHeaders($response, $status)->end($sendData);
->setResponseContent($sendData));
}
/**
* @param $sendData
* @return string
* @throws Exception
*/
private function setResponseContent($sendData): string
{
// $message = '[' . date('Y-m-d H:i:s') . ']' . $sendData . PHP_EOL . PHP_EOL;
// Snowflake::writeFile(storage('response.log'), $message, FILE_APPEND);
return $sendData;
} }
/** /**
* @param SResponse $response * @param SResponse $response
* @param $status * @param $status
* @return Response * @return SResponse
*/ */
private function setHeaders(SResponse $response, $status): static private function setHeaders(SResponse $response, $status): SResponse
{ {
$response->status($status); $response->status($status);
$response->header('Content-Type', $this->getContentType()); $response->header('Content-Type', $this->getContentType());
$response->header('Run-Time', $this->getRuntime()); $response->header('Run-Time', $this->getRuntime());
if (empty($this->headers) || !is_array($this->headers)) { if (empty($this->headers) || !is_array($this->headers)) {
return $this; return $response;
} }
foreach ($this->headers as $key => $header) { foreach ($this->headers as $key => $header) {
$response->header($key, $header, true); $response->header($key, $header, true);
} }
$this->headers = []; $this->headers = [];
return $this; return $response;
} }