Revert "改名"

This reverts commit fdf58326

Kiri.php

@@ -2,39 +2,30 @@
 declare(strict_types=1);
 
 
-namespace Kiri;
-
 error_reporting(0);
 
 
-use Kiri\Annotation\Annotation;
 use Database\Collection;
 use Database\ModelInterface;
-use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Annotation;
+use Kiri\Application;
 use Kiri\Core\Json;
 use Kiri\Di\Container;
+use Kiri\Environmental;
+use Kiri\Server\Tasker\AsyncTaskExecute;
 use Psr\Container\ContainerInterface;
-use ReflectionException;
-use Server\ServerManager;
-use Server\Tasker\AsyncTaskExecute;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\WebSocket\Server;
 
-
 defined('DB_ERROR_BUSY') or define('DB_ERROR_BUSY', 'The database is busy. Please try again later.');
 defined('SELECT_IS_NULL') or define('SELECT_IS_NULL', 'Query data does not exist, please check the relevant conditions.');
 defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be empty, please add.');
-defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', APP_PATH . 'app/Controllers/');
-defined('CRONTAB_PATH') or define('CRONTAB_PATH', APP_PATH . 'app/Crontab/');
-defined('CLIENT_PATH') or define('CLIENT_PATH', APP_PATH . 'app/Client/');
-defined('TASK_PATH') or define('TASK_PATH', APP_PATH . 'app/Async/');
-defined('LISTENER_PATH') or define('LISTENER_PATH', APP_PATH . 'app/Listener/');
-defined('KAFKA_PATH') or define('KAFKA_PATH', APP_PATH . 'app/Kafka/');
-defined('RPC_CLIENT_PATH') or define('RPC_CLIENT_PATH', APP_PATH . 'app/Client/Rpc/');
-defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Model/');
+defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', realpath(APP_PATH . 'controllers/'));
+defined('MODEL_PATH') or define('MODEL_PATH', realpath(APP_PATH . 'models/'));
+defined('COMPONENT_PATH') or define('COMPONENT_PATH', realpath(APP_PATH . 'components/'));
 
 
 /**
@@ -73,6 +64,15 @@ class Kiri
 	}
 
 
+	/**
+	 * @return Container
+	 */
+	public static function getContainer(): Container
+	{
+		return static::$container;
+	}
+
+
 	/**
 	 * @param $alias
 	 * @param array $array
@@ -199,6 +199,7 @@ class Kiri
 		}
 	}
 
+
 	/**
 	 * @return string
 	 * @throws Exception

composer.json

@@ -39,6 +39,7 @@
       "Kiri\\Task\\": "kiri-task/"
     },
     "files": [
+      "Kiri.php",
       "error.php",
       "function.php"
     ]

function.php

@@ -3,9 +3,10 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Http\Handler\Router;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Annotation;
+use Kiri\Annotation\Route\Route;
 use Kiri\Application;
 use Kiri\Core\ArrayAccess;
 use Kiri\Di\NoteManager;
@@ -13,9 +14,7 @@ use Kiri\Error\Logger;
 use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Kiri\Annotation\Annotation;
-use Kiri\Annotation\Route\Route;
+use Kiri\Message\Handler\Router;
 use Psr\Log\LoggerInterface;
 use Swoole\Process;
 use Swoole\WebSocket\Server;
@@ -1232,3 +1231,28 @@ if (!function_exists('success')) {
 	}
 }
 
+
+if (!function_exists('error_trigger_format')) {
+
+
+	/**
+	 * @param Throwable|Error $throwable
+	 * @return string
+	 */
+	function error_trigger_format(\Throwable|\Error $throwable): string
+	{
+		$message = 'Throwable: ' . $throwable->getMessage() . "\r\n" . '
+	' . $throwable->getFile() . " at line" . $throwable->getLine();
+
+		$message .= 'trance' . "\r\n";
+		foreach ($throwable->getTrace() as $value) {
+			if (!isset($value['file'])) {
+				continue;
+			}
+			$message .= $value['file'] . '->' . $value['line'] . '(' . $value['class'] . '::' . $value['function'] . ')';
+		}
+		return $message;
+	}
+
+}
+

