From 7428b69c36efcf969b6a114c42b5025ec35b2556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Thu, 3 Sep 2020 00:15:57 +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 --- .../Console => Console}/AbstractConsole.php | 4 +- {system/Console => Console}/Application.php | 4 +- {system/Console => Console}/Command.php | 4 +- .../Console => Console}/CommandInterface.php | 4 +- {system/Console => Console}/Console.php | 4 +- Console/ConsoleProviders.php | 27 +++++++++++ .../Console => Console}/DefaultCommand.php | 4 +- {system/Console => Console}/Dtl.php | 4 +- {system/Console => Console}/ICommand.php | 2 +- {system/Console => Console}/Kernel.php | 2 +- composer.json | 1 + http-server/Command.php | 42 +++++++++++++++++ http-server/Server.php | 21 +++++++++ http-server/ServerProviders.php | 4 ++ system/Abstracts/BaseApplication.php | 13 ----- system/Abstracts/Provider.php | 14 ++++++ system/Abstracts/Providers.php | 2 +- system/Application.php | 9 ++-- system/Processes.php | 47 ------------------- 19 files changed, 132 insertions(+), 80 deletions(-) rename {system/Console => Console}/AbstractConsole.php (97%) rename {system/Console => Console}/Application.php (96%) rename {system/Console => Console}/Command.php (88%) rename {system/Console => Console}/CommandInterface.php (66%) rename {system/Console => Console}/Console.php (56%) create mode 100644 Console/ConsoleProviders.php rename {system/Console => Console}/DefaultCommand.php (93%) rename {system/Console => Console}/Dtl.php (97%) rename {system/Console => Console}/ICommand.php (68%) rename {system/Console => Console}/Kernel.php (65%) create mode 100644 http-server/Command.php create mode 100644 system/Abstracts/Provider.php delete mode 100644 system/Processes.php diff --git a/system/Console/AbstractConsole.php b/Console/AbstractConsole.php similarity index 97% rename from system/Console/AbstractConsole.php rename to Console/AbstractConsole.php index e4f8ea3c..60d16c1b 100644 --- a/system/Console/AbstractConsole.php +++ b/Console/AbstractConsole.php @@ -1,7 +1,7 @@ set('console', ['class' => \Console\Application::class]); + } + + +} diff --git a/system/Console/DefaultCommand.php b/Console/DefaultCommand.php similarity index 93% rename from system/Console/DefaultCommand.php rename to Console/DefaultCommand.php index d2ac750b..f45325e7 100644 --- a/system/Console/DefaultCommand.php +++ b/Console/DefaultCommand.php @@ -1,11 +1,11 @@ get('action', 3); + + /** @var Server $server */ + $server = Snowflake::get()->get('server'); + $server->start(); + } + +} diff --git a/http-server/Server.php b/http-server/Server.php index 451e7bc2..981613fd 100644 --- a/http-server/Server.php +++ b/http-server/Server.php @@ -60,6 +60,16 @@ class Server extends Application private $baseServer; + /** + * @throws ConfigException + * @throws Exception + */ + public function init() + { + $this->initCore(Config::get('servers', true)); + } + + /** * @param array $configs * @return Http|Packet|Receive|WebSocket @@ -86,6 +96,17 @@ class Server extends Application } + /** + * @return mixed + * + * start server + */ + public function start() + { + return $this->baseServer->start(); + } + + /** * @param bool $isEnable */ diff --git a/http-server/ServerProviders.php b/http-server/ServerProviders.php index b0d2e725..4fef8cfc 100644 --- a/http-server/ServerProviders.php +++ b/http-server/ServerProviders.php @@ -29,5 +29,9 @@ class ServerProviders extends Providers $application->set('server', [ 'class' => Server::class ]); + + /** @var \Console\Application $console */ + $console = $application->get('console'); + $console->register(Command::class); } } diff --git a/system/Abstracts/BaseApplication.php b/system/Abstracts/BaseApplication.php index a41bef6b..09a1be37 100644 --- a/system/Abstracts/BaseApplication.php +++ b/system/Abstracts/BaseApplication.php @@ -25,7 +25,6 @@ use Snowflake\Exception\InitException; use Snowflake\Jwt\Jwt; use Snowflake\Pool\Connection; use Snowflake\Pool\RedisClient; -use Snowflake\Processes; use Snowflake\Snowflake; use Snowflake\Event; use Snowflake\Pool\Pool as SPool; @@ -38,7 +37,6 @@ use Database\DatabasesProviders; * @property Annotation $annotation * @property Event $event * @property Router $router - * @property Processes $processes * @property SPool $pool * @property Server $server * @property DatabasesProviders $db @@ -239,16 +237,6 @@ abstract class BaseApplication extends Service } - /** - * @return Processes - * @throws ComponentException - */ - public function getProcesses() - { - return $this->get('processes'); - } - - /** * @return Annotation * @throws ComponentException @@ -346,7 +334,6 @@ abstract class BaseApplication extends Service 'error' => ['class' => ErrorHandler::class], 'event' => ['class' => Event::class], 'annotation' => ['class' => Annotation::class], - 'processes' => ['class' => Processes::class], 'connections' => ['class' => Connection::class], 'redis_connections' => ['class' => RedisClient::class], 'pool' => ['class' => SPool::class], diff --git a/system/Abstracts/Provider.php b/system/Abstracts/Provider.php new file mode 100644 index 00000000..f5729b45 --- /dev/null +++ b/system/Abstracts/Provider.php @@ -0,0 +1,14 @@ +import(ConsoleProviders::class); $this->import(DatabasesProviders::class); $this->import(ServerProviders::class); } @@ -64,9 +67,9 @@ class Application extends BaseApplication */ public function start() { - $process = Snowflake::get()->processes; - $process->initCore(); - $process->start(); + /** @var Server $manager */ + $manager = Snowflake::get()->get('server'); + $manager->start(); } diff --git a/system/Processes.php b/system/Processes.php deleted file mode 100644 index 06dc7238..00000000 --- a/system/Processes.php +++ /dev/null @@ -1,47 +0,0 @@ -get('server'); - - $serverConfig = Config::get('servers', true); - - return $manager->initCore($serverConfig); - } - - - /** - * @throws Exception - */ - public function start() - { - $server = $this->initCore(); - $server->start(); - } -}