This commit is contained in:
xl
2023-11-17 09:43:39 +08:00
parent aba9c3a392
commit 13cd95ad35
2 changed files with 22 additions and 17 deletions
+10 -5
View File
@@ -4,7 +4,9 @@ declare(strict_types=1);
namespace Kiri\Router\Base; namespace Kiri\Router\Base;
use Exception; use Exception;
use Kiri\Di\Inject\Container;
use Kiri\Router\Request; use Kiri\Router\Request;
use Kiri\Router\Response;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\MiddlewareInterface;
@@ -18,6 +20,13 @@ class CoreMiddleware implements MiddlewareInterface
{ {
/**
* @var Response
*/
#[Container(ResponseInterface::class)]
public ResponseInterface $response;
/** /**
* @param Request $request * @param Request $request
* @param RequestHandlerInterface $handler * @param RequestHandlerInterface $handler
@@ -26,11 +35,7 @@ class CoreMiddleware implements MiddlewareInterface
*/ */
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{ {
response()->withHeaders([ $this->response->withHeaders(['Access-Control-Allow-Headers' => '*', 'Access-Control-Request-Method' => '*', 'Access-Control-Allow-Origin' => '*']);
'Access-Control-Allow-Headers' => '*',
'Access-Control-Request-Method' => '*',
'Access-Control-Allow-Origin' => '*'
]);
return $handler->handle($request); return $handler->handle($request);
} }
+2 -2
View File
@@ -16,9 +16,9 @@ class NotFoundController extends Controller
public function fail(): ResponseInterface public function fail(): ResponseInterface
{ {
if ($this->request->getMethod() == 'OPTIONS') { if ($this->request->getMethod() == 'OPTIONS') {
return \response()->withStatus(200, "empty content"); return $this->response->withStatus(200, "");
} else { } else {
return \response()->withStatus(404, "not found page."); return $this->response->withStatus(404, "not found page.");
} }
} }