kiri-annotation/Event.php

@@ -6,7 +6,7 @@ namespace Kiri\Annotation;
 
 use Exception;
 use Kiri\Events\EventProvider;
-use Kiri\Kiri;
+use Kiri;
 
 
 /**

kiri-annotation/Inject.php

@@ -6,7 +6,7 @@ namespace Kiri\Annotation;
 
 use Exception;
 use Kiri\Core\Str;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 use ReflectionProperty;
 

kiri-annotation/Loader.php

@@ -7,7 +7,7 @@ namespace Kiri\Annotation;
 use DirectoryIterator;
 use Exception;
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionClass;
 use ReflectionException;
 use Throwable;

kiri-annotation/Mapping.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\Annotation;
 
-use Kiri\Kiri;
+use Kiri;
 
 #[\Attribute(\Attribute::TARGET_CLASS)] class Mapping extends Attribute
 {

kiri-annotation/Route/Middleware.php

@@ -5,7 +5,7 @@ namespace Kiri\Annotation\Route;
 
 
 use Kiri\Annotation\Attribute;
-use Http\Handler\Abstracts\MiddlewareManager;
+use Kiri\Message\Handler\Abstracts\MiddlewareManager;
 use Psr\Http\Server\MiddlewareInterface;
 
 /**

kiri-annotation/Route/Route.php

@@ -5,8 +5,8 @@ namespace Kiri\Annotation\Route;
 
 
 use Kiri\Annotation\Attribute;
-use Http\Handler\Router;
-use Kiri\Kiri;
+use Kiri\Message\Handler\Router;
+use Kiri;
 
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Route extends Attribute
 {

kiri-annotation/Task.php

@@ -5,8 +5,8 @@ namespace Kiri\Annotation;
 
 
 use Exception;
-use Kiri\Kiri;
-use Server\Tasker\AsyncTaskExecute;
+use Kiri;
+use Kiri\Server\Tasker\AsyncTaskExecute;
 
 
 /**

kiri-engine/Abstracts/BaseApplication.php

@@ -12,7 +12,7 @@ namespace Kiri\Abstracts;
 
 use Database\Connection;
 use Exception;
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
 use Kafka\KafkaProvider;
 use Kiri\{Async, Kiri};
 use Kiri\Annotation\Annotation as SAnnotation;
@@ -21,12 +21,12 @@ use Kiri\Di\LocalService;
 use Kiri\Error\{ErrorHandler, Logger};
 use Kiri\Exception\{InitException, NotFindClassException};
 use ReflectionException;
-use Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute};
+use Kiri\Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute};
 use Swoole\Table;
 
 /**
  * Class BaseApplication
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 abstract class BaseApplication extends Component
 {

kiri-engine/Abstracts/Component.php

@@ -15,14 +15,14 @@ use JetBrains\PhpStorm\Pure;
 use Kiri\Di\Container;
 use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
-use Kiri\Kiri;
+use Kiri;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class Component
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  * @property ContainerInterface|Container $container
  * @property EventProvider $eventProvider
  * @property EventDispatch $eventDispatch
@@ -147,7 +147,7 @@ class Component implements Configure
 	 * @return Logger
 	 * @throws Exception
 	 */
-	private function logger(): Logger
+	protected function logger(): Logger
 	{
 		return Kiri::getDi()->get(Logger::class);
 	}

kiri-engine/Abstracts/Config.php

