From 575f4b8520c10947b07d1a92564b61c0bca027d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 24 Aug 2021 18:10:07 +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 --- composer.json | 12 ++++++------ {System => core}/Abstracts/BaseApplication.php | 0 {System => core}/Abstracts/BaseGoto.php | 0 {System => core}/Abstracts/BaseObject.php | 0 {System => core}/Abstracts/Command.php | 0 {System => core}/Abstracts/Component.php | 0 {System => core}/Abstracts/Config.php | 0 {System => core}/Abstracts/Configure.php | 0 {System => core}/Abstracts/IListener.php | 0 {System => core}/Abstracts/Input.php | 0 {System => core}/Abstracts/Kernel.php | 0 {System => core}/Abstracts/Listener.php | 0 {System => core}/Abstracts/Provider.php | 0 {System => core}/Abstracts/Providers.php | 0 {System => core}/Abstracts/TraitApplication.php | 0 {System => core}/Application.php | 0 {System => core}/AspectManager.php | 0 {System => core}/Async.php | 0 {System => core}/Cache/Base/Redis.php | 0 {System => core}/Cache/File.php | 0 {System => core}/Cache/ICache.php | 0 {System => core}/Cache/Redis.php | 0 {System => core}/Core/ArrayAccess.php | 0 {System => core}/Core/DateFormat.php | 0 {System => core}/Core/Dtl.php | 0 {System => core}/Core/Help.php | 0 {System => core}/Core/Json.php | 0 {System => core}/Core/Number.php | 0 {System => core}/Core/Reader.php | 0 {System => core}/Core/Str.php | 0 {System => core}/Core/Xml.php | 0 {System => core}/Crontab/Crontab.php | 0 {System => core}/Crontab/CrontabInterface.php | 0 {System => core}/Crontab/CrontabProviders.php | 0 {System => core}/Crontab/DefaultCrontab.php | 0 {System => core}/Crontab/Producer.php | 0 {System => core}/Crontab/Zookeeper.php | 0 {System => core}/Di/Attributes.php | 0 {System => core}/Di/Container.php | 0 {System => core}/Di/ContainerInterface.php | 0 {System => core}/Di/LocalService.php | 0 {System => core}/Environmental.php | 0 {System => core}/Error/ErrorHandler.php | 0 {System => core}/Error/ErrorInterface.php | 0 {System => core}/Error/Logger.php | 0 {System => core}/Error/LoggerAspect.php | 0 {System => core}/Error/LoggerProcess.php | 0 {System => core}/Event.php | 0 {System => core}/Events/EventDispatch.php | 0 {System => core}/Events/EventInterface.php | 0 {System => core}/Events/EventProvider.php | 0 {System => core}/Events/EventProviders.php | 0 {System => core}/Events/StoppableEventInterface.php | 0 {System => core}/Events/Struct.php | 0 {System => core}/Exception/AuthException.php | 0 {System => core}/Exception/ComponentException.php | 0 {System => core}/Exception/ConfigException.php | 0 {System => core}/Exception/InitException.php | 0 {System => core}/Exception/NotFindClassException.php | 0 .../Exception/NotFindPropertyException.php | 0 {System => core}/Exception/RedisConnectException.php | 0 .../FileListen/FileChangeCustomProcess.php | 0 {System => core}/FileListen/Inotify.php | 0 {System => core}/FileListen/Scaner.php | 0 {System => core}/IAspect.php | 0 {System => core}/IProxy.php | 0 {System => core}/Jwt/JWTAuthMiddleware.php | 0 {System => core}/Jwt/JWTAuthTokenException.php | 0 {System => core}/Jwt/Jwt.php | 0 {System => core}/Jwt/JwtHelper.php | 0 {System => core}/Kiri.php | 0 {System => core}/Pool/Alias.php | 0 {System => core}/Pool/Connection.php | 0 {System => core}/Pool/Helper/QueueInterface.php | 0 {System => core}/Pool/Helper/SplQueue.php | 0 {System => core}/Pool/Pool.php | 0 {System => core}/Pool/Redis.php | 0 {System => core}/Pool/StopHeartbeatCheck.php | 0 {System => core}/Proxy.php | 0 {System => core}/Runtime.php | 0 80 files changed, 6 insertions(+), 6 deletions(-) rename {System => core}/Abstracts/BaseApplication.php (100%) rename {System => core}/Abstracts/BaseGoto.php (100%) rename {System => core}/Abstracts/BaseObject.php (100%) rename {System => core}/Abstracts/Command.php (100%) rename {System => core}/Abstracts/Component.php (100%) rename {System => core}/Abstracts/Config.php (100%) rename {System => core}/Abstracts/Configure.php (100%) rename {System => core}/Abstracts/IListener.php (100%) rename {System => core}/Abstracts/Input.php (100%) rename {System => core}/Abstracts/Kernel.php (100%) rename {System => core}/Abstracts/Listener.php (100%) rename {System => core}/Abstracts/Provider.php (100%) rename {System => core}/Abstracts/Providers.php (100%) rename {System => core}/Abstracts/TraitApplication.php (100%) rename {System => core}/Application.php (100%) rename {System => core}/AspectManager.php (100%) rename {System => core}/Async.php (100%) rename {System => core}/Cache/Base/Redis.php (100%) rename {System => core}/Cache/File.php (100%) rename {System => core}/Cache/ICache.php (100%) rename {System => core}/Cache/Redis.php (100%) rename {System => core}/Core/ArrayAccess.php (100%) rename {System => core}/Core/DateFormat.php (100%) rename {System => core}/Core/Dtl.php (100%) rename {System => core}/Core/Help.php (100%) rename {System => core}/Core/Json.php (100%) rename {System => core}/Core/Number.php (100%) rename {System => core}/Core/Reader.php (100%) rename {System => core}/Core/Str.php (100%) rename {System => core}/Core/Xml.php (100%) rename {System => core}/Crontab/Crontab.php (100%) rename {System => core}/Crontab/CrontabInterface.php (100%) rename {System => core}/Crontab/CrontabProviders.php (100%) rename {System => core}/Crontab/DefaultCrontab.php (100%) rename {System => core}/Crontab/Producer.php (100%) rename {System => core}/Crontab/Zookeeper.php (100%) rename {System => core}/Di/Attributes.php (100%) rename {System => core}/Di/Container.php (100%) rename {System => core}/Di/ContainerInterface.php (100%) rename {System => core}/Di/LocalService.php (100%) rename {System => core}/Environmental.php (100%) rename {System => core}/Error/ErrorHandler.php (100%) rename {System => core}/Error/ErrorInterface.php (100%) rename {System => core}/Error/Logger.php (100%) rename {System => core}/Error/LoggerAspect.php (100%) rename {System => core}/Error/LoggerProcess.php (100%) rename {System => core}/Event.php (100%) rename {System => core}/Events/EventDispatch.php (100%) rename {System => core}/Events/EventInterface.php (100%) rename {System => core}/Events/EventProvider.php (100%) rename {System => core}/Events/EventProviders.php (100%) rename {System => core}/Events/StoppableEventInterface.php (100%) rename {System => core}/Events/Struct.php (100%) rename {System => core}/Exception/AuthException.php (100%) rename {System => core}/Exception/ComponentException.php (100%) rename {System => core}/Exception/ConfigException.php (100%) rename {System => core}/Exception/InitException.php (100%) rename {System => core}/Exception/NotFindClassException.php (100%) rename {System => core}/Exception/NotFindPropertyException.php (100%) rename {System => core}/Exception/RedisConnectException.php (100%) rename {System => core}/FileListen/FileChangeCustomProcess.php (100%) rename {System => core}/FileListen/Inotify.php (100%) rename {System => core}/FileListen/Scaner.php (100%) rename {System => core}/IAspect.php (100%) rename {System => core}/IProxy.php (100%) rename {System => core}/Jwt/JWTAuthMiddleware.php (100%) rename {System => core}/Jwt/JWTAuthTokenException.php (100%) rename {System => core}/Jwt/Jwt.php (100%) rename {System => core}/Jwt/JwtHelper.php (100%) rename {System => core}/Kiri.php (100%) rename {System => core}/Pool/Alias.php (100%) rename {System => core}/Pool/Connection.php (100%) rename {System => core}/Pool/Helper/QueueInterface.php (100%) rename {System => core}/Pool/Helper/SplQueue.php (100%) rename {System => core}/Pool/Pool.php (100%) rename {System => core}/Pool/Redis.php (100%) rename {System => core}/Pool/StopHeartbeatCheck.php (100%) rename {System => core}/Proxy.php (100%) rename {System => core}/Runtime.php (100%) diff --git a/composer.json b/composer.json index d65c95c7..6d3bb86c 100644 --- a/composer.json +++ b/composer.json @@ -34,13 +34,13 @@ }, "autoload": { "psr-4": { - "Kiri\\": "System/", + "Kiri\\": "core/", "Http\\": "http-helper/", - "Server\\": "Server/", - "Console\\": "Console/", - "Gii\\": "Gii/", - "Kafka\\": "Kafka/", - "Annotation\\": "Annotation/" + "Server\\": "server/", + "Console\\": "console/", + "Gii\\": "gii/", + "Kafka\\": "kafka/", + "Annotation\\": "annotation/" }, "files": [ "error.php", diff --git a/System/Abstracts/BaseApplication.php b/core/Abstracts/BaseApplication.php similarity index 100% rename from System/Abstracts/BaseApplication.php rename to core/Abstracts/BaseApplication.php diff --git a/System/Abstracts/BaseGoto.php b/core/Abstracts/BaseGoto.php similarity index 100% rename from System/Abstracts/BaseGoto.php rename to core/Abstracts/BaseGoto.php diff --git a/System/Abstracts/BaseObject.php b/core/Abstracts/BaseObject.php similarity index 100% rename from System/Abstracts/BaseObject.php rename to core/Abstracts/BaseObject.php diff --git a/System/Abstracts/Command.php b/core/Abstracts/Command.php similarity index 100% rename from System/Abstracts/Command.php rename to core/Abstracts/Command.php diff --git a/System/Abstracts/Component.php b/core/Abstracts/Component.php similarity index 100% rename from System/Abstracts/Component.php rename to core/Abstracts/Component.php diff --git a/System/Abstracts/Config.php b/core/Abstracts/Config.php similarity index 100% rename from System/Abstracts/Config.php rename to core/Abstracts/Config.php diff --git a/System/Abstracts/Configure.php b/core/Abstracts/Configure.php similarity index 100% rename from System/Abstracts/Configure.php rename to core/Abstracts/Configure.php diff --git a/System/Abstracts/IListener.php b/core/Abstracts/IListener.php similarity index 100% rename from System/Abstracts/IListener.php rename to core/Abstracts/IListener.php diff --git a/System/Abstracts/Input.php b/core/Abstracts/Input.php similarity index 100% rename from System/Abstracts/Input.php rename to core/Abstracts/Input.php diff --git a/System/Abstracts/Kernel.php b/core/Abstracts/Kernel.php similarity index 100% rename from System/Abstracts/Kernel.php rename to core/Abstracts/Kernel.php diff --git a/System/Abstracts/Listener.php b/core/Abstracts/Listener.php similarity index 100% rename from System/Abstracts/Listener.php rename to core/Abstracts/Listener.php diff --git a/System/Abstracts/Provider.php b/core/Abstracts/Provider.php similarity index 100% rename from System/Abstracts/Provider.php rename to core/Abstracts/Provider.php diff --git a/System/Abstracts/Providers.php b/core/Abstracts/Providers.php similarity index 100% rename from System/Abstracts/Providers.php rename to core/Abstracts/Providers.php diff --git a/System/Abstracts/TraitApplication.php b/core/Abstracts/TraitApplication.php similarity index 100% rename from System/Abstracts/TraitApplication.php rename to core/Abstracts/TraitApplication.php diff --git a/System/Application.php b/core/Application.php similarity index 100% rename from System/Application.php rename to core/Application.php diff --git a/System/AspectManager.php b/core/AspectManager.php similarity index 100% rename from System/AspectManager.php rename to core/AspectManager.php diff --git a/System/Async.php b/core/Async.php similarity index 100% rename from System/Async.php rename to core/Async.php diff --git a/System/Cache/Base/Redis.php b/core/Cache/Base/Redis.php similarity index 100% rename from System/Cache/Base/Redis.php rename to core/Cache/Base/Redis.php diff --git a/System/Cache/File.php b/core/Cache/File.php similarity index 100% rename from System/Cache/File.php rename to core/Cache/File.php diff --git a/System/Cache/ICache.php b/core/Cache/ICache.php similarity index 100% rename from System/Cache/ICache.php rename to core/Cache/ICache.php diff --git a/System/Cache/Redis.php b/core/Cache/Redis.php similarity index 100% rename from System/Cache/Redis.php rename to core/Cache/Redis.php diff --git a/System/Core/ArrayAccess.php b/core/Core/ArrayAccess.php similarity index 100% rename from System/Core/ArrayAccess.php rename to core/Core/ArrayAccess.php diff --git a/System/Core/DateFormat.php b/core/Core/DateFormat.php similarity index 100% rename from System/Core/DateFormat.php rename to core/Core/DateFormat.php diff --git a/System/Core/Dtl.php b/core/Core/Dtl.php similarity index 100% rename from System/Core/Dtl.php rename to core/Core/Dtl.php diff --git a/System/Core/Help.php b/core/Core/Help.php similarity index 100% rename from System/Core/Help.php rename to core/Core/Help.php diff --git a/System/Core/Json.php b/core/Core/Json.php similarity index 100% rename from System/Core/Json.php rename to core/Core/Json.php diff --git a/System/Core/Number.php b/core/Core/Number.php similarity index 100% rename from System/Core/Number.php rename to core/Core/Number.php diff --git a/System/Core/Reader.php b/core/Core/Reader.php similarity index 100% rename from System/Core/Reader.php rename to core/Core/Reader.php diff --git a/System/Core/Str.php b/core/Core/Str.php similarity index 100% rename from System/Core/Str.php rename to core/Core/Str.php diff --git a/System/Core/Xml.php b/core/Core/Xml.php similarity index 100% rename from System/Core/Xml.php rename to core/Core/Xml.php diff --git a/System/Crontab/Crontab.php b/core/Crontab/Crontab.php similarity index 100% rename from System/Crontab/Crontab.php rename to core/Crontab/Crontab.php diff --git a/System/Crontab/CrontabInterface.php b/core/Crontab/CrontabInterface.php similarity index 100% rename from System/Crontab/CrontabInterface.php rename to core/Crontab/CrontabInterface.php diff --git a/System/Crontab/CrontabProviders.php b/core/Crontab/CrontabProviders.php similarity index 100% rename from System/Crontab/CrontabProviders.php rename to core/Crontab/CrontabProviders.php diff --git a/System/Crontab/DefaultCrontab.php b/core/Crontab/DefaultCrontab.php similarity index 100% rename from System/Crontab/DefaultCrontab.php rename to core/Crontab/DefaultCrontab.php diff --git a/System/Crontab/Producer.php b/core/Crontab/Producer.php similarity index 100% rename from System/Crontab/Producer.php rename to core/Crontab/Producer.php diff --git a/System/Crontab/Zookeeper.php b/core/Crontab/Zookeeper.php similarity index 100% rename from System/Crontab/Zookeeper.php rename to core/Crontab/Zookeeper.php diff --git a/System/Di/Attributes.php b/core/Di/Attributes.php similarity index 100% rename from System/Di/Attributes.php rename to core/Di/Attributes.php diff --git a/System/Di/Container.php b/core/Di/Container.php similarity index 100% rename from System/Di/Container.php rename to core/Di/Container.php diff --git a/System/Di/ContainerInterface.php b/core/Di/ContainerInterface.php similarity index 100% rename from System/Di/ContainerInterface.php rename to core/Di/ContainerInterface.php diff --git a/System/Di/LocalService.php b/core/Di/LocalService.php similarity index 100% rename from System/Di/LocalService.php rename to core/Di/LocalService.php diff --git a/System/Environmental.php b/core/Environmental.php similarity index 100% rename from System/Environmental.php rename to core/Environmental.php diff --git a/System/Error/ErrorHandler.php b/core/Error/ErrorHandler.php similarity index 100% rename from System/Error/ErrorHandler.php rename to core/Error/ErrorHandler.php diff --git a/System/Error/ErrorInterface.php b/core/Error/ErrorInterface.php similarity index 100% rename from System/Error/ErrorInterface.php rename to core/Error/ErrorInterface.php diff --git a/System/Error/Logger.php b/core/Error/Logger.php similarity index 100% rename from System/Error/Logger.php rename to core/Error/Logger.php diff --git a/System/Error/LoggerAspect.php b/core/Error/LoggerAspect.php similarity index 100% rename from System/Error/LoggerAspect.php rename to core/Error/LoggerAspect.php diff --git a/System/Error/LoggerProcess.php b/core/Error/LoggerProcess.php similarity index 100% rename from System/Error/LoggerProcess.php rename to core/Error/LoggerProcess.php diff --git a/System/Event.php b/core/Event.php similarity index 100% rename from System/Event.php rename to core/Event.php diff --git a/System/Events/EventDispatch.php b/core/Events/EventDispatch.php similarity index 100% rename from System/Events/EventDispatch.php rename to core/Events/EventDispatch.php diff --git a/System/Events/EventInterface.php b/core/Events/EventInterface.php similarity index 100% rename from System/Events/EventInterface.php rename to core/Events/EventInterface.php diff --git a/System/Events/EventProvider.php b/core/Events/EventProvider.php similarity index 100% rename from System/Events/EventProvider.php rename to core/Events/EventProvider.php diff --git a/System/Events/EventProviders.php b/core/Events/EventProviders.php similarity index 100% rename from System/Events/EventProviders.php rename to core/Events/EventProviders.php diff --git a/System/Events/StoppableEventInterface.php b/core/Events/StoppableEventInterface.php similarity index 100% rename from System/Events/StoppableEventInterface.php rename to core/Events/StoppableEventInterface.php diff --git a/System/Events/Struct.php b/core/Events/Struct.php similarity index 100% rename from System/Events/Struct.php rename to core/Events/Struct.php diff --git a/System/Exception/AuthException.php b/core/Exception/AuthException.php similarity index 100% rename from System/Exception/AuthException.php rename to core/Exception/AuthException.php diff --git a/System/Exception/ComponentException.php b/core/Exception/ComponentException.php similarity index 100% rename from System/Exception/ComponentException.php rename to core/Exception/ComponentException.php diff --git a/System/Exception/ConfigException.php b/core/Exception/ConfigException.php similarity index 100% rename from System/Exception/ConfigException.php rename to core/Exception/ConfigException.php diff --git a/System/Exception/InitException.php b/core/Exception/InitException.php similarity index 100% rename from System/Exception/InitException.php rename to core/Exception/InitException.php diff --git a/System/Exception/NotFindClassException.php b/core/Exception/NotFindClassException.php similarity index 100% rename from System/Exception/NotFindClassException.php rename to core/Exception/NotFindClassException.php diff --git a/System/Exception/NotFindPropertyException.php b/core/Exception/NotFindPropertyException.php similarity index 100% rename from System/Exception/NotFindPropertyException.php rename to core/Exception/NotFindPropertyException.php diff --git a/System/Exception/RedisConnectException.php b/core/Exception/RedisConnectException.php similarity index 100% rename from System/Exception/RedisConnectException.php rename to core/Exception/RedisConnectException.php diff --git a/System/FileListen/FileChangeCustomProcess.php b/core/FileListen/FileChangeCustomProcess.php similarity index 100% rename from System/FileListen/FileChangeCustomProcess.php rename to core/FileListen/FileChangeCustomProcess.php diff --git a/System/FileListen/Inotify.php b/core/FileListen/Inotify.php similarity index 100% rename from System/FileListen/Inotify.php rename to core/FileListen/Inotify.php diff --git a/System/FileListen/Scaner.php b/core/FileListen/Scaner.php similarity index 100% rename from System/FileListen/Scaner.php rename to core/FileListen/Scaner.php diff --git a/System/IAspect.php b/core/IAspect.php similarity index 100% rename from System/IAspect.php rename to core/IAspect.php diff --git a/System/IProxy.php b/core/IProxy.php similarity index 100% rename from System/IProxy.php rename to core/IProxy.php diff --git a/System/Jwt/JWTAuthMiddleware.php b/core/Jwt/JWTAuthMiddleware.php similarity index 100% rename from System/Jwt/JWTAuthMiddleware.php rename to core/Jwt/JWTAuthMiddleware.php diff --git a/System/Jwt/JWTAuthTokenException.php b/core/Jwt/JWTAuthTokenException.php similarity index 100% rename from System/Jwt/JWTAuthTokenException.php rename to core/Jwt/JWTAuthTokenException.php diff --git a/System/Jwt/Jwt.php b/core/Jwt/Jwt.php similarity index 100% rename from System/Jwt/Jwt.php rename to core/Jwt/Jwt.php diff --git a/System/Jwt/JwtHelper.php b/core/Jwt/JwtHelper.php similarity index 100% rename from System/Jwt/JwtHelper.php rename to core/Jwt/JwtHelper.php diff --git a/System/Kiri.php b/core/Kiri.php similarity index 100% rename from System/Kiri.php rename to core/Kiri.php diff --git a/System/Pool/Alias.php b/core/Pool/Alias.php similarity index 100% rename from System/Pool/Alias.php rename to core/Pool/Alias.php diff --git a/System/Pool/Connection.php b/core/Pool/Connection.php similarity index 100% rename from System/Pool/Connection.php rename to core/Pool/Connection.php diff --git a/System/Pool/Helper/QueueInterface.php b/core/Pool/Helper/QueueInterface.php similarity index 100% rename from System/Pool/Helper/QueueInterface.php rename to core/Pool/Helper/QueueInterface.php diff --git a/System/Pool/Helper/SplQueue.php b/core/Pool/Helper/SplQueue.php similarity index 100% rename from System/Pool/Helper/SplQueue.php rename to core/Pool/Helper/SplQueue.php diff --git a/System/Pool/Pool.php b/core/Pool/Pool.php similarity index 100% rename from System/Pool/Pool.php rename to core/Pool/Pool.php diff --git a/System/Pool/Redis.php b/core/Pool/Redis.php similarity index 100% rename from System/Pool/Redis.php rename to core/Pool/Redis.php diff --git a/System/Pool/StopHeartbeatCheck.php b/core/Pool/StopHeartbeatCheck.php similarity index 100% rename from System/Pool/StopHeartbeatCheck.php rename to core/Pool/StopHeartbeatCheck.php diff --git a/System/Proxy.php b/core/Proxy.php similarity index 100% rename from System/Proxy.php rename to core/Proxy.php diff --git a/System/Runtime.php b/core/Runtime.php similarity index 100% rename from System/Runtime.php rename to core/Runtime.php