From f749f289542fea3db13ab9c7efa4896aa8a90e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 27 Apr 2021 18:15:03 +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/Http/Response.php | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php index c804dc5c..aa519ec2 100644 --- a/HttpServer/Http/Response.php +++ b/HttpServer/Http/Response.php @@ -15,9 +15,7 @@ use HttpServer\Http\Formatter\HtmlFormatter; use HttpServer\Http\Formatter\JsonFormatter; use HttpServer\Http\Formatter\XmlFormatter; use JetBrains\PhpStorm\Pure; -use ReflectionException; use Snowflake\Core\Help; -use Snowflake\Exception\NotFindClassException; use Snowflake\Snowflake; use Swoole\Http\Response as SResponse; use Swoole\Http2\Response as S2Response; @@ -227,43 +225,29 @@ class Response extends HttpService if (!Snowflake::getWebSocket()->exist($response->fd)) { return; } - $response->end($this->setHeaders($response, $status) - ->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; + $this->setHeaders($response, $status)->end($sendData); } /** * @param SResponse $response * @param $status - * @return Response + * @return SResponse */ - private function setHeaders(SResponse $response, $status): static + private function setHeaders(SResponse $response, $status): SResponse { $response->status($status); $response->header('Content-Type', $this->getContentType()); $response->header('Run-Time', $this->getRuntime()); if (empty($this->headers) || !is_array($this->headers)) { - return $this; + return $response; } foreach ($this->headers as $key => $header) { $response->header($key, $header, true); } $this->headers = []; - return $this; + return $response; }