@@ -14,7 +14,7 @@ use Kiri\Exception\ConfigException;
 
 /**
  * Class Config
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 class Config extends Component
 {

kiri-engine/Abstracts/Configure.php

@@ -10,7 +10,7 @@ namespace Kiri\Abstracts;
 
 /**
  * Interface Configure
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 interface Configure
 {

kiri-engine/Abstracts/Logger.php

@@ -6,10 +6,10 @@ use DirectoryIterator;
 use Exception;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
+use Kiri\Server\Events\OnWorkerStop;
 use Psr\Log\LoggerInterface;
 use ReflectionException;
-use Server\Events\OnWorkerStop;
 
 
 /**
@@ -222,7 +222,7 @@ class Logger implements LoggerInterface
 	private function _string($message, $context): string
 	{
 		if (!empty($context)) {
-			return $message . ' ' . PHP_EOL . print_r($context, TRUE) . PHP_EOL;
+			return $message . ' ' . PHP_EOL . print_r($context, true) . PHP_EOL;
 		}
 		return $message . PHP_EOL;
 	}

kiri-engine/Abstracts/TraitApplication.php

@@ -7,8 +7,8 @@ namespace Kiri\Abstracts;
 use Kiri\Annotation\Annotation as SAnnotation;
 use Database\Connection;
 use Database\DatabasesProviders;
-use Http\Handler\Router;
-use Server\Server;
+use Kiri\Message\Handler\Router;
+use Kiri\Server\Server;
 use Kiri\Async;
 use Kiri\Error\Logger;
 use Kiri\Jwt\JWTAuth;

kiri-engine/Application.php

@@ -13,23 +13,24 @@ namespace Kiri;
 use Closure;
 use Database\DatabasesProviders;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\{BaseApplication, Config, Kernel};
 use Kiri\Crontab\CrontabProviders;
 use Kiri\Events\{OnAfterCommandExecute, OnBeforeCommandExecute};
 use Kiri\FileListen\HotReload;
+use Kiri\Server\ServerProviders;
 use ReflectionException;
-use Server\ServerProviders;
 use stdClass;
 use Swoole\Process;
 use Swoole\Timer;
 use Symfony\Component\Console\{Application as ConsoleApplication,
 	Command\Command,
 	Input\ArgvInput,
-	Input\InputInterface,
 	Output\ConsoleOutput,
 	Output\OutputInterface
 };
 
+
 /**
  * Class Init
  *
@@ -229,7 +230,13 @@ class Application extends BaseApplication
 	{
 		fire(new OnBeforeCommandExecute());
 		if (!($class instanceof HotReload)) {
-			scan_directory(directory('app'), 'App');
+			$config = Config::get('scanner', []);
+			if (!empty($config)) {
+				foreach ($config as $key => $value) {
+					scan_directory($value, $key);
+				}
+			}
+			scan_directory(MODEL_PATH, 'app\Model');
 		}
 
 		$this->container->setBindings(OutputInterface::class, $output);

kiri-engine/Async.php

@@ -6,9 +6,9 @@ namespace Kiri;
 
 use Exception;
 use Kiri\Abstracts\Component;
-use Server\ServerManager;
-use Server\Tasker\AsyncTaskExecute;
-
+use Kiri\Server\ServerManager;
+use Kiri\Server\Tasker\AsyncTaskExecute;
+use Kiri;
 /**
  * Class Async
  * @package Kiri

kiri-engine/Cache/Base/Redis.php

@@ -5,7 +5,7 @@ namespace Kiri\Cache\Base;
 use Exception;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\RedisConnectException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use RedisException;
 use Swoole\Timer;

kiri-engine/Cache/File.php

@@ -16,7 +16,7 @@ use Swoole\Coroutine\System;
 
 /**
  * Class File
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  */
 class File extends Component implements ICache
 {

kiri-engine/Cache/ICache.php

@@ -11,7 +11,7 @@ namespace Kiri\Cache;
 
 /**
  * Interface ICache
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  */
 interface ICache
 {

kiri-engine/Cache/Redis.php

@@ -15,15 +15,15 @@ use Kiri\Abstracts\Config;
 use Kiri\Core\Json;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\Redis as PoolRedis;
 use Kiri\Annotation\Inject;
-use Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerExit;
 use Swoole\Timer;
 
 /**
  * Class Redis
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  * @mixin \Redis
  */
 class Redis extends Component

kiri-engine/Context.php

@@ -5,7 +5,7 @@ namespace Kiri;
 
 use Kiri\Abstracts\BaseContext;
 use Swoole\Coroutine;
-
+use Kiri;
 /**
  * Class Context
  * @package Yoc\http

kiri-engine/Core/DateFormat.php

@@ -13,7 +13,7 @@ namespace Kiri\Core;
 
 /**
  * Class DateFormat
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class DateFormat
 {

kiri-engine/Core/Help.php

@@ -10,7 +10,7 @@ use Exception;
 
 /**
  * Class Help
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Help
 {

kiri-engine/Core/Json.php

@@ -16,7 +16,7 @@ use Throwable;
 
 /**
  * Class JSON
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Json
 {

kiri-engine/Core/Reader.php

@@ -6,7 +6,7 @@ namespace Kiri\Core;
 
 /**
  * Class Reader
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Reader
 {

kiri-engine/Core/Str.php

@@ -9,7 +9,7 @@ use Exception;
 
 /**
  * Class Str
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Str
 {

kiri-engine/Core/Xml.php

@@ -13,7 +13,7 @@ use Exception;
 
 /**
  * Class Xml
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Xml
 {

kiri-engine/Di/Container.php

@@ -9,18 +9,18 @@ declare(strict_types=1);
 
 namespace Kiri\Di;
 
-use Kiri\Annotation\Inject;
 use Closure;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
+use Kiri\Annotation\Inject;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
 use ReflectionMethod;
 use ReflectionProperty;
-use Psr\Container\ContainerInterface;
 
 /**
  * Class Container
@@ -68,11 +68,13 @@ class Container implements ContainerInterface
 	 */
 	public function get(string $id): mixed
 	{
+		if ($id == ContainerInterface::class) {
+			return $this;
+		}
 		return $this->make($id, [], []);
 	}
 
 
-
 	/**
 	 * @param $class
 	 * @param array $constrict
@@ -82,6 +84,9 @@ class Container implements ContainerInterface
 	 */
 	public function make($class, array $constrict = [], array $config = []): mixed
 	{
+		if ($class == ContainerInterface::class) {
+			return $this;
+		}
 		if ($this->isInterface($class)) {
 			$class = $this->_interfaces[$class];
 		}
@@ -92,7 +97,6 @@ class Container implements ContainerInterface
 	}
 
 
-
 	/**
 	 * @param string $interface
 	 * @param string $class

kiri-engine/Di/LocalService.php

@@ -3,7 +3,7 @@
 namespace Kiri\Di;
 
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
+use Kiri;
 
 
 /**

kiri-engine/Environmental.php

@@ -5,7 +5,7 @@ namespace Kiri;
 
 
 use JetBrains\PhpStorm\Pure;
-
+use Kiri;
 
 /**
  * Class Environmental

kiri-engine/Error/ErrorHandler.php

@@ -10,17 +10,17 @@ declare(strict_types=1);
 namespace Kiri\Error;
 
 use Exception;
-use Http\Handler\Formatter\IFormatter;
+use Kiri\Message\Handler\Formatter\IFormatter;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
 use Kiri\Events\EventDispatch;
-use Kiri\Kiri;
-use Http\Events\OnAfterRequest;
+use Kiri;
+use Kiri\Message\Events\OnAfterRequest;
 
 /**
  * Class ErrorHandler
  *
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  * @property-read $asError
  */
 class ErrorHandler extends Component implements ErrorInterface

kiri-engine/Error/ErrorInterface.php

@@ -11,7 +11,7 @@ namespace Kiri\Error;
 
 /**
  * Interface ErrorInterface
- * @package Kiri\Kiri\Error
+ * @package Kiri\Error
  */
 interface ErrorInterface
 {

kiri-engine/Error/Logger.php

@@ -12,14 +12,14 @@ namespace Kiri\Error;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Annotation\Inject;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
 /**
  * Class Logger
- * @package Kiri\Kiri\Error
+ * @package Kiri\Error
  * @mixin \Kiri\Abstracts\Logger
  */
 class Logger extends Component

kiri-engine/Error/LoggerAspect.php

@@ -5,10 +5,10 @@ namespace Kiri\Error;
 
 
 use Exception;
-use Http\Aspect\OnAspectInterface;
-use Http\Aspect\OnJoinPointInterface;
-use Http\Constrict\RequestInterface;
-use Kiri\Kiri;
+use Kiri\Message\Aspect\OnAspectInterface;
+use Kiri\Message\Aspect\OnJoinPointInterface;
+use Kiri\Message\Constrict\RequestInterface;
+use Kiri;
 use Psr\Log\LoggerInterface;
 
 

kiri-engine/Error/LoggerProcess.php

@@ -7,8 +7,10 @@ namespace Kiri\Error;
 use Exception;
 use Kiri\Core\Json;
 use Kiri\Exception\ComponentException;
-use Kiri\Kiri;
-use Server\Abstracts\BaseProcess;
+use Kiri;
+use Kiri\Server\Abstracts\BaseProcess;
+use Kiri\Server\Broadcast\OnBroadcastInterface;
+use Psr\Log\LoggerInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
 
@@ -34,6 +36,17 @@ class LoggerProcess extends BaseProcess
 	}
 
 
+	/**
+	 * @param OnBroadcastInterface $message
+	 * @return void
+	 */
+	public function onBroadcast(OnBroadcastInterface $message): void
+	{
+		$logger = Kiri::getDi()->get(LoggerInterface::class);
+		$logger->debug($message->data . '::' . static::class);
+	}
+
+
 	/**
 	 * @param Process $process
 	 * @throws ComponentException

kiri-engine/Event.php

@@ -7,7 +7,7 @@ namespace Kiri;
 
 use Exception;
 use Kiri\Abstracts\Component;
-
+use Kiri;
 /**
  * Class Event
  * @package Kiri

kiri-engine/Exception/ComponentException.php

@@ -15,7 +15,7 @@ use Throwable;
 
 /**
  * Class ComponentException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class ComponentException extends \Exception
 {

kiri-engine/Exception/NotFindClassException.php

@@ -16,7 +16,7 @@ use Throwable;
 
 /**
  * Class NotFindClassException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class NotFindClassException extends \Exception
 {

kiri-engine/Exception/NotFindPropertyException.php

@@ -15,7 +15,7 @@ use Throwable;
 
 /**
  * Class NotFindClassException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class NotFindPropertyException extends \Exception
 {

kiri-engine/FileListen/HotReload.php

@@ -3,18 +3,17 @@
 namespace Kiri\FileListen;
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Inject;
 use Kiri\Core\Json;
 use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Kiri\Annotation\Inject;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\Timer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
@@ -61,7 +60,6 @@ class HotReload extends Command
 
 	/**
 	 * @throws ConfigException
-     * @throws \ReflectionException
 	 * @throws Exception
 	 */
 	protected function initCore()
@@ -176,7 +174,6 @@ class HotReload extends Command
 		Timer::clearAll();
 		$this->driver->clear();
 		$this->stopServer();
-        $this->stopManager();
 		while ($ret = Process::wait(TRUE)) {
 			echo "PID={$ret['pid']}\n";
 			sleep(1);
@@ -193,14 +190,6 @@ class HotReload extends Command
 		if (!empty($pid) && Process::kill($pid, 0)) {
 			Process::kill($pid, SIGTERM);
 		}
-    }
-
-
-    /**
-     *
-     */
-    protected function stopManager()
-    {
 		if ($this->process && Process::kill($this->process->pid, 0)) {
 			Process::kill($this->process->pid) && Process::wait(TRUE);
 		}
@@ -212,23 +201,25 @@ class HotReload extends Command
 	 *
 	 * @throws Exception
 	 */
-    public function trigger_reload()
+	public function trigger_reload(string $path = '')
 	{
+		$this->logger->warning('change reload');
+		if (!empty($path) && str_starts_with($path, CONTROLLER_PATH)) {
+			$pid = file_get_contents(storage('.swoole.pid'));
+			if (!empty($pid) && Process::kill($pid, 0)) {
+				Process::kill($pid, SIGUSR1);
+			}
+		} else {
 			if ($this->int == 1) {
 				return;
 			}
 			$this->int = 1;
-        $this->logger->warning('change reload');
-
 			$this->stopServer();
-        $this->stopManager();
-
 			$this->process = new Process(function (Process $process) {
 				$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
 			});
-
 			$this->process->start();
-        $this->int = -1;
+		}
 	}
 
 

kiri-engine/FileListen/Inotify.php

@@ -86,7 +86,7 @@ class Inotify
 			}
 			//非重启类型
 			if (str_ends_with($ev['name'], '.php')) {
-                Timer::after(3000, fn() => $this->reload());
+				Timer::after(3000, fn() => $this->reload($ev['name']));
 				$this->isReloading = TRUE;
 			}
 		}
@@ -95,9 +95,9 @@ class Inotify
 	/**
 	 * @throws Exception
 	 */
-    public function reload()
+	public function reload($path)
 	{
-        $this->process->trigger_reload();
+		$this->process->trigger_reload($path);
 		$this->clearWatch();
 		foreach ($this->dirs as $root) {
 			$this->watch($root);
@@ -113,11 +113,7 @@ class Inotify
 	public function clearWatch()
 	{
 		foreach ($this->watchFiles as $wd) {
-            try {
 			@inotify_rm_watch($this->inotify, $wd);
-            } catch (\Throwable $exception) {
-//				logger()->addError($exception->getMessage(), 'throwable');
-            }
 		}
 		$this->watchFiles = [];
 	}

kiri-engine/FileListen/Scaner.php

@@ -106,15 +106,18 @@ class Scaner
 	/**
 	 * @throws Exception
 	 */
-    public function timerReload()
+	public function timerReload($path)
 	{
 		$this->isReloading = TRUE;
-        $this->process->trigger_reload();
 
-        $this->process->int = -1;
+		if (str_contains($path, CONTROLLER_PATH))
+
+		$this->process->trigger_reload($path);
 
 		$this->loadDirs();
 
+		$this->process->int = -1;
+
 		$this->isReloading = FALSE;
 		$this->process->isReloadingOut = FALSE;
 

kiri-engine/Pool/Connection.php

@@ -9,7 +9,7 @@ use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Context;
-use Kiri\Kiri;
+use Kiri;
 use Swoole\Error;
 use Throwable;
 

kiri-engine/Pool/Redis.php

@@ -10,11 +10,11 @@ use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Context;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class RedisClient
- * @package Kiri\Kiri\Pool
+ * @package Kiri\Pool
  */
 class Redis extends Component
 {

kiri-engine/Runtime.php

@@ -10,7 +10,7 @@ use Kiri\Abstracts\Input;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-
+use Kiri;
 
 /**
  * Class Runtime

kiri-gii/Gii.php

@@ -13,7 +13,7 @@ use Database\Connection;
 use Database\Db;
 use Exception;
 use Kiri\Cache\Redis;
-use Kiri\Kiri;
+use Kiri;
 use Symfony\Component\Console\Input\InputInterface;
 
 /**

kiri-gii/GiiCommand.php

@@ -7,7 +7,7 @@ namespace Gii;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

kiri-gii/GiiController.php

@@ -6,7 +6,7 @@ namespace Gii;
 
 use Exception;
 use ReflectionException;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiController
@@ -70,9 +70,9 @@ use Kiri\Annotation\Route\Middleware;
 use Kiri\Annotation\Route\Route;
 use Kiri\Core\Str;
 use Kiri\Core\Json;
-use Http\Context\Request;
-use Http\Context\Response;
-use Http\Controller;
+use Kiri\Message\Context\Request;
+use Kiri\Message\Context\Response;
+use Kiri\Message\Controller;
 use JetBrains\PhpStorm\ArrayShape;
 use {$model_namespace}\\{$managerName};
 ";

kiri-gii/GiiJsonRpc.php

@@ -88,7 +88,7 @@ namespace Rpc\Consumers;
 
 use Kiri\Annotation\Target;
 use Kiri\Rpc\Annotation\JsonRpc;
-use Http\Handler\Controller;
+use Kiri\Message\Handler\Controller;
 use Rpc\\' . ucfirst($name) . 'RpcInterface;
 
 

kiri-gii/GiiMiddleware.php

@@ -6,7 +6,7 @@ namespace Gii;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiMiddleware
@@ -34,7 +34,7 @@ namespace App\Middleware;
 
 use Closure;
 use Psr\Http\Server\MiddlewareInterface;
-use Server\Constrict\RequestInterface;
+use Kiri\Server\Constrict\RequestInterface;
 
 ';
 

kiri-gii/GiiModel.php

@@ -8,7 +8,7 @@ use Database\Db;
 use Database\Model;
 use Exception;
 use ReflectionException;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiModel

kiri-gii/GiiProviders.php

@@ -8,7 +8,7 @@ namespace Gii;
 use Exception;
 use Kiri\Abstracts\Providers;
 use Kiri\Application;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class DatabasesProviders

kiri-gii/GiiRpcClient.php

@@ -5,7 +5,7 @@ namespace Gii;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiRpcClient
@@ -42,7 +42,7 @@ use Kiri\Annotation\Target;
 use Exception;
 use Rpc\Client;
 use Kiri\Core\Json;
-use Kiri\Kiri;
+use Kiri;
 
 ';
 

kiri-gii/GiiRpcService.php

@@ -5,7 +5,7 @@ namespace Gii;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiRpcClient
@@ -36,7 +36,7 @@ namespace App\Rpc;
 use Kiri\Annotation\Route\RpcProducer;
 use Kiri\Annotation\Target;
 use Exception;
-use Http\Controller;
+use Kiri\Message\Controller;
 use Kiri\Core\Json;
 
 ';

kiri-gii/GiiTask.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Gii;
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiModel
@@ -31,7 +31,7 @@ class GiiTask extends GiiBase
 		
 namespace App\Async;
 
-use Server\Contract\OnTaskInterface;
+use Kiri\Server\Contract\OnTaskInterface;
 
 ';
 

kiri-websocket-server/Sender.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\Websocket;
 
-use Kiri\Kiri;
+use Kiri;
 use Swoole\{Coroutine\Http\Server as AliasServer, WebSocket\Server};
 
 

kiri-websocket-server/Server.php

@@ -3,17 +3,17 @@
 namespace Kiri\Websocket;
 
 use Exception;
-use Http\Handler\DataGrip;
-use Http\Handler\Router;
+use Kiri\Message\Handler\DataGrip;
+use Kiri\Message\Handler\Router;
 use Kiri\Abstracts\AbstractServer;
 use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use Server\Contract\OnCloseInterface;
-use Server\Contract\OnHandshakeInterface;
-use Server\Contract\OnMessageInterface;
-use Server\Contract\OnOpenInterface;
-use Server\SwooleServerInterface;
+use Kiri\Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnHandshakeInterface;
+use Kiri\Server\Contract\OnMessageInterface;
+use Kiri\Server\Contract\OnOpenInterface;
+use Kiri\Server\SwooleServerInterface;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\WebSocket\Frame;