modify
This commit is contained in:
@@ -7,7 +7,7 @@ namespace HttpServer\Route;
|
||||
|
||||
/**
|
||||
* Class Any
|
||||
* @package Snowflake\Snowflake\Route
|
||||
* @package Kiri\Kiri\Route
|
||||
*/
|
||||
class Any
|
||||
{
|
||||
|
||||
@@ -12,11 +12,11 @@ use HttpServer\Http\Request;
|
||||
use HttpServer\Http\Response;
|
||||
use HttpServer\IInterface\Middleware;
|
||||
use Server\RequestInterface;
|
||||
use Snowflake\Snowflake;
|
||||
use Kiri\Kiri;
|
||||
|
||||
/**
|
||||
* Class CoreMiddleware
|
||||
* @package Snowflake\Snowflake\Route
|
||||
* @package Kiri\Kiri\Route
|
||||
* 跨域中间件
|
||||
*/
|
||||
class CoreMiddleware implements Middleware
|
||||
@@ -36,7 +36,7 @@ class CoreMiddleware implements Middleware
|
||||
public function onHandler(RequestInterface $request, Closure $next): mixed
|
||||
{
|
||||
/** @var Response $response */
|
||||
$response = Snowflake::getApp('response');
|
||||
$response = Kiri::getApp('response');
|
||||
$response->addHeader('Access-Control-Allow-Origin', '*');
|
||||
$response->addHeader('Access-Control-Allow-Headers', $request->header('access-control-request-headers'));
|
||||
$response->addHeader('Access-Control-Request-Method', $request->header('access-control-request-method'));
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace HttpServer\Route;
|
||||
|
||||
use Snowflake\Abstracts\BaseObject;
|
||||
use Kiri\Abstracts\BaseObject;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,7 +6,7 @@ namespace HttpServer\Route;
|
||||
|
||||
use Closure;
|
||||
use HttpServer\IInterface\Middleware;
|
||||
use Snowflake\Abstracts\BaseObject;
|
||||
use Kiri\Abstracts\BaseObject;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -14,14 +14,14 @@ use HttpServer\Http\Request;
|
||||
use JetBrains\PhpStorm\Pure;
|
||||
use ReflectionException;
|
||||
use Server\Events\OnAfterWorkerStart;
|
||||
use Snowflake\Events\EventProvider;
|
||||
use Snowflake\Exception\NotFindClassException;
|
||||
use Snowflake\IAspect;
|
||||
use Snowflake\Snowflake;
|
||||
use Kiri\Events\EventProvider;
|
||||
use Kiri\Exception\NotFindClassException;
|
||||
use Kiri\IAspect;
|
||||
use Kiri\Kiri;
|
||||
|
||||
/**
|
||||
* Class Node
|
||||
* @package Snowflake\Snowflake\Route
|
||||
* @package Kiri\Kiri\Route
|
||||
*/
|
||||
class Node
|
||||
{
|
||||
@@ -122,7 +122,7 @@ class Node
|
||||
if (!class_exists($controller) && !empty($this->namespace)) {
|
||||
$controller = implode('\\', $this->namespace) . '\\' . $controller;
|
||||
}
|
||||
return [Snowflake::getDi()->get($controller), $action];
|
||||
return [Kiri::getDi()->get($controller), $action];
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ class Node
|
||||
*/
|
||||
private function getHandlerProviders(): HandlerProviders
|
||||
{
|
||||
return Snowflake::getDi()->get(HandlerProviders::class);
|
||||
return Kiri::getDi()->get(HandlerProviders::class);
|
||||
}
|
||||
|
||||
|
||||
@@ -194,7 +194,7 @@ class Node
|
||||
*/
|
||||
public function setParameters(): static
|
||||
{
|
||||
$container = Snowflake::getDi();
|
||||
$container = Kiri::getDi();
|
||||
if (empty($this->_handler)) {
|
||||
return $this;
|
||||
}
|
||||
@@ -236,7 +236,7 @@ class Node
|
||||
private function getAop($handler): ?IAspect
|
||||
{
|
||||
[$controller, $action] = $handler;
|
||||
$aspect = Snowflake::getDi()->getMethodAttribute($controller::class, $action);
|
||||
$aspect = Kiri::getDi()->getMethodAttribute($controller::class, $action);
|
||||
if (empty($aspect)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
+10
-10
@@ -16,17 +16,17 @@ use JetBrains\PhpStorm\Pure;
|
||||
use ReflectionException;
|
||||
use Rpc\Actuator;
|
||||
use Server\RequestInterface;
|
||||
use Snowflake\Abstracts\Config;
|
||||
use Snowflake\Exception\ConfigException;
|
||||
use Snowflake\Exception\NotFindClassException;
|
||||
use Snowflake\Snowflake;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Exception\NotFindClassException;
|
||||
use Kiri\Kiri;
|
||||
|
||||
defined('ROUTER_TREE') or define('ROUTER_TREE', 1);
|
||||
defined('ROUTER_HASH') or define('ROUTER_HASH', 2);
|
||||
|
||||
/**
|
||||
* Class Router
|
||||
* @package Snowflake\Snowflake\Route
|
||||
* @package Kiri\Kiri\Route
|
||||
*/
|
||||
class Router extends HttpService implements RouterInterface
|
||||
{
|
||||
@@ -66,7 +66,7 @@ class Router extends HttpService implements RouterInterface
|
||||
{
|
||||
$this->dir = Config::get('http.namespace', $this->dir);
|
||||
|
||||
$this->response = Snowflake::app()->get('response');
|
||||
$this->response = Kiri::app()->get('response');
|
||||
}
|
||||
|
||||
|
||||
@@ -347,7 +347,7 @@ class Router extends HttpService implements RouterInterface
|
||||
if (!is_string($value)) {
|
||||
return $value;
|
||||
}
|
||||
$value = Snowflake::createObject($value);
|
||||
$value = Kiri::createObject($value);
|
||||
if (!($value instanceof Middleware)) {
|
||||
return null;
|
||||
}
|
||||
@@ -462,7 +462,7 @@ class Router extends HttpService implements RouterInterface
|
||||
*/
|
||||
public function exception($exception): mixed
|
||||
{
|
||||
return Snowflake::app()->getLogger()->exception($exception);
|
||||
return Kiri::app()->getLogger()->exception($exception);
|
||||
}
|
||||
|
||||
|
||||
@@ -551,9 +551,9 @@ class Router extends HttpService implements RouterInterface
|
||||
public function _loader()
|
||||
{
|
||||
$this->loadRouteDir(APP_PATH . 'routes');
|
||||
$classes = Snowflake::getAnnotation()->runtime(CONTROLLER_PATH);
|
||||
$classes = Kiri::getAnnotation()->runtime(CONTROLLER_PATH);
|
||||
|
||||
$di = Snowflake::getDi();
|
||||
$di = Kiri::getDi();
|
||||
foreach ($classes as $class) {
|
||||
$instance = $di->get($class);
|
||||
$methods = $di->getMethodAttribute($class);
|
||||
|
||||
Reference in New Issue
Block a user