From efbb049824b88f907e74e56bf9f158338b3a04f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Thu, 3 Sep 2020 11:39:20 +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 --- Database/Base/BaseActiveRecord.php | 4 ++-- Database/Connection.php | 28 ++++++++++++------------ Database/DatabasesProviders.php | 2 +- Database/Db.php | 24 ++++++++++---------- http-server/Abstracts/Callback.php | 4 ++-- http-server/Application.php | 2 +- http-server/Command.php | 2 +- http-server/Controller.php | 2 +- http-server/Events/OnAfterReload.php | 2 +- http-server/Events/OnBeforeReload.php | 2 +- http-server/Events/OnClose.php | 10 ++++----- http-server/Events/OnConnect.php | 2 +- http-server/Events/OnHandshake.php | 2 +- http-server/Events/OnManagerStart.php | 2 +- http-server/Events/OnManagerStop.php | 2 +- http-server/Events/OnMessage.php | 8 +++---- http-server/Events/OnPacket.php | 2 +- http-server/Events/OnPipeMessage.php | 2 +- http-server/Events/OnReceive.php | 2 +- http-server/Events/OnRequest.php | 6 ++--- http-server/Events/OnShutdown.php | 2 +- http-server/Events/OnStart.php | 2 +- http-server/Events/OnTask.php | 2 +- http-server/Events/OnWorkerStart.php | 4 ++-- http-server/Http/Response.php | 4 ++-- http-server/Route/Handler.php | 2 +- http-server/Route/Node.php | 4 ++-- http-server/Route/Router.php | 2 +- http-server/Server.php | 14 ++++++------ http-server/Service/Abstracts/Server.php | 4 ++-- http-server/config.php | 6 ++--- system/Abstracts/Component.php | 6 ++--- system/Abstracts/Config.php | 6 ++--- system/Application.php | 2 +- system/Cache/Redis.php | 8 +++---- system/Error/ErrorHandler.php | 10 ++++----- system/Error/Logger.php | 2 +- system/Event.php | 2 +- system/Jwt/Jwt.php | 2 +- system/Pool/Pool.php | 4 ++-- system/Process/ServerInotify.php | 2 +- system/Snowflake.php | 2 +- 42 files changed, 101 insertions(+), 101 deletions(-) diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php index d217e4c7..3deb2534 100644 --- a/Database/Base/BaseActiveRecord.php +++ b/Database/Base/BaseActiveRecord.php @@ -123,7 +123,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess */ public function getLastError() { - return Snowflake::get()->getLogger()->getLastError('mysql'); + return Snowflake::app()->getLogger()->getLastError('mysql'); } /** @@ -768,7 +768,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess */ public static function setDatabaseConnect($bsName) { - return Snowflake::get()->db->get($bsName); + return Snowflake::app()->db->get($bsName); } /** diff --git a/Database/Connection.php b/Database/Connection.php index 81632917..f6dba9b4 100644 --- a/Database/Connection.php +++ b/Database/Connection.php @@ -67,7 +67,7 @@ class Connection extends Component */ public function init() { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->on(Event::RELEASE_ALL, [$this, 'disconnect']); $event->on(Event::EVENT_AFTER_REQUEST, [$this, 'clear_connection']); } @@ -83,7 +83,7 @@ class Connection extends Component } $this->beginTransaction(); - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->on(Connection::TRANSACTION_COMMIT, [$this, 'commit'], false, true); $event->on(Connection::TRANSACTION_ROLLBACK, [$this, 'rollback'], false, true); } @@ -95,7 +95,7 @@ class Connection extends Component */ public function getConnect($sql = NULL) { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; $connections->initConnections($this->cds, true, $this->maxNumber); $connections->initConnections($this->slaveConfig['cds'], false, $this->maxNumber); $connections->setTimeout($this->timeout); @@ -155,7 +155,7 @@ class Connection extends Component if (!$this->enableCache) { return null; } - return Snowflake::get()->get($this->cacheDriver); + return Snowflake::app()->get($this->cacheDriver); } /** @@ -169,7 +169,7 @@ class Connection extends Component 'username' => $this->username, 'password' => $this->password ]; - $pool = Snowflake::get()->connections; + $pool = Snowflake::app()->connections; return $pool->getConnection($config, true); } @@ -183,7 +183,7 @@ class Connection extends Component return $this->masterInstance(); } - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; return $connections->getConnection($this->slaveConfig, false); } @@ -194,7 +194,7 @@ class Connection extends Component */ public function beginTransaction() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; $connections->beginTransaction($this->cds); return $this; } @@ -205,7 +205,7 @@ class Connection extends Component */ public function inTransaction() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; return $connections->inTransaction($this->cds); } @@ -215,7 +215,7 @@ class Connection extends Component */ public function rollback() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; return $connections->rollback($this->cds); } @@ -225,7 +225,7 @@ class Connection extends Component */ public function commit() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; return $connections->commit($this->cds); } @@ -275,7 +275,7 @@ class Connection extends Component */ public function release() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; $connections->release($this->cds, true); $connections->release($this->slaveConfig['cds'], false); @@ -287,7 +287,7 @@ class Connection extends Component */ public function recovery() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; $connections->release($this->cds, true); $connections->release($this->slaveConfig['cds'], false); @@ -300,7 +300,7 @@ class Connection extends Component */ public function clear_connection() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; $connections->release($this->cds, true); $connections->release($this->slaveConfig['cds'], false); @@ -312,7 +312,7 @@ class Connection extends Component */ public function disconnect() { - $connections = Snowflake::get()->connections; + $connections = Snowflake::app()->connections; $connections->disconnect($this->cds); $connections->disconnect($this->slaveConfig['cds']); } diff --git a/Database/DatabasesProviders.php b/Database/DatabasesProviders.php index 5be011f2..1021c546 100644 --- a/Database/DatabasesProviders.php +++ b/Database/DatabasesProviders.php @@ -38,7 +38,7 @@ class DatabasesProviders extends Providers */ public function get($name) { - $application = Snowflake::get(); + $application = Snowflake::app(); if ($application->has('databases.' . $name)) { return $application->get('databases.' . $name); } diff --git a/Database/Db.php b/Database/Db.php index de97a3c3..83b377ac 100644 --- a/Database/Db.php +++ b/Database/Db.php @@ -46,7 +46,7 @@ class Db */ public static function commit() { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Connection::TRANSACTION_COMMIT); $event->offName(Connection::TRANSACTION_COMMIT); static::$isActive = false; @@ -57,7 +57,7 @@ class Db */ public static function rollback() { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Connection::TRANSACTION_ROLLBACK); $event->offName(Connection::TRANSACTION_ROLLBACK); static::$isActive = false; @@ -96,7 +96,7 @@ class Db public function get(Connection $db = NULL) { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } $query = $db->getSchema()->getQueryBuilder(); return $db->createCommand($query->getQuery($this)) @@ -120,7 +120,7 @@ class Db public function find(Connection $db = NULL) { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } $query = $db->getSchema()->getQueryBuilder(); return $db->createCommand($query->getQuery($this)) @@ -135,7 +135,7 @@ class Db public function count(Connection $db = NULL) { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } $query = $db->getSchema()->getQueryBuilder(); return $db->createCommand($query->count($this)) @@ -150,7 +150,7 @@ class Db public function exists(Connection $db = NULL) { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } $query = $db->getSchema()->getQueryBuilder(); return $db->createCommand($query->getQuery($this)) @@ -221,7 +221,7 @@ class Db public function delete($db = null) { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } $query = $db->getBuild()->builder($this); @@ -238,7 +238,7 @@ class Db public static function drop($table, $db = null) { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } return $db->createCommand('DROP TABLE ' . $table)->delete(); } @@ -253,7 +253,7 @@ class Db { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } return $db->createCommand('TRUNCATE ' . $table)->exec(); @@ -269,7 +269,7 @@ class Db { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } @@ -289,7 +289,7 @@ class Db public static function desc($table, Connection $db = NULL) { if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } if (empty($table)) { @@ -313,7 +313,7 @@ class Db } if (empty($db)) { - $db = Snowflake::get()->database; + $db = Snowflake::app()->database; } $table = [' const TABLE = \'select * from %s where REFERENCED_TABLE_NAME=%s\';']; diff --git a/http-server/Abstracts/Callback.php b/http-server/Abstracts/Callback.php index 3b75bf7f..6caf211e 100644 --- a/http-server/Abstracts/Callback.php +++ b/http-server/Abstracts/Callback.php @@ -28,7 +28,7 @@ abstract class Callback extends Application protected function clear($server, $worker_id, $message) { Timer::clearAll(); - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->offName(Event::EVENT_AFTER_REQUEST); $event->offName(Event::EVENT_BEFORE_REQUEST); @@ -36,7 +36,7 @@ abstract class Callback extends Application Snowflake::clearProcessId($server->worker_pid); - $logger = Snowflake::get()->getLogger(); + $logger = Snowflake::app()->getLogger(); $logger->write($this->_MESSAGE[$message] . $worker_id); $logger->clear(); } diff --git a/http-server/Application.php b/http-server/Application.php index 7ec41a2c..cf68b7a1 100644 --- a/http-server/Application.php +++ b/http-server/Application.php @@ -22,7 +22,7 @@ class Application extends HttpService */ protected function write($message, $category = 'app') { - $logger = Snowflake::get()->logger; + $logger = Snowflake::app()->logger; $logger->write($message, $category); $logger->insert(); } diff --git a/http-server/Command.php b/http-server/Command.php index 3c74bcb1..1fade6ca 100644 --- a/http-server/Command.php +++ b/http-server/Command.php @@ -35,7 +35,7 @@ class Command extends \Console\Command $action = $dtl->get('action', 3); /** @var Server $server */ - $server = Snowflake::get()->get('server'); + $server = Snowflake::app()->get('server'); $server->start(); } diff --git a/http-server/Controller.php b/http-server/Controller.php index f6de1e4a..f3b8647c 100644 --- a/http-server/Controller.php +++ b/http-server/Controller.php @@ -83,7 +83,7 @@ class Controller extends Application public function getRequest(): Request { if (!$this->request) { - $this->request = Snowflake::get()->request; + $this->request = Snowflake::app()->request; } return $this->request; } diff --git a/http-server/Events/OnAfterReload.php b/http-server/Events/OnAfterReload.php index 2efd67f9..0eb21971 100644 --- a/http-server/Events/OnAfterReload.php +++ b/http-server/Events/OnAfterReload.php @@ -26,7 +26,7 @@ class OnAfterReload extends Callback */ public function onHandler(Server $server) { - $event = Snowflake::get()->getEvent(); + $event = Snowflake::app()->getEvent(); if (!$event->exists(Event::SERVER_AFTER_RELOAD)) { return; } diff --git a/http-server/Events/OnBeforeReload.php b/http-server/Events/OnBeforeReload.php index f41cf7ef..b63de94f 100644 --- a/http-server/Events/OnBeforeReload.php +++ b/http-server/Events/OnBeforeReload.php @@ -23,7 +23,7 @@ class OnBeforeReload extends Callback */ public function onHandler(Server $server) { - $event = Snowflake::get()->getEvent(); + $event = Snowflake::app()->getEvent(); if (!$event->exists(Event::SERVER_BEFORE_RELOAD)) { return; } diff --git a/http-server/Events/OnClose.php b/http-server/Events/OnClose.php index 07e6f300..ae16fb18 100644 --- a/http-server/Events/OnClose.php +++ b/http-server/Events/OnClose.php @@ -38,10 +38,10 @@ class OnClose extends Callback } catch (\Throwable $exception) { $this->addError($exception->getMessage()); } finally { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Event::RELEASE_ALL); - $logger = Snowflake::get()->getLogger(); + $logger = Snowflake::app()->getLogger(); $logger->insert(); } } @@ -59,13 +59,13 @@ class OnClose extends Callback if (!$server->isEstablished($fd)) { return [null, null]; } - $manager = Snowflake::get()->annotation->get('websocket'); + $manager = Snowflake::app()->annotation->get('websocket'); $name = $manager->getName(AWebsocket::CLOSE); } else if ($server instanceof HServer) { - $manager = Snowflake::get()->annotation->get('http'); + $manager = Snowflake::app()->annotation->get('http'); $name = $manager->getName(Annotation::CLOSE); } else { - $manager = Snowflake::get()->annotation->get('tcp'); + $manager = Snowflake::app()->annotation->get('tcp'); $name = $manager->getName(Tcp::CLOSE); } return [$manager, $name]; diff --git a/http-server/Events/OnConnect.php b/http-server/Events/OnConnect.php index 607cd5ad..9dc1bb72 100644 --- a/http-server/Events/OnConnect.php +++ b/http-server/Events/OnConnect.php @@ -27,7 +27,7 @@ class OnConnect extends Callback */ public function onHandler(\Swoole\Server $server, int $fd, int $reactorId) { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; if (!$event->exists(Event::RECEIVE_CONNECTION)) { return; } diff --git a/http-server/Events/OnHandshake.php b/http-server/Events/OnHandshake.php index 2c7b2b24..80d7d3b8 100644 --- a/http-server/Events/OnHandshake.php +++ b/http-server/Events/OnHandshake.php @@ -53,7 +53,7 @@ class OnHandshake extends Callback } /** @var AWebsocket $manager */ - $manager = Snowflake::get()->annotation->get('websocket'); + $manager = Snowflake::app()->annotation->get('websocket'); if ($manager->has($manager->getName(AWebsocket::HANDSHAKE))) { $manager->runWith($manager->getName(AWebsocket::HANDSHAKE), [$request, $response]); } else { diff --git a/http-server/Events/OnManagerStart.php b/http-server/Events/OnManagerStart.php index 817ff9e0..308e8964 100644 --- a/http-server/Events/OnManagerStart.php +++ b/http-server/Events/OnManagerStart.php @@ -21,7 +21,7 @@ class OnManagerStart extends Callback $this->debug('manager start.'); Snowflake::setProcessId($server->manager_pid); - $events = Snowflake::get()->event; + $events = Snowflake::app()->event; if ($events->exists(Event::SERVER_MANAGER_START)) { $events->trigger(Event::SERVER_MANAGER_START, null, $server); } diff --git a/http-server/Events/OnManagerStop.php b/http-server/Events/OnManagerStop.php index 94f57938..f7f730aa 100644 --- a/http-server/Events/OnManagerStop.php +++ b/http-server/Events/OnManagerStop.php @@ -24,7 +24,7 @@ class OnManagerStop extends Callback { $this->warning('manager stop.'); - $events = Snowflake::get()->event; + $events = Snowflake::app()->event; if ($events->exists(Event::SERVER_MANAGER_STOP)) { $events->trigger(Event::SERVER_MANAGER_STOP, [$server]); } diff --git a/http-server/Events/OnMessage.php b/http-server/Events/OnMessage.php index 4a3b88a4..10b0e6c1 100644 --- a/http-server/Events/OnMessage.php +++ b/http-server/Events/OnMessage.php @@ -29,7 +29,7 @@ class OnMessage extends Callback if ($frame->opcode == 0x08) { return; } - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; if ($event->exists(Event::SERVER_MESSAGE)) { $event->trigger(Event::SERVER_MESSAGE, [$server, $frame]); } else { @@ -37,7 +37,7 @@ class OnMessage extends Callback } /** @var AWebsocket $manager */ - $manager = Snowflake::get()->annotation->get('websocket'); + $manager = Snowflake::app()->annotation->get('websocket'); if (!isset($frame->data['route'])) { throw new \Exception('Fromat errr.'); } @@ -47,9 +47,9 @@ class OnMessage extends Callback $this->addError($exception->getMessage(), 'websocket'); $server->send($frame->fd, $exception->getMessage()); } finally { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Event::EVENT_AFTER_REQUEST); - Snowflake::get()->logger->insert(); + Snowflake::app()->logger->insert(); } } diff --git a/http-server/Events/OnPacket.php b/http-server/Events/OnPacket.php index c2a7a0e5..d0f41842 100644 --- a/http-server/Events/OnPacket.php +++ b/http-server/Events/OnPacket.php @@ -78,7 +78,7 @@ class OnPacket extends Callback $client[] = $this->pack(['message' => $exception->getMessage()]); return $server->sendto(...$client); } finally { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Event::SERVER_WORKER_STOP); } } diff --git a/http-server/Events/OnPipeMessage.php b/http-server/Events/OnPipeMessage.php index 6e84e620..af7e0562 100644 --- a/http-server/Events/OnPipeMessage.php +++ b/http-server/Events/OnPipeMessage.php @@ -28,7 +28,7 @@ class OnPipeMessage extends Callback public function onHandler(Server $server, int $src_worker_id, $message) { // TODO: Implement onHandler() method. - $events = Snowflake::get()->getEvent(); + $events = Snowflake::app()->getEvent(); if (!$events->exists(Event::PIPE_MESSAGE)) { return; } diff --git a/http-server/Events/OnReceive.php b/http-server/Events/OnReceive.php index 434d8000..efac27f1 100644 --- a/http-server/Events/OnReceive.php +++ b/http-server/Events/OnReceive.php @@ -78,7 +78,7 @@ class OnReceive extends Callback $client[] = $this->pack(['message' => $exception->getMessage()]); return $server->send(...$client); } finally { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Event::SERVER_WORKER_STOP); } } diff --git a/http-server/Events/OnRequest.php b/http-server/Events/OnRequest.php index 06241f0d..39e1906b 100644 --- a/http-server/Events/OnRequest.php +++ b/http-server/Events/OnRequest.php @@ -39,11 +39,11 @@ class OnRequest extends Callback if ($sRequest->is('favicon.ico')) { return $sResponse->send($sRequest->isNotFound(), 200); } - $sResponse->send(Snowflake::get()->router->dispatch(), 200); + $sResponse->send(Snowflake::app()->router->dispatch(), 200); } catch (Error | \Throwable $exception) { $this->sendErrorMessage($sResponse ?? null, $exception, $response); } finally { - $events = Snowflake::get()->getEvent(); + $events = Snowflake::app()->getEvent(); if (!$events->exists(Event::EVENT_AFTER_REQUEST)) { return; } @@ -85,7 +85,7 @@ class OnRequest extends Callback $code = $exception->getCode() ?? 500; $trance = array_slice($exception->getTrace(), 0, 10); - Snowflake::get()->logger->write(print_r($trance, true), 'exception'); + Snowflake::app()->logger->write(print_r($trance, true), 'exception'); return JSON::to($code, $errorInfo['message']); } diff --git a/http-server/Events/OnShutdown.php b/http-server/Events/OnShutdown.php index 3b10f124..97a7f73b 100644 --- a/http-server/Events/OnShutdown.php +++ b/http-server/Events/OnShutdown.php @@ -33,7 +33,7 @@ class OnShutdown extends Callback public function onHandler(Server $server) { $this->system_mail('server shutdown~'); - $event = Snowflake::get()->getEvent(); + $event = Snowflake::app()->getEvent(); if (!$event->exists(Event::SERVER_SHUTDOWN)) { return; } diff --git a/http-server/Events/OnStart.php b/http-server/Events/OnStart.php index c25bab9b..5549dfa6 100644 --- a/http-server/Events/OnStart.php +++ b/http-server/Events/OnStart.php @@ -21,7 +21,7 @@ class OnStart extends Callback $time = storage('socket.sock'); Snowflake::writeFile($time, $server->master_pid); - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; if ($event->exists(Event::SERVER_EVENT_START)) { $event->trigger(Event::SERVER_EVENT_START, null, $server); } diff --git a/http-server/Events/OnTask.php b/http-server/Events/OnTask.php index 4d7062dc..503e640f 100644 --- a/http-server/Events/OnTask.php +++ b/http-server/Events/OnTask.php @@ -108,7 +108,7 @@ class OnTask extends Callback $finish['info'] = $this->format($exception); $this->error($exception, 'Task'); } finally { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Event::RELEASE_ALL); Timer::clearAll(); } diff --git a/http-server/Events/OnWorkerStart.php b/http-server/Events/OnWorkerStart.php index 661365b4..aace07d3 100644 --- a/http-server/Events/OnWorkerStart.php +++ b/http-server/Events/OnWorkerStart.php @@ -52,13 +52,13 @@ class OnWorkerStart extends Callback { try { $this->debug(sprintf('Worker #%d is start.....', $worker_id)); - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; if (!$event->exists(Event::SERVER_WORKER_START)) { return; } $event->trigger(Event::SERVER_WORKER_START); } catch (\Throwable $exception) { - Snowflake::get()->getLogger()->write($exception->getMessage(), 'worker'); + Snowflake::app()->getLogger()->write($exception->getMessage(), 'worker'); } } diff --git a/http-server/Http/Response.php b/http-server/Http/Response.php index 58aa725e..e740d165 100644 --- a/http-server/Http/Response.php +++ b/http-server/Http/Response.php @@ -153,7 +153,7 @@ class Response extends Application $string .= 'Command Success!' . PHP_EOL; echo $string; - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger('CONSOLE_END'); return 'ok'; @@ -198,7 +198,7 @@ class Response extends Application */ public static function create($response = null) { - $ciResponse = Snowflake::get()->clone('response'); + $ciResponse = Snowflake::app()->clone('response'); $ciResponse->response = $response; $ciResponse->startTime = microtime(true); $ciResponse->format = self::JSON; diff --git a/http-server/Route/Handler.php b/http-server/Route/Handler.php index b108046e..b7467c02 100644 --- a/http-server/Route/Handler.php +++ b/http-server/Route/Handler.php @@ -24,7 +24,7 @@ class Handler extends Application */ public function __construct() { - $this->router = Snowflake::get()->router; + $this->router = Snowflake::app()->router; parent::__construct([]); } diff --git a/http-server/Route/Node.php b/http-server/Route/Node.php index d2829c12..865e7d84 100644 --- a/http-server/Route/Node.php +++ b/http-server/Route/Node.php @@ -150,7 +150,7 @@ class Node extends Application } /** @var Annotation $annotation */ - $annotation = Snowflake::get()->annotation->get('http'); + $annotation = Snowflake::app()->annotation->get('http'); if (!empty($annotations = $annotation->getAnnotation(Annotation::class))) { $this->_interceptors = $annotation->read($reflect, $action, $annotations); } @@ -273,7 +273,7 @@ class Node extends Application */ public function limits(int $limit, int $duration = 60, bool $isBindConsumer = false) { - $limits = Snowflake::get()->getLimits(); + $limits = Snowflake::app()->getLimits(); $limits->addLimits($this->path, $limit, $duration, $isBindConsumer); return $this; } diff --git a/http-server/Route/Router.php b/http-server/Route/Router.php index 4eda5614..5cc44b27 100644 --- a/http-server/Route/Router.php +++ b/http-server/Route/Router.php @@ -472,7 +472,7 @@ class Router extends Application implements RouterInterface $prefix = APP_PATH . 'app/Http/'; /** @var Annotation $annotation */ - $annotation = Snowflake::get()->annotation; + $annotation = Snowflake::app()->annotation; $annotation->register('http', Annotation::class); $annotation = $annotation->get('http'); diff --git a/http-server/Server.php b/http-server/Server.php index 607326bc..2ea52fd2 100644 --- a/http-server/Server.php +++ b/http-server/Server.php @@ -68,7 +68,7 @@ class Server extends Application */ public function initCore(array $configs) { - $annotation = Snowflake::get()->annotation; + $annotation = Snowflake::app()->annotation; $annotation->register('tcp', Tcp::class); $annotation->register('http', Annotation::class); $annotation->register('websocket', AWebsocket::class); @@ -132,7 +132,7 @@ class Server extends Application return; } - $application = Snowflake::get(); + $application = Snowflake::app(); foreach ($processes as $name => $process) { $class = Snowflake::createObject($process); if (!method_exists($class, 'onHandler')) { @@ -190,7 +190,7 @@ class Server extends Application if (!is_array($config['events'])) { return; } - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; foreach ($config['events'] as $name => $_event) { $event->on($name, $_event); } @@ -284,8 +284,8 @@ class Server extends Application */ public function onLoadHttpHandler() { - $event = Snowflake::get()->getEvent(); - $router = Snowflake::get()->getRouter(); + $event = Snowflake::app()->getEvent(); + $router = Snowflake::app()->getRouter(); if ($event->exists(Event::SERVER_WORKER_START, [$router, 'loadRouterSetting'])) { return; } @@ -299,11 +299,11 @@ class Server extends Application public function onLoadWebsocketHandler() { /** @var AWebsocket $websocket */ - $websocket = Snowflake::get()->annotation->register('websocket', AWebsocket::class); + $websocket = Snowflake::app()->annotation->register('websocket', AWebsocket::class); $websocket->namespace = 'App\\Websocket'; $websocket->path = APP_PATH . 'app/Websocket'; - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; if ($event->exists(Event::SERVER_WORKER_START, [$websocket, 'registration_notes'])) { return; } diff --git a/http-server/Service/Abstracts/Server.php b/http-server/Service/Abstracts/Server.php index c8192ede..b41221a4 100644 --- a/http-server/Service/Abstracts/Server.php +++ b/http-server/Service/Abstracts/Server.php @@ -26,7 +26,7 @@ trait Server */ public function __construct($host, $port = null, $mode = null, $sock_type = null) { - $this->application = Snowflake::get(); + $this->application = Snowflake::app(); parent::__construct($host, $port, $mode, $sock_type); } @@ -89,7 +89,7 @@ trait Server if (!class_exists($classPrefix)) { throw new Exception('class not found.'); } - $class = Snowflake::createObject($classPrefix, [Snowflake::get()]); + $class = Snowflake::createObject($classPrefix, [Snowflake::app()]); return [$class, 'onHandler']; } diff --git a/http-server/config.php b/http-server/config.php index e0f0c5ab..c2676b12 100644 --- a/http-server/config.php +++ b/http-server/config.php @@ -21,7 +21,7 @@ return [ ], 'events' => [ Event::SERVER_WORKER_START => function () { - $router = Snowflake::get()->router; + $router = Snowflake::app()->router; $router->loadRouterSetting(); }, ] @@ -81,7 +81,7 @@ return [ 'events' => [ Event::SERVER_WORKER_START => function () { $path = APP_PATH . 'app/Websocket'; - $websocket = Snowflake::get()->annotation->websocket; + $websocket = Snowflake::app()->annotation->websocket; $websocket->registration_notes($path, 'App\\Sockets\\'); }, Event::SERVER_HANDSHAKE => function (Request $request, Response $response) { @@ -94,7 +94,7 @@ return [ if (is_null($json = json_decode($frame->data, true))) { return $server->push($frame->fd, 'format error~'); } - $websocket = Snowflake::get()->annotation->websocket; + $websocket = Snowflake::app()->annotation->websocket; if ($websocket->has($json['path'])) { return $websocket->runWith($json['path'], [$frame->fd, $json]); } else { diff --git a/system/Abstracts/Component.php b/system/Abstracts/Component.php index f7d02032..f4c0c6f7 100644 --- a/system/Abstracts/Component.php +++ b/system/Abstracts/Component.php @@ -74,7 +74,7 @@ class Component extends BaseObject */ public function trigger($name, $event = null, $params = [], $isRemove = false) { - $aEvents = Snowflake::get()->event; + $aEvents = Snowflake::app()->event; if (isset($this->_events[$name])) { $events = $this->_events[$name]; foreach ($events as $key => $_event) { @@ -98,7 +98,7 @@ class Component extends BaseObject */ public function off($name, $handler = NULL) { - $aEvents = Snowflake::get()->event; + $aEvents = Snowflake::app()->event; if (!isset($this->_events[$name])) { return $aEvents->of($name, $handler); } @@ -125,7 +125,7 @@ class Component extends BaseObject public function offAll() { $this->_events = []; - $aEvents = Snowflake::get()->event; + $aEvents = Snowflake::app()->event; $aEvents->clean(); } diff --git a/system/Abstracts/Config.php b/system/Abstracts/Config.php index 02a4c512..18884629 100644 --- a/system/Abstracts/Config.php +++ b/system/Abstracts/Config.php @@ -33,7 +33,7 @@ class Config extends Component */ public static function get($key, $try = FALSE, $default = null) { - $config = Snowflake::get()->config; + $config = Snowflake::app()->config; if (strpos($key, '.') === false) { if (isset($config->data[$key])) { @@ -74,7 +74,7 @@ class Config extends Component */ public static function set($key, $value) { - $config = Snowflake::get()->config; + $config = Snowflake::app()->config; return $config->data[$key] = $value; } @@ -85,7 +85,7 @@ class Config extends Component */ public static function has($key, $must_not_null = false) { - $config = Snowflake::get()->config; + $config = Snowflake::app()->config; if (!isset($config->data[$key])) { return false; } diff --git a/system/Application.php b/system/Application.php index 84b31f2a..91c2d10b 100644 --- a/system/Application.php +++ b/system/Application.php @@ -67,7 +67,7 @@ class Application extends BaseApplication */ public function start() { - $manager = Snowflake::get()->server; + $manager = Snowflake::app()->server; $manager->start(); } diff --git a/system/Cache/Redis.php b/system/Cache/Redis.php index 651b256d..529d12bd 100644 --- a/system/Cache/Redis.php +++ b/system/Cache/Redis.php @@ -264,7 +264,7 @@ class Redis extends Component */ public function init() { - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->on(Event::RELEASE_ALL, [$this, 'destroy']); $event->on(Event::EVENT_AFTER_REQUEST, [$this, 'release']); } @@ -296,7 +296,7 @@ class Redis extends Component */ public function release() { - $connections = Snowflake::get()->pool->redis; + $connections = Snowflake::app()->pool->redis; $connections->release($this->get_config(), true); } @@ -305,7 +305,7 @@ class Redis extends Component */ public function destroy() { - $connections = Snowflake::get()->pool->redis; + $connections = Snowflake::app()->pool->redis; $connections->destroy($this->get_config(), true); } @@ -315,7 +315,7 @@ class Redis extends Component */ public function proxy() { - $connections = Snowflake::get()->pool->redis; + $connections = Snowflake::app()->pool->redis; $config = $this->get_config(); $name = $config['host'] . ':' . $config['prefix'] . ':' . $config['databases']; diff --git a/system/Error/ErrorHandler.php b/system/Error/ErrorHandler.php index b1a77d4b..14091e1f 100644 --- a/system/Error/ErrorHandler.php +++ b/system/Error/ErrorHandler.php @@ -75,7 +75,7 @@ class ErrorHandler extends Component implements ErrorInterface { $this->category = 'exception'; - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Event::RELEASE_ALL); $this->sendError($exception->getMessage(), $exception->getFile(), $exception->getLine()); @@ -101,9 +101,9 @@ class ErrorHandler extends Component implements ErrorInterface $data = JSON::to(500, 'Error : ' . $error[1], $path); - Snowflake::get()->getLogger()->error($data, 'error'); + Snowflake::app()->getLogger()->error($data, 'error'); - $event = Snowflake::get()->event; + $event = Snowflake::app()->event; $event->trigger(Event::RELEASE_ALL); throw new \ErrorException($error[1], $error[0], 1, $error[2], $error[3]); @@ -123,7 +123,7 @@ class ErrorHandler extends Component implements ErrorInterface $data = JSON::to($code, $this->category . ': ' . $message, $path); - Snowflake::get()->getLogger()->trance($data, $this->category); + Snowflake::app()->getLogger()->trance($data, $this->category); return response()->send($data); } @@ -154,6 +154,6 @@ class ErrorHandler extends Component implements ErrorInterface */ public function writer($message, $category = 'app') { - Snowflake::get()->getLogger()->debug($message, $category); + Snowflake::app()->getLogger()->debug($message, $category); } } diff --git a/system/Error/Logger.php b/system/Error/Logger.php index 1b64c100..ab3184d9 100644 --- a/system/Error/Logger.php +++ b/system/Error/Logger.php @@ -109,7 +109,7 @@ class Logger extends Component public function print_r($message, $category = '') { /** @var Process $logger */ - $logger = Snowflake::get()->logger; + $logger = Snowflake::app()->logger; $logger->write(JSON::encode([$message, $category])); } diff --git a/system/Event.php b/system/Event.php index f58713e9..a5f21df9 100644 --- a/system/Event.php +++ b/system/Event.php @@ -63,7 +63,7 @@ class Event extends BaseObject $this->_events[$name] = []; } if ($callback instanceof \Closure) { - $callback = \Closure::bind($callback, Snowflake::get()); + $callback = \Closure::bind($callback, Snowflake::app()); } else if (is_array($callback) && is_string($callback[0])) { if (!class_exists($callback[0])) { throw new \Exception('Undefined callback class.'); diff --git a/system/Jwt/Jwt.php b/system/Jwt/Jwt.php index 3468ad46..1bc4e161 100644 --- a/system/Jwt/Jwt.php +++ b/system/Jwt/Jwt.php @@ -431,7 +431,7 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY= */ private function getRedis() { - return Snowflake::get()->getRedis(); + return Snowflake::app()->getRedis(); } } diff --git a/system/Pool/Pool.php b/system/Pool/Pool.php index 2ae4aab7..ccdeb8ad 100644 --- a/system/Pool/Pool.php +++ b/system/Pool/Pool.php @@ -20,7 +20,7 @@ class Pool extends \Snowflake\Abstracts\Pool */ public function getRedis() { - return Snowflake::get()->redis_connections; + return Snowflake::app()->redis_connections; } /** @@ -28,7 +28,7 @@ class Pool extends \Snowflake\Abstracts\Pool */ public function getDb() { - return Snowflake::get()->connections; + return Snowflake::app()->connections; } } diff --git a/system/Process/ServerInotify.php b/system/Process/ServerInotify.php index 67f75e6a..f5f5072b 100644 --- a/system/Process/ServerInotify.php +++ b/system/Process/ServerInotify.php @@ -173,7 +173,7 @@ class ServerInotify extends Process public function trigger_reload() { /** @var Server $server */ - $server = Snowflake::get()->get('server')->getServer(); + $server = Snowflake::app()->get('server')->getServer(); $server->reload(); } diff --git a/system/Snowflake.php b/system/Snowflake.php index 95bbe54d..b4a3e9bd 100644 --- a/system/Snowflake.php +++ b/system/Snowflake.php @@ -34,7 +34,7 @@ class Snowflake /** * @return mixed */ - public static function get() + public static function app() { return static::$service; }