This commit is contained in:
2021-08-04 14:05:00 +08:00
parent 24b0f8d944
commit e479529347
3 changed files with 10 additions and 12 deletions
+4 -4
View File
@@ -8,9 +8,9 @@ use Annotation\Inject;
use HttpServer\Http\HttpHeaders;
use HttpServer\Http\HttpParams;
use HttpServer\Http\Request;
use HttpServer\Http\Response;
use Snowflake\Abstracts\TraitApplication;
use Snowflake\Application;
use Server\Constrict\Response as CrResponse;
/**
* Class WebController
@@ -57,10 +57,10 @@ class Controller
/**
* inject response
*
* @var Response|null
* @var CrResponse|null
*/
#[Inject(\Server\Response::class)]
public ?\Server\Response $response = null;
#[Inject(CrResponse::class)]
public ?CrResponse $response = null;
}
@@ -1,7 +1,7 @@
<?php
namespace Server;
namespace Server\Constrict;
use HttpServer\Http\Context;
+5 -7
View File
@@ -5,14 +5,12 @@ namespace Server;
use Annotation\Inject;
use Exception;
use HttpServer\Exception\RequestException;
use HttpServer\Http\Context;
use HttpServer\Http\Request as HSRequest;
use Server\Constrict\Response as CResponse;
use HttpServer\Route\Node;
use HttpServer\Route\Router;
use Server\Events\OnAfterRequest;
use Snowflake\Event;
use Snowflake\Events\EventDispatch;
use Snowflake\Snowflake;
use Swoole\Error;
use Swoole\Http\Request;
use Swoole\Http\Response;
@@ -37,9 +35,9 @@ class HTTPServerListener extends Abstracts\Server
public Router $router;
/** @var \Server\Response|mixed */
#[Inject(\Server\Response::class)]
public \Server\Response $response;
/** @var CResponse|mixed */
#[Inject(CResponse::class)]
public CResponse $response;
/** @var EventDispatch */
@@ -102,7 +100,7 @@ class HTTPServerListener extends Abstracts\Server
$code = $exception->getCode() == 0 ? 500 : $exception->getCode();
$data = $code ? $exception->getMessage() : jTraceEx($exception);
$responseData = $this->response->setContent($data, $code, \Server\Response::HTML);
$responseData = $this->response->setContent($data, $code, CResponse::HTML);
} finally {
$response->end($responseData->configure($response)->getContent());