as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-08-11 01:04:57 +08:00
parent 63d8eaa4a5
commit 682246df28
219 changed files with 790 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Abstracts/Callback.php
+6 -6
View File
@@ -6,10 +6,10 @@ namespace HttpServer\Abstracts;
use Database\Connection;
use Exception;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Exception\ConfigException;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
/**
@@ -72,7 +72,7 @@ abstract class Callback extends HttpService
if (empty($databases)) {
return;
}
$application = Snowflake::app();
$application = Kiri::app();
foreach ($databases as $name => $database) {
/** @var Connection $connection */
$connection = $application->get('databases.' . $name, false);
@@ -101,7 +101,7 @@ abstract class Callback extends HttpService
*/
protected function clearRedisClient()
{
$redis = Snowflake::app()->getRedis();
$redis = Kiri::app()->getRedis();
$redis->destroy();
}
HttpServer/Abstracts/HttpService.php
+3 -3
View File
@@ -5,8 +5,8 @@ namespace HttpServer\Abstracts;
use Exception;
use Snowflake\Abstracts\Component;
use Snowflake\Snowflake;
use Kiri\Abstracts\Component;
use Kiri\Kiri;
/**
@@ -24,7 +24,7 @@ abstract class HttpService extends Component
*/
protected function write($message, string $category = 'app')
{
$logger = Snowflake::app()->getLogger();
$logger = Kiri::app()->getLogger();
$logger->write($message, $category);
$logger->insert();
}
HttpServer/Abstracts/ServerBase.php
+1 -1
View File
@@ -13,7 +13,7 @@ use Swoole\WebSocket\Server;
/**
* Class OnServerDefault
* @package Snowflake\Snowflake\Server
* @package Kiri\Kiri\Server
*/
abstract class ServerBase extends HttpService
{
HttpServer/Client/Help/Client.php
+1 -1
View File
@@ -15,7 +15,7 @@ use Swoole\Coroutine\Http\Client as SClient;
/**
* Class Client
* @package Snowflake\Snowflake\Http
* @package Kiri\Kiri\Http
*/
class Client extends ClientAbstracts
{
HttpServer/Client/Help/ClientAbstracts.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Client\Help;
use Closure;
use JetBrains\PhpStorm\Pure;
use Snowflake\Abstracts\Component;
use Snowflake\Core\Help;
use Kiri\Abstracts\Component;
use Kiri\Core\Help;
use Swoole\Coroutine\System;
defined('SPLIT_URL') or define('SPLIT_URL', '/(http[s]?:\/\/)?(([\w\-_]+\.)+\w+(:\d+)?)((\/[a-zA-Z0-9\-]+)+[\/]?(\?[a-zA-Z]+=.*)?)?/');
HttpServer/Client/Http2.php
+7 -7
View File
@@ -7,13 +7,13 @@ namespace HttpServer\Client;
use Exception;
use HttpServer\Http\Context;
use Server\Events\OnAfterRequest;
use Snowflake\Abstracts\Component;
use Snowflake\Channel;
use Snowflake\Core\Json;
use Snowflake\Core\Xml;
use Snowflake\Event;
use Snowflake\Events\EventProvider;
use Snowflake\Snowflake;
use Kiri\Abstracts\Component;
use Kiri\Channel;
use Kiri\Core\Json;
use Kiri\Core\Xml;
use Kiri\Event;
use Kiri\Events\EventProvider;
use Kiri\Kiri;
use Swoole\Coroutine\Http2\Client as H2Client;
use Swoole\Http2\Request;
use Swoole\Http2\Response;
HttpServer/Client/HttpClient.php
+3 -3
View File
@@ -5,8 +5,8 @@ namespace HttpServer\Client;
use Exception;
use Snowflake\Abstracts\Component;
use Snowflake\Snowflake;
use Kiri\Abstracts\Component;
use Kiri\Kiri;
use Swoole\Coroutine;
use HttpServer\Client\Help\IClient;
use HttpServer\Client\Help\Client;
@@ -34,7 +34,7 @@ class HttpClient extends Component
*/
public static function http2(): Http2
{
return Snowflake::app()->get('http2');
return Kiri::app()->get('http2');
}
}
HttpServer/Command.php
+5 -5
View File
@@ -5,9 +5,9 @@ namespace HttpServer;
use Exception;
use Snowflake\Abstracts\Input;
use Snowflake\Exception\ConfigException;
use Snowflake\Snowflake;
use Kiri\Abstracts\Input;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
/**
* Class Command
@@ -33,14 +33,14 @@ class Command extends \Console\Command
*/
public function onHandler(Input $dtl): string
{
$manager = Snowflake::app()->getServer();
$manager = Kiri::app()->getServer();
$manager->setDaemon($dtl->get('daemon', 0));
if (!in_array($dtl->get('action'), self::ACTIONS)) {
return 'I don\'t know what I want to do.';
}
/** @var Shutdown $shutdown */
$shutdown = Snowflake::app()->get('shutdown');
$shutdown = Kiri::app()->get('shutdown');
if ($shutdown->isRunning() && $dtl->get('action') == 'start') {
return 'Service is running. Please use restart.';
}
HttpServer/Controller.php
+4 -4
View File
@@ -8,15 +8,15 @@ use Annotation\Inject;
use HttpServer\Http\HttpHeaders;
use HttpServer\Http\HttpParams;
use HttpServer\Http\Request;
use Snowflake\Abstracts\TraitApplication;
use Snowflake\Application;
use Kiri\Abstracts\TraitApplication;
use Kiri\Application;
use Server\Constrict\Response as CrResponse;
use Server\Constrict\Request as CrRequest;
use Snowflake\Snowflake;
use Kiri\Kiri;
/**
* Class WebController
* @package Snowflake\Snowflake\Web
* @package Kiri\Kiri\Web
* @property Application $container
*/
class Controller
HttpServer/Events/OnAfterReload.php
+3 -3
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Exception\ComponentException;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Exception\ComponentException;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnBeforeReload.php
+4 -4
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
use Swoole\Timer;
@@ -26,8 +26,8 @@ class OnBeforeReload extends Callback
{
Event::trigger(Event::SERVER_BEFORE_RELOAD, [$server]);
Snowflake::clearWorkerPid();
Snowflake::clearTaskPid();
Kiri::clearWorkerPid();
Kiri::clearTaskPid();
}
}
HttpServer/Events/OnClose.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnConnect.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnFinish.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnHandshake.php
+6 -6
View File
@@ -13,10 +13,10 @@ use HttpServer\Http\Request;
use HttpServer\Http\Response;
use HttpServer\Route\Router;
use ReflectionException;
use Snowflake\Core\ArrayAccess;
use Snowflake\Event;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Core\ArrayAccess;
use Kiri\Event;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
use Swoole\Http\Request as SRequest;
use Swoole\Http\Response as SResponse;
use Swoole\WebSocket\Server;
@@ -57,7 +57,7 @@ class OnHandshake extends Callback
foreach ($headers as $key => $val) {
$response->header($key, $val);
}
return Snowflake::app()->getRouter();
return Kiri::app()->getRouter();
}
@@ -68,7 +68,7 @@ class OnHandshake extends Callback
*/
private function disconnect(SResponse $response, int $code = 500): void
{
$server = Snowflake::getWebSocket();
$server = Kiri::getWebSocket();
if (!$server->isEstablished($response->fd)) {
return;
}
HttpServer/Events/OnManagerStart.php
+4 -4
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
@@ -26,7 +26,7 @@ class OnManagerStart extends Callback
*/
public function onHandler(Server $server)
{
Snowflake::setWorkerId($server->manager_pid);
Kiri::setWorkerId($server->manager_pid);
fire(Event::SERVER_MANAGER_START, [$server]);
HttpServer/Events/OnManagerStop.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnMessage.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\WebSocket\Frame;
use Swoole\WebSocket\Server;
HttpServer/Events/OnPacket.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Core\Json;
use Snowflake\Event;
use Kiri\Core\Json;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnPipeMessage.php
+4 -4
View File
@@ -7,10 +7,10 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Kafka\Struct;
use Snowflake\Crontab\Crontab;
use Snowflake\Crontab\Producer;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Crontab\Crontab;
use Kiri\Crontab\Producer;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnReceive.php
+3 -3
View File
@@ -7,9 +7,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use HttpServer\Http\Request;
use Snowflake\Abstracts\Config;
use Snowflake\Core\Json;
use Snowflake\Event;
use Kiri\Abstracts\Config;
use Kiri\Core\Json;
use Kiri\Event;
use Swoole\Server;
/**
HttpServer/Events/OnRequest.php
+4 -4
View File
@@ -10,9 +10,9 @@ use HttpServer\Exception\ExitException;
use HttpServer\Http\Request as HRequest;
use HttpServer\Http\Response as HResponse;
use HttpServer\Route\Router;
use Snowflake\Error\Logger;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Error\Logger;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Error;
use Swoole\Http\Request;
use Swoole\Http\Response;
@@ -38,7 +38,7 @@ class OnRequest extends Callback
*/
public function init()
{
$this->router = Snowflake::app()->getRouter();
$this->router = Kiri::app()->getRouter();
}
HttpServer/Events/OnShutdown.php
+3 -3
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Exception\ComponentException;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Exception\ComponentException;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnStart.php
+4 -4
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
@@ -24,7 +24,7 @@ class OnStart extends Callback
*/
public function onHandler(Server $server)
{
if (Snowflake::getPlatform()->isLinux()) {
if (Kiri::getPlatform()->isLinux()) {
name($server->master_pid, 'master');
}
fire(Event::SERVER_EVENT_START, [$server]);
HttpServer/Events/OnTask.php
+4 -4
View File
@@ -8,9 +8,9 @@ namespace HttpServer\Events;
use HttpServer\Abstracts\Callback;
use HttpServer\IInterface\Task;
use HttpServer\IInterface\Task as ITask;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Coroutine;
use Swoole\Process;
use Swoole\Server;
@@ -29,7 +29,7 @@ class OnTask extends Callback
*/
public function onHandler()
{
$setting = Snowflake::app()->getSwoole();
$setting = Kiri::app()->getSwoole();
$isCoroutineTask = $setting->setting['task_enable_coroutine'] ?? false;
if ($isCoroutineTask === true) {
HttpServer/Events/OnWorkerError.php
+3 -3
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Server;
/**
HttpServer/Events/OnWorkerExit.php
+3 -3
View File
@@ -6,8 +6,8 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Snowflake\Snowflake;
use Kiri\Event;
use Kiri\Kiri;
use Swoole\Timer;
/**
@@ -28,7 +28,7 @@ class OnWorkerExit extends Callback
Event::trigger(Event::SERVER_WORKER_EXIT, [$server, $worker_id]);
Snowflake::getApp('logger')->insert();
Kiri::getApp('logger')->insert();
}
}
HttpServer/Events/OnWorkerStart.php
+10 -10
View File
@@ -6,11 +6,11 @@ namespace HttpServer\Events;
use Annotation\Annotation;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Exception\ConfigException;
use Snowflake\Runtime;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Exception\ConfigException;
use Kiri\Runtime;
use Kiri\Kiri;
use Swoole\Server;
/**
@@ -32,7 +32,7 @@ class OnWorkerStart extends Callback
{
$this->setConfigs($worker_id);
$annotation = Snowflake::app()->getAnnotation();
$annotation = Kiri::app()->getAnnotation();
$annotation->setLoader(unserialize(file_get_contents(storage(Runtime::CACHE_NAME))));
if ($worker_id >= $server->setting['worker_num']) {
$this->onTask($server, $annotation);
@@ -78,13 +78,13 @@ class OnWorkerStart extends Callback
*/
public function onTask(Server $server, Annotation $annotation)
{
putenv('environmental=' . Snowflake::TASK);
putenv('environmental=' . Kiri::TASK);
$annotation->runtime(APP_PATH, [CONTROLLER_PATH, TASK_PATH, LISTENER_PATH]);
name($server->worker_pid, 'Task#' . $server->worker_id);
Snowflake::setTaskId($server->worker_pid);
Kiri::setTaskId($server->worker_pid);
fire(Event::SERVER_TASK_START);
}
@@ -106,8 +106,8 @@ class OnWorkerStart extends Callback
$this->debug('use time.' . (microtime(true) - $time));
$annotation->runtime(directory('app'), [CONTROLLER_PATH]);
Snowflake::setWorkerId($server->worker_pid);
putenv('environmental=' . Snowflake::WORKER);
Kiri::setWorkerId($server->worker_pid);
putenv('environmental=' . Kiri::WORKER);
fire(Event::SERVER_WORKER_START, [getenv('worker')]);
}
HttpServer/Events/OnWorkerStop.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Events;
use Exception;
use HttpServer\Abstracts\Callback;
use Snowflake\Event;
use Kiri\Event;
use Swoole\Timer;
/**
HttpServer/Exception/AuthException.php
+1 -1
View File
@@ -14,7 +14,7 @@ use Throwable;
/**
* Class AuthException
* @package Snowflake\Snowflake\Exception
* @package Kiri\Kiri\Exception
*/
class AuthException extends \Exception
{
HttpServer/Http/CoroutineResponse.php
+3 -3
View File
@@ -10,8 +10,8 @@ use HttpServer\Http\Formatter\HtmlFormatter;
use HttpServer\Http\Formatter\JsonFormatter;
use HttpServer\Http\Formatter\XmlFormatter;
use HttpServer\IInterface\IFormatter;
use Snowflake\Core\Help;
use Snowflake\Snowflake;
use Kiri\Core\Help;
use Kiri\Kiri;
use Swoole\Http\Response as SResponse;
@@ -178,7 +178,7 @@ class CoroutineResponse extends HttpService
/** @var IFormatter $class */
$class = $this->_format_maps[$this->format] ?? HtmlFormatter::class;
$di = Snowflake::getDi()->get($class);
$di = Kiri::getDi()->get($class);
$context = $di->send($context)->getData();
}
return $context;
HttpServer/Http/File.php
+1 -1
View File
@@ -4,7 +4,7 @@ declare(strict_types=1);
namespace HttpServer\Http;
use Exception;
use Snowflake\Snowflake;
use Kiri\Kiri;
/**
* Class File
HttpServer/Http/Formatter/HtmlFormatter.php
+2 -2
View File
@@ -12,13 +12,13 @@ namespace HttpServer\Http\Formatter;
use Exception;
use HttpServer\Abstracts\HttpService;
use Snowflake\Core\Json;
use Kiri\Core\Json;
use Swoole\Http\Response;
use HttpServer\IInterface\IFormatter;
/**
* Class HtmlFormatter
* @package Snowflake\Snowflake\Http\Formatter
* @package Kiri\Kiri\Http\Formatter
*/
class HtmlFormatter extends HttpService implements IFormatter
{
HttpServer/Http/Formatter/JsonFormatter.php
+1 -1
View File
@@ -14,7 +14,7 @@ use HttpServer\IInterface\IFormatter;
/**
* Class JsonFormatter
* @package Snowflake\Snowflake\Http\Formatter
* @package Kiri\Kiri\Http\Formatter
*/
class JsonFormatter extends HttpService implements IFormatter
{
HttpServer/Http/Formatter/XmlFormatter.php
+1 -1
View File
@@ -19,7 +19,7 @@ use HttpServer\IInterface\IFormatter;
/**
* Class XmlFormatter
* @package Snowflake\Snowflake\Http\Formatter
* @package Kiri\Kiri\Http\Formatter
*/
class XmlFormatter extends HttpService implements IFormatter
{
HttpServer/Http/HttpHeaders.php
+1 -1
View File
@@ -11,7 +11,7 @@ namespace HttpServer\Http;
/**
* Class HttpHeaders
* @package Snowflake\Snowflake\Http
* @package Kiri\Kiri\Http
*/
trait HttpHeaders
{
HttpServer/Http/HttpParams.php
+6 -6
View File
@@ -12,14 +12,14 @@ namespace HttpServer\Http;
use Exception;
use HttpServer\Exception\RequestException;
use ReflectionException;
use Snowflake\Core\Json;
use Snowflake\Core\Xml;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Core\Json;
use Kiri\Core\Xml;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
/**
* Class HttpParams
* @package Snowflake\Snowflake\Http
* @package Kiri\Kiri\Http
*/
trait HttpParams
{
@@ -204,7 +204,7 @@ trait HttpParams
$param = $this->_files[$name] ?? null;
if (!empty($param)) {
$param['class'] = File::class;
return Snowflake::createObject($param);
return Kiri::createObject($param);
}
return null;
}
HttpServer/Http/Request.php
+2 -2
View File
@@ -10,7 +10,7 @@ use HttpServer\IInterface\AuthIdentity;
use JetBrains\PhpStorm\Pure;
use Server\RequestInterface;
use Server\ServerManager;
use Snowflake\Core\Json;
use Kiri\Core\Json;
defined('REQUEST_OK') or define('REQUEST_OK', 0);
defined('REQUEST_FAIL') or define('REQUEST_FAIL', 500);
@@ -18,7 +18,7 @@ defined('REQUEST_FAIL') or define('REQUEST_FAIL', 500);
/**
* Class HttpRequest
*
* @package Snowflake\Snowflake\HttpRequest
* @package Kiri\Kiri\HttpRequest
*
* @property-read $isPost
* @property-read $isGet
HttpServer/Http/Response.php
+2 -2
View File
@@ -17,12 +17,12 @@ use HttpServer\Http\Formatter\JsonFormatter;
use HttpServer\Http\Formatter\XmlFormatter;
use HttpServer\IInterface\IFormatter;
use Server\ResponseInterface;
use Snowflake\Exception\NotFindClassException;
use Kiri\Exception\NotFindClassException;
use Swoole\Http\Response as SResponse;
/**
* Class Response
* @package Snowflake\Snowflake\Http
* @package Kiri\Kiri\Http
*/
class Response extends HttpService implements ResponseInterface
{
HttpServer/HttpFilter.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace HttpServer;
use Exception;
use Snowflake\Abstracts\BaseObject;
use Kiri\Abstracts\BaseObject;
use validator\Validator;
/**
HttpServer/IInterface/AuthIdentity.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace HttpServer\IInterface;
/**
* Interface AuthIdentity
* @package Snowflake\Snowflake\Http
* @package Kiri\Kiri\Http
*/
interface AuthIdentity
{
HttpServer/IInterface/IFormatter.php
+1 -1
View File
@@ -12,7 +12,7 @@ namespace HttpServer\IInterface;
/**
* Interface IFormatter
* @package Snowflake\Snowflake\Http\Formatter
* @package Kiri\Kiri\Http\Formatter
*/
interface IFormatter
{
HttpServer/IInterface/Middleware.php
+1 -1
View File
@@ -10,7 +10,7 @@ use HttpServer\Http\Request;
/**
* Interface IMiddleware
* @package Snowflake\Snowflake\Route
* @package Kiri\Kiri\Route
*/
interface Middleware
{
HttpServer/Route/Any.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace HttpServer\Route;
/**
* Class Any
* @package Snowflake\Snowflake\Route
* @package Kiri\Kiri\Route
*/
class Any
{
HttpServer/Route/CoreMiddleware.php
+3 -3
View File
@@ -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'));
HttpServer/Route/HandlerProviders.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace HttpServer\Route;
use Snowflake\Abstracts\BaseObject;
use Kiri\Abstracts\BaseObject;
/**
HttpServer/Route/MiddlewareManager.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Route;
use Closure;
use HttpServer\IInterface\Middleware;
use Snowflake\Abstracts\BaseObject;
use Kiri\Abstracts\BaseObject;
/**
HttpServer/Route/Node.php
+9 -9
View File
@@ -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;
}
HttpServer/Route/Router.php
+10 -10
View File
@@ -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);
HttpServer/Server.php
+8 -8
View File
@@ -14,12 +14,12 @@ use ReflectionException;
use Rpc\Service;
use Server\Constant;
use Server\ServerManager;
use Snowflake\Abstracts\Config;
use Snowflake\Error\LoggerProcess;
use Snowflake\Exception\ConfigException;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Process\Biomonitoring;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Error\LoggerProcess;
use Kiri\Exception\ConfigException;
use Kiri\Exception\NotFindClassException;
use Kiri\Process\Biomonitoring;
use Kiri\Kiri;
use Swoole\Runtime;
@@ -163,7 +163,7 @@ class Server extends HttpService
*/
private function checkPort($port): bool
{
if (Snowflake::getPlatform()->isLinux()) {
if (Kiri::getPlatform()->isLinux()) {
exec('netstat -tunlp | grep ' . $port, $output);
} else {
exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
@@ -181,7 +181,7 @@ class Server extends HttpService
public function shutdown()
{
/** @var Shutdown $shutdown */
$shutdown = Snowflake::app()->get('shutdown');
$shutdown = Kiri::app()->get('shutdown');
$shutdown->shutdown();
}
HttpServer/ServerProviders.php
+2 -2
View File
@@ -6,8 +6,8 @@ namespace HttpServer;
use Console\Console;
use Exception;
use Snowflake\Abstracts\Providers;
use Snowflake\Application;
use Kiri\Abstracts\Providers;
use Kiri\Application;
/**
* Class DatabasesProviders
HttpServer/Service/Abstracts/Server.php
+4 -4
View File
@@ -6,9 +6,9 @@ namespace HttpServer\Service\Abstracts;
use Exception;
use ReflectionException;
use Snowflake\Application;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Application;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
/**
@@ -114,7 +114,7 @@ trait Server
throw new Exception('class not found.');
}
$class = Snowflake::createObject($classPrefix, [Snowflake::app()]);
$class = Kiri::createObject($classPrefix, [Kiri::app()]);
return [$class, 'onHandler'];
}
HttpServer/Service/Http.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace HttpServer\Service;
use ReflectionException;
use Snowflake\Exception\NotFindClassException;
use Kiri\Exception\NotFindClassException;
use HttpServer\Service\Abstracts\Http as AHttp;
class Http extends AHttp
HttpServer/Service/Packet.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Service;
use HttpServer\Service\Abstracts\Tcp;
use ReflectionException;
use Snowflake\Exception\NotFindClassException;
use Kiri\Exception\NotFindClassException;
/**
* Class OnPacket
HttpServer/Service/Receive.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer\Service;
use HttpServer\Service\Abstracts\Tcp;
use ReflectionException;
use Snowflake\Exception\NotFindClassException;
use Kiri\Exception\NotFindClassException;
/**
* Class Receive
HttpServer/Service/Websocket.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace HttpServer\Service;
use ReflectionException;
use Snowflake\Exception\NotFindClassException;
use Kiri\Exception\NotFindClassException;
use HttpServer\Service\Abstracts\Websocket as HAWebsocket;
HttpServer/Shutdown.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace HttpServer;
use Exception;
use Server\ServerManager;
use Snowflake\Abstracts\Component;
use Kiri\Abstracts\Component;
/**