1

function.php

@@ -3,7 +3,6 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Http\Handler\Abstracts\MiddlewareManager;
 use Http\Handler\Router;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
@@ -949,7 +948,11 @@ if (!function_exists('duplicate')) {
 	function duplicate(string $className): mixed
 	{
 		$class = di($className);
-		return clone $class;
+		$clone = clone $class;
+		if (method_exists($clone, 'clear')) {
+			$clone->clear();
+		}
+		return $clone;
 	}
 
 }

kiri-engine/Abstracts/Component.php

@@ -13,6 +13,7 @@ namespace Kiri\Abstracts;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Di\Container;
+use Kiri\Events\EventProvider;
 use Kiri\Kiri;
 use Psr\Container\ContainerInterface;
 
@@ -20,6 +21,7 @@ use Psr\Container\ContainerInterface;
  * Class Component
  * @package Kiri\Kiri\Base
  * @property ContainerInterface|Container $container
+ * @property EventProvider $eventProvider
  */
 class Component implements Configure
 {
@@ -46,6 +48,16 @@ class Component implements Configure
 	}
 
 
+	/**
+	 * @return EventProvider
+	 * @throws \ReflectionException
+	 */
+	public function getEventProvider(): EventProvider
+	{
+		return Kiri::getDi()->get(EventProvider::class);
+	}
+
+
 	/**
 	 * @return Container
 	 */

kiri-engine/Abstracts/Logger.php

@@ -2,11 +2,13 @@
 
 namespace Kiri\Abstracts;
 
+use Kiri\Kiri;
 use Note\Inject;
 use Exception;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Psr\Log\LoggerInterface;
+use ReflectionException;
 use Server\Events\OnWorkerStop;
 
 
@@ -26,12 +28,6 @@ class Logger implements LoggerInterface
 	const DEBUG = 'debug';
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
 	private array $_loggers = [];
 
 
@@ -39,11 +35,12 @@ class Logger implements LoggerInterface
 
 
 	/**
-	 * 监听事件
+	 * @return void
+	 * @throws ReflectionException
 	 */
 	public function init()
 	{
-		$this->eventProvider->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
+		Kiri::getDi()->get(EventProvider::class)->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
 	}
 
 

kiri-engine/Cache/Redis.php

@@ -28,12 +28,6 @@ use Server\Events\OnWorkerExit;
 class Redis extends Component
 {
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
 
 	const REDIS_OPTION_HOST = 'host';
 	const REDIS_OPTION_PORT = 'port';

kiri-engine/Di/NoteManager.php

@@ -11,279 +11,293 @@ class NoteManager
 {
 
 
-    private static array $_classTarget = [];
-    private static array $_classMethodNote = [];
-    private static array $_classMethod = [];
-    private static array $_classPropertyNote = [];
-    private static array $_classProperty = [];
-    private static array $_mapping = [];
+	private static array $_classTarget = [];
+	private static array $_classMethodNote = [];
+	private static array $_classMethod = [];
+	private static array $_classPropertyNote = [];
+	private static array $_classProperty = [];
+	private static array $_mapping = [];
 
 
-    /**
-     * @param ReflectionClass $class
-     */
-    public static function setTargetNote(ReflectionClass $class)
-    {
-        $className = $class->getName();
-        if (!isset(static::$_classTarget[$className])) {
-            static::$_classTarget[$className] = [];
-        }
-        foreach ($class->getAttributes() as $attribute) {
-            if (!class_exists($attribute->getName())) {
-                continue;
-            }
-
-            $instance = $attribute->newInstance();
-
-            static::$_classTarget[$className][] = $instance;
-
-            self::setMappingClass($attribute, $className);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public static function clear()
+	{
+		static::$_classTarget = [];
+		static::$_classMethodNote = [];
+		static::$_classMethod = [];
+		static::$_classPropertyNote = [];
+		static::$_classProperty = [];
+		static::$_mapping = [];
+	}
 
 
-    /**
-     * @param ReflectionAttribute $attribute
-     * @param string $class
-     */
-    public static function setMappingClass(ReflectionAttribute $attribute, string $class)
-    {
-        if (!isset(static::$_mapping[$attribute->getName()])) {
-            static::$_mapping[$attribute->getName()] = [];
-        }
-        if (!isset(static::$_mapping[$attribute->getName()][$class])) {
-            static::$_mapping[$attribute->getName()][$class] = [];
-        }
-    }
+	/**
+	 * @param ReflectionClass $class
+	 */
+	public static function setTargetNote(ReflectionClass $class)
+	{
+		$className = $class->getName();
+		if (!isset(static::$_classTarget[$className])) {
+			static::$_classTarget[$className] = [];
+		}
+		foreach ($class->getAttributes() as $attribute) {
+			if (!class_exists($attribute->getName())) {
+				continue;
+			}
+
+			$instance = $attribute->newInstance();
+
+			static::$_classTarget[$className][] = $instance;
+
+			self::setMappingClass($attribute, $className);
+		}
+	}
 
 
-    /**
-     * @param ReflectionAttribute $attribute
-     * @param string $class
-     * @param string $method
-     * @param mixed $instance
-     */
-    public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
-    {
-        self::setMappingClass($attribute, $class);
-
-        if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
-            static::$_mapping[$attribute->getName()][$class]['method'] = [];
-        }
-        static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
-    }
+	/**
+	 * @param ReflectionAttribute $attribute
+	 * @param string $class
+	 */
+	public static function setMappingClass(ReflectionAttribute $attribute, string $class)
+	{
+		if (!isset(static::$_mapping[$attribute->getName()])) {
+			static::$_mapping[$attribute->getName()] = [];
+		}
+		if (!isset(static::$_mapping[$attribute->getName()][$class])) {
+			static::$_mapping[$attribute->getName()][$class] = [];
+		}
+	}
 
 
-    /**
-     * @param ReflectionAttribute $attribute
-     * @param string $class
-     * @param string $property
-     * @param $instance
-     */
-    public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
-    {
-        self::setMappingClass($attribute, $class);
+	/**
+	 * @param ReflectionAttribute $attribute
+	 * @param string $class
+	 * @param string $method
+	 * @param mixed $instance
+	 */
+	public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
+	{
+		self::setMappingClass($attribute, $class);
 
-        $mapping = static::$_mapping[$attribute->getName()][$class];
-        if (!isset($mapping['property'])) {
-            $mapping['property'] = [];
-        }
-        $mapping['property'][] = [$property => $instance];
-        static::$_mapping[$attribute->getName()][$class] = $mapping;
-    }
+		if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
+			static::$_mapping[$attribute->getName()][$class]['method'] = [];
+		}
+		static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
+	}
 
 
-    /**
-     * @param mixed $class
-     * @return array
-     */
-    public static function getTargetNote(mixed $class): array
-    {
-        if (!is_string($class)) {
-            $class = $class::class;
-        }
-        return static::$_classTarget[$class] ?? [];
-    }
+	/**
+	 * @param ReflectionAttribute $attribute
+	 * @param string $class
+	 * @param string $property
+	 * @param $instance
+	 */
+	public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
+	{
+		self::setMappingClass($attribute, $class);
+
+		$mapping = static::$_mapping[$attribute->getName()][$class];
+		if (!isset($mapping['property'])) {
+			$mapping['property'] = [];
+		}
+		$mapping['property'][] = [$property => $instance];
+		static::$_mapping[$attribute->getName()][$class] = $mapping;
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     */
-    public static function setMethodNote(ReflectionClass $class)
-    {
-        $className = $class->getName();
-        static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
-        foreach ($class->getMethods() as $ReflectionMethod) {
-            static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-            static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
-            foreach ($ReflectionMethod->getAttributes() as $attribute) {
-                if (!class_exists($attribute->getName())) {
-                    continue;
-                }
-                $instance = $attribute->newInstance();
-
-                static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
-
-                self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
-            }
-        }
-    }
+	/**
+	 * @param mixed $class
+	 * @return array
+	 */
+	public static function getTargetNote(mixed $class): array
+	{
+		if (!is_string($class)) {
+			$class = $class::class;
+		}
+		return static::$_classTarget[$class] ?? [];
+	}
 
 
-    /**
-     * @param string $class
-     * @param string $method
-     * @return bool
-     */
-    public static function hasMethod(string $class, string $method): bool
-    {
-        return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
-    }
+	/**
+	 * @param ReflectionClass $class
+	 */
+	public static function setMethodNote(ReflectionClass $class)
+	{
+		$className = $class->getName();
+		static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
+		foreach ($class->getMethods() as $ReflectionMethod) {
+			static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
+			static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
+			foreach ($ReflectionMethod->getAttributes() as $attribute) {
+				if (!class_exists($attribute->getName())) {
+					continue;
+				}
+				$instance = $attribute->newInstance();
+
+				static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
+
+				self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
+			}
+		}
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     * @return array
-     */
-    #[Pure] public static function getMethodNote(ReflectionClass $class): array
-    {
-        return static::$_classMethodNote[$class->getName()] ?? [];
-    }
+	/**
+	 * @param string $class
+	 * @param string $method
+	 * @return bool
+	 */
+	public static function hasMethod(string $class, string $method): bool
+	{
+		return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
+	}
 
 
-    /**
-     * @param \ReflectionClass $reflect
-     * @return \ReflectionMethod|null
-     */
-    public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
-    {
-        NoteManager::setPropertyNote($reflect);
-        NoteManager::setTargetNote($reflect);
-        NoteManager::setMethodNote($reflect);
-
-        return $reflect->getConstructor();
-    }
+	/**
+	 * @param ReflectionClass $class
+	 * @return array
+	 */
+	#[Pure] public static function getMethodNote(ReflectionClass $class): array
+	{
+		return static::$_classMethodNote[$class->getName()] ?? [];
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     */
-    public static function setPropertyNote(ReflectionClass $class)
-    {
-        $className = $class->getName();
-        static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
-        foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
-            ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
-            static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-            foreach ($ReflectionMethod->getAttributes() as $attribute) {
-                if (!class_exists($attribute->getName())) {
-                    continue;
-                }
+	/**
+	 * @param \ReflectionClass $reflect
+	 * @return \ReflectionMethod|null
+	 */
+	public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
+	{
+		NoteManager::setPropertyNote($reflect);
+		NoteManager::setTargetNote($reflect);
+		NoteManager::setMethodNote($reflect);
 
-                $instance = $attribute->newInstance();
-
-                static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
-
-                self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
-            }
-        }
-    }
+		return $reflect->getConstructor();
+	}
 
 
-    /**
-     * @param string $attribute
-     * @param string|null $class
-     * @return array[]
-     */
-    public static function getAttributeTrees(string $attribute, string $class = null): array
-    {
-        $mapping = static::$_mapping[$attribute] ?? [];
-        if (empty($mapping) || empty($class)) {
-            return $mapping;
-        }
-        return $mapping[$class] ?? [];
-    }
+	/**
+	 * @param ReflectionClass $class
+	 */
+	public static function setPropertyNote(ReflectionClass $class)
+	{
+		$className = $class->getName();
+		static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
+		foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
+			ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
+			static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
+			foreach ($ReflectionMethod->getAttributes() as $attribute) {
+				if (!class_exists($attribute->getName())) {
+					continue;
+				}
+
+				$instance = $attribute->newInstance();
+
+				static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
+
+				self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
+			}
+		}
+	}
 
 
-    /**
-     * @param string $attribute
-     * @param string $class
-     * @param string|null $method
-     * @return array
-     */
-    public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
-    {
-        $class = self::getAttributeTrees($attribute, $class);
-        if (empty($class) || !isset($class['method'])){
-            return null;
-        }
-        if (empty($method)) {
-            return $class['method'];
-        }
-        foreach ($class['method'] as $value) {
-            $key = key($value);
-            if ($method == $key) {
-                return $value[$key];
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param string $attribute
+	 * @param string|null $class
+	 * @return array[]
+	 */
+	public static function getAttributeTrees(string $attribute, string $class = null): array
+	{
+		$mapping = static::$_mapping[$attribute] ?? [];
+		if (empty($mapping) || empty($class)) {
+			return $mapping;
+		}
+		return $mapping[$class] ?? [];
+	}
 
 
-    /**
-     * @param string $attribute
-     * @param string $class
-     * @param string $method
-     * @return mixed
-     */
-    public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
-    {
-        $class = self::getAttributeTrees($attribute, $class);
-        if (empty($class) || !isset($class['property'])) {
-            return [];
-        }
-        foreach ($class['property'] as $value) {
-            $key = key($value);
-            if ($method == $key) {
-                return $value[$key];
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param string $attribute
+	 * @param string $class
+	 * @param string|null $method
+	 * @return array
+	 */
+	public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
+	{
+		$class = self::getAttributeTrees($attribute, $class);
+		if (empty($class) || !isset($class['method'])) {
+			return null;
+		}
+		if (empty($method)) {
+			return $class['method'];
+		}
+		foreach ($class['method'] as $value) {
+			$key = key($value);
+			if ($method == $key) {
+				return $value[$key];
+			}
+		}
+		return null;
+	}
 
 
-    /**
-     * @param ReflectionClass|string $class
-     * @return array
-     * @throws \ReflectionException
-     */
-    public static function getMethods(ReflectionClass|string $class): array
-    {
-        if (is_string($class)) {
-            $class = self::getReflect($class);
-        }
-        return static::$_classMethod[$class->getName()] ?? [];
-    }
+	/**
+	 * @param string $attribute
+	 * @param string $class
+	 * @param string $method
+	 * @return mixed
+	 */
+	public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
+	{
+		$class = self::getAttributeTrees($attribute, $class);
+		if (empty($class) || !isset($class['property'])) {
+			return [];
+		}
+		foreach ($class['property'] as $value) {
+			$key = key($value);
+			if ($method == $key) {
+				return $value[$key];
+			}
+		}
+		return null;
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     * @return ReflectionProperty[]
-     */
-    #[Pure] public static function getProperty(ReflectionClass $class): array
-    {
-        return static::$_classProperty[$class->getName()] ?? [];
-    }
+	/**
+	 * @param ReflectionClass|string $class
+	 * @return array
+	 * @throws \ReflectionException
+	 */
+	public static function getMethods(ReflectionClass|string $class): array
+	{
+		if (is_string($class)) {
+			$class = self::getReflect($class);
+		}
+		return static::$_classMethod[$class->getName()] ?? [];
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     * @return array
-     */
-    #[Pure] public static function getPropertyNote(ReflectionClass $class): array
-    {
-        return static::$_classPropertyNote[$class->getName()] ?? [];
-    }
+	/**
+	 * @param ReflectionClass $class
+	 * @return ReflectionProperty[]
+	 */
+	#[Pure] public static function getProperty(ReflectionClass $class): array
+	{
+		return static::$_classProperty[$class->getName()] ?? [];
+	}
+
+
+	/**
+	 * @param ReflectionClass $class
+	 * @return array
+	 */
+	#[Pure] public static function getPropertyNote(ReflectionClass $class): array
+	{
+		return static::$_classPropertyNote[$class->getName()] ?? [];
+	}
 
 
 }

kiri-engine/Error/Logger.php

@@ -29,11 +29,6 @@ class Logger extends Component
 	private array $logs = [];
 
 
-	/** @var EventProvider */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * inject logger
 	 *

kiri-engine/FileListen/HotReload.php

@@ -14,6 +14,7 @@ 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;
 
 
@@ -24,209 +25,211 @@ class HotReload extends Command
 {
 
 
-	public bool $isReloading = false;
-	public bool $isReloadingOut = false;
-	public ?array $dirs = [];
+    public bool $isReloading = FALSE;
+    public bool $isReloadingOut = FALSE;
+    public ?array $dirs = [];
 
-	public int $events;
+    public int $events;
 
-	public int $int = -1;
+    public int $int = -1;
 
 
-	private ?Process $process = null;
+    private ?Process $process = NULL;
 
 
-	public Inotify|Scaner $driver;
+    public Inotify|Scaner $driver;
 
 
-	#[Inject(Logger::class)]
-	public Logger $logger;
+    #[Inject(Logger::class)]
+    public Logger $logger;
 
 
-	protected mixed $source = null;
+    protected mixed $source = NULL;
 
-	protected mixed $pipes = [];
+    protected mixed $pipes = [];
 
-	protected ?Coroutine\Channel $channel = null;
+    protected ?Coroutine\Channel $channel = NULL;
 
 
-	/**
-	 */
-	protected function configure()
-	{
-		$this->setName('sw:wather')->setDescription('server start');
-	}
+    /**
+     */
+    protected function configure()
+    {
+        $this->setName('sw:wather')->setDescription('server start');
+    }
 
 
-	/**
-	 * @throws ConfigException
-	 * @throws \ReflectionException
-	 * @throws Exception
-	 */
-	protected function initCore()
-	{
-		$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
-		if (!extension_loaded('inotify')) {
-			$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
-		} else {
-			$this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
-		}
-		$this->clearOtherService();
-		$this->setProcessName();
-	}
+    /**
+     * @throws ConfigException
+     * @throws \ReflectionException
+     * @throws Exception
+     */
+    protected function initCore()
+    {
+        set_error_handler([$this, 'errorHandler']);
+        $this->dirs = Config::get('inotify', [APP_PATH . 'app']);
+        if (!extension_loaded('inotify')) {
+            $this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
+        } else {
+            $this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
+        }
+        $this->clearOtherService();
+        $this->setProcessName();
+    }
 
 
-	/**
-	 * @throws ConfigException
-	 */
-	public function setProcessName()
-	{
-		swoole_async_set(['enable_coroutine' => false]);
-		set_error_handler([$this, 'errorHandler']);
-		if (Kiri::getPlatform()->isLinux()) {
-			swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
-		}
-	}
+    /**
+     * @throws ConfigException
+     */
+    public function setProcessName()
+    {
+        swoole_async_set(['enable_coroutine' => FALSE]);
+        if (Kiri::getPlatform()->isLinux()) {
+            swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
+        }
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function clearOtherService()
-	{
-		if (file_exists(storage('.manager.pid'))) {
-			$pid = (int)file_get_contents(storage('.manager.pid'));
-			if ($pid > 0 && Process::kill($pid, 0)) {
-				Process::kill($pid, 15) && Process::wait(true);
-			}
-		}
-		file_put_contents(storage('.manager.pid'), getmypid());
-	}
+    /**
+     * @throws Exception
+     */
+    public function clearOtherService()
+    {
+        if (file_exists(storage('.manager.pid'))) {
+            $pid = (int)file_get_contents(storage('.manager.pid'));
+            if ($pid > 0 && Process::kill($pid, 0)) {
+                Process::kill($pid, 15) && Process::wait(TRUE);
+            }
+        }
+        file_put_contents(storage('.manager.pid'), getmypid());
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function errorHandler()
-	{
-		$error = func_get_args();
+    /**
+     * @throws Exception
+     */
+    public function errorHandler()
+    {
+        $error = func_get_args();
 
-		$path = ['file' => $error[2], 'line' => $error[3]];
+        $path = ['file' => $error[2], 'line' => $error[3]];
 
-		if ($error[0] === 0) {
-			$error[0] = 500;
-		}
-		$data = Json::to(500, $error[1], $path);
+        if ($error[0] === 0) {
+            $error[0] = 500;
+        }
+        $data = Json::to(500, $error[1], $path);
 
-		$this->logger->error($data, 'error');
-	}
+        $this->logger->error($data, 'error');
+    }
 
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public function execute(InputInterface $input, OutputInterface $output): int
-	{
-		$this->initCore();
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws ConfigException
+     * @throws Exception
+     */
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->initCore();
 
-		$this->trigger_reload();
+        $this->trigger_reload();
+        Timer::tick(1000, fn() => $this->healthCheck());
 
-		Timer::tick(1000, fn() => $this->healthCheck());
+        Process::signal(SIGTERM, [$this, 'onSignal']);
+        Process::signal(SIGKILL, [$this, 'onSignal']);
 
-		Process::signal(SIGTERM, [$this, 'onSignal']);
-		Process::signal(SIGKILL, [$this, 'onSignal']);
-
-		$this->driver->start();
-		return 0;
-	}
+        $this->driver->start();
+        return 0;
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function healthCheck()
-	{
-		$pid = (int)file_get_contents(storage('.swoole.pid'));
-		if (empty($pid)) {
-			$this->logger->warning('service is shutdown you need reload.');
-			$this->trigger_reload();
-		} else if (!Process::kill($pid, 0)) {
-			$this->logger->warning('service is shutdown you need reload.');
-			$this->trigger_reload();
-		}
-	}
+    /**
+     * @throws Exception
+     */
+    public function healthCheck()
+    {
+        $pid = (int)file_get_contents(storage('.swoole.pid'));
+        if ($this->int == 1) {
+            return;
+        }
+        if (empty($pid)) {
+            $this->logger->warning('service is shutdown you need reload.');
+            $this->trigger_reload();
+        } else if (!Process::kill($pid, 0)) {
+            $this->logger->warning('service is shutdown you need reload.');
+            $this->trigger_reload();
+        }
+    }
 
 
-	/**
-	 * @param $data
-	 * @throws Exception
-	 */
-	public function onSignal($data)
-	{
-		if (!$data) {
-			return;
-		}
-		Timer::clearAll();
-		$this->driver->clear();
-		$this->stopServer();
-		$this->stopManager();
-		while ($ret = Process::wait(true)) {
-			echo "PID={$ret['pid']}\n";
-			sleep(1);
-		}
-	}
+    /**
+     * @param $data
+     * @throws Exception
+     */
+    public function onSignal($data)
+    {
+        if (!$data) {
+            return;
+        }
+        Timer::clearAll();
+        $this->driver->clear();
+        $this->stopServer();
+        $this->stopManager();
+        while ($ret = Process::wait(TRUE)) {
+            echo "PID={$ret['pid']}\n";
+            sleep(1);
+        }
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	protected function stopServer()
-	{
-		$pid = file_get_contents(storage('.swoole.pid'));
-		if (!empty($pid) && Process::kill($pid, 0)) {
-			Process::kill($pid, SIGTERM);
-		}
-	}
+    /**
+     * @throws Exception
+     */
+    protected function stopServer()
+    {
+        $pid = file_get_contents(storage('.swoole.pid'));
+        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);
-		}
-	}
+    /**
+     *
+     */
+    protected function stopManager()
+    {
+        if ($this->process && Process::kill($this->process->pid, 0)) {
+            Process::kill($this->process->pid) && Process::wait(TRUE);
+        }
+    }
 
 
-	/**
-	 * 重启
-	 *
-	 * @throws Exception
-	 */
-	public function trigger_reload()
-	{
-		if ($this->int == 1) {
-			return;
-		}
-		$this->int = 1;
-		$this->logger->warning('change reload');
+    /**
+     * 重启
+     *
+     * @throws Exception
+     */
+    public function trigger_reload()
+    {
+        if ($this->int == 1) {
+            return;
+        }
+        $this->int = 1;
+        $this->logger->warning('change reload');
 
-		$this->stopServer();
-		$this->stopManager();
+        $this->stopServer();
+        $this->stopManager();
 
-		$this->process = new Process(function (Process $process) {
-			$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
-		});
+        $this->process = new Process(function (Process $process) {
+            $process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
+        });
 
-		$this->process->start();
-		$this->int = -1;
-	}
+        $this->process->start();
+        $this->int = -1;
+    }
 
 
 }

kiri-engine/FileListen/Inotify.php

@@ -9,150 +9,161 @@ use Swoole\Timer;
 class Inotify
 {
 
-	private mixed $inotify;
-	private mixed $events;
+    private mixed $inotify;
+    private mixed $events;
 
-	private array $watchFiles = [];
+    private array $watchFiles = [];
 
 
-    protected bool $isReloading = FALSE;
+    public bool $isReloading = FALSE;
 
 
-	protected int $cid;
+    protected int $cid;
 
-	const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
+    const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
 
 
-	/**
-	 * @param array $dirs
-	 * @param HotReload $process
-	 */
-	public function __construct(protected array $dirs, public HotReload $process)
-	{
-	}
+    /**
+     * @param array $dirs
+     * @param HotReload $process
+     */
+    public function __construct(protected array $dirs, public HotReload $process)
+    {
+        set_error_handler([$this, 'error']);
+        set_exception_handler([$this, 'error']);
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function start()
-	{
-		$this->inotify = inotify_init();
-		$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
-		foreach ($this->dirs as $dir) {
-			if (!is_dir($dir)) continue;
-			$this->watch($dir);
-		}
-		Event::add($this->inotify, [$this, 'check']);
-		Event::wait();
-	}
+    /**
+     * @return void
+     */
+    public function error(): void
+    {
+
+    }
 
 
-	public function clear()
-	{
-		Event::del($this->inotify);
-		Event::exit();
-	}
+    /**
+     * @throws Exception
+     */
+    public function start()
+    {
+        $this->inotify = inotify_init();
+        $this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
+        foreach ($this->dirs as $dir) {
+            if (!is_dir($dir)) continue;
+            $this->watch($dir);
+        }
+        Event::add($this->inotify, [$this, 'check']);
+        Event::wait();
+    }
 
 
-	/**
-	 * 开始监听
-	 * @throws Exception
-	 */
-	public function check()
-	{
-		if (!($events = inotify_read($this->inotify))) {
-			return;
-		}
-		if ($this->isReloading) {
-			return;
-		}
+    public function clear()
+    {
+        Event::del($this->inotify);
+        Event::exit();
+    }
 
-		$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
-		foreach ($events as $ev) {
-			if (!in_array($ev['mask'], $LISTEN_TYPE)) {
-				continue;
-			}
-			//非重启类型
-			if (str_ends_with($ev['name'], '.php')) {
-                Timer::after(3000, fn()=>$this->reload());
+
+    /**
+     * 开始监听
+     * @throws Exception
+     */
+    public function check()
+    {
+        if (!($events = inotify_read($this->inotify))) {
+            return;
+        }
+        if ($this->isReloading) {
+            return;
+        }
+
+        $LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
+        foreach ($events as $ev) {
+            if (!in_array($ev['mask'], $LISTEN_TYPE)) {
+                continue;
+            }
+            //非重启类型
+            if (str_ends_with($ev['name'], '.php')) {
+                Timer::after(3000, fn() => $this->reload());
                 $this->isReloading = TRUE;
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	public function reload()
-	{
-		$this->process->trigger_reload();
-		$this->clearWatch();
-		foreach ($this->dirs as $root) {
-			$this->watch($root);
-		}
-		$this->process->int = -1;
+    /**
+     * @throws Exception
+     */
+    public function reload()
+    {
+        $this->process->trigger_reload();
+        $this->clearWatch();
+        foreach ($this->dirs as $root) {
+            $this->watch($root);
+        }
+        $this->process->int = -1;
         $this->isReloading = FALSE;
-	}
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	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 = [];
-	}
+    /**
+     * @throws Exception
+     */
+    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 = [];
+    }
 
 
-	/**
-	 * @param $dir
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function watch($dir): bool
-	{
-		//目录不存在
-		if (!is_dir($dir)) {
-			return logger()->addError("[$dir] is not a directory.");
-		}
-		//避免重复监听
-		if (isset($this->watchFiles[$dir])) {
-			return FALSE;
-		}
+    /**
+     * @param $dir
+     * @return bool
+     * @throws Exception
+     */
+    public function watch($dir): bool
+    {
+        //目录不存在
+        if (!is_dir($dir)) {
+            return logger()->addError("[$dir] is not a directory.");
+        }
+        //避免重复监听
+        if (isset($this->watchFiles[$dir])) {
+            return FALSE;
+        }
 
-		if (in_array($dir, self::IG_DIR)) {
-			return FALSE;
-		}
+        if (in_array($dir, self::IG_DIR)) {
+            return FALSE;
+        }
 
-		$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
-		$this->watchFiles[$dir] = $wd;
+        $wd = @inotify_add_watch($this->inotify, $dir, $this->events);
+        $this->watchFiles[$dir] = $wd;
 
-		$files = scandir($dir);
-		foreach ($files as $f) {
-			if ($f == '.' || $f == '..') {
-				continue;
-			}
-			$path = $dir . '/' . $f;
-			//递归目录
-			if (is_dir($path)) {
-				$this->watch($path);
-			} else if (!str_ends_with($f, '.php')) {
-				continue;
-			}
-			//检测文件类型
-			if (strstr($f, '.') == '.php') {
-				$wd = @inotify_add_watch($this->inotify, $path, $this->events);
-				$this->watchFiles[$path] = $wd;
-			}
-		}
-		return TRUE;
-	}
+        $files = scandir($dir);
+        foreach ($files as $f) {
+            if ($f == '.' || $f == '..') {
+                continue;
+            }
+            $path = $dir . '/' . $f;
+            //递归目录
+            if (is_dir($path)) {
+                $this->watch($path);
+            } else if (!str_ends_with($f, '.php')) {
+                continue;
+            }
+            //检测文件类型
+            if (strstr($f, '.') == '.php') {
+                $wd = @inotify_add_watch($this->inotify, $path, $this->events);
+                $this->watchFiles[$path] = $wd;
+            }
+        }
+        return TRUE;
+    }
 }

kiri-engine/FileListen/Scaner.php

@@ -3,145 +3,147 @@
 namespace Kiri\FileListen;
 
 use Exception;
+use Swoole\Timer;
 
 class Scaner
 {
 
-	private array $md5Map = [];
+    private array $md5Map = [];
 
-	/**
-	 * @param array $dirs
-	 * @param HotReload $process
-	 */
-	public function __construct(protected array $dirs, public HotReload $process)
-	{
-	}
+    public bool $isReloading = FALSE;
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function start(): void
-	{
-		$this->loadDirs();
-		$this->tick();
-	}
+    /**
+     * @param array $dirs
+     * @param HotReload $process
+     */
+    public function __construct(protected array $dirs, public HotReload $process)
+    {
+    }
 
 
-	/**
-	 * @param bool $isReload
-	 * @throws Exception
-	 */
-	private function loadDirs(bool $isReload = false)
-	{
-		foreach ($this->dirs as $value) {
-			if (is_bool($path = realpath($value))) {
-				continue;
-			}
-
-			if (!is_dir($path)) continue;
-
-			$this->loadByDir($path, $isReload);
-		}
-	}
+    /**
+     * @throws Exception
+     */
+    public function start(): void
+    {
+        $this->loadDirs();
+        $this->tick();
+    }
 
 
-	/**
-	 * @param $path
-	 * @param bool $isReload
-	 * @return void
-	 * @throws Exception
-	 */
-	private function loadByDir($path, bool $isReload = false): void
-	{
-		if (!is_string($path)) {
-			return;
-		}
-		$path = rtrim($path, '/');
-		foreach (glob(realpath($path) . '/*') as $value) {
-			if (is_dir($value)) {
-				$this->loadByDir($value, $isReload);
-			}
-			if (is_file($value)) {
-				if ($this->checkFile($value, $isReload)) {
-					$this->timerReload();
-					break;
-				}
-			}
-		}
-	}
+    /**
+     * @param bool $isReload
+     * @throws Exception
+     */
+    private function loadDirs(bool $isReload = FALSE)
+    {
+        foreach ($this->dirs as $value) {
+            if (is_bool($path = realpath($value))) {
+                continue;
+            }
+
+            if (!is_dir($path)) continue;
+
+            $this->loadByDir($path, $isReload);
+        }
+    }
 
 
-	/**
-	 * @param $value
-	 * @param $isReload
-	 * @return bool
-	 */
-	private function checkFile($value, $isReload): bool
-	{
-		$md5 = md5($value);
-		$mTime = filectime($value);
-		if (!isset($this->md5Map[$md5])) {
-			if ($isReload) {
-				return true;
-			}
-			$this->md5Map[$md5] = $mTime;
-		} else {
-			if ($this->md5Map[$md5] != $mTime) {
-				if ($isReload) {
-					return true;
-				}
-				$this->md5Map[$md5] = $mTime;
-			}
-		}
-		return false;
-	}
+    /**
+     * @param $path
+     * @param bool $isReload
+     * @return void
+     * @throws Exception
+     */
+    private function loadByDir($path, bool $isReload = FALSE): void
+    {
+        if (!is_string($path)) {
+            return;
+        }
+        $path = rtrim($path, '/');
+        foreach (glob(realpath($path) . '/*') as $value) {
+            if (is_dir($value)) {
+                $this->loadByDir($value, $isReload);
+            }
+            if (is_file($value)) {
+                if ($this->checkFile($value, $isReload)) {
+                    Timer::after(2000, fn() => $this->timerReload());
+                    $this->isReloading = TRUE;
+                    break;
+                }
+            }
+        }
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function timerReload()
-	{
-		if ($this->process->isReloading) {
-			return;
-		}
-		$this->process->isReloading = true;
-		$this->process->trigger_reload();
-
-		$this->process->int = -1;
-
-		$this->loadDirs();
-
-		$this->process->isReloading = FALSE;
-		$this->process->isReloadingOut = FALSE;
-
-		$this->tick();
-	}
+    /**
+     * @param $value
+     * @param $isReload
+     * @return bool
+     */
+    private function checkFile($value, $isReload): bool
+    {
+        $md5 = md5($value);
+        $mTime = filectime($value);
+        if (!isset($this->md5Map[$md5])) {
+            if ($isReload) {
+                return TRUE;
+            }
+            $this->md5Map[$md5] = $mTime;
+        } else {
+            if ($this->md5Map[$md5] != $mTime) {
+                if ($isReload) {
+                    return TRUE;
+                }
+                $this->md5Map[$md5] = $mTime;
+            }
+        }
+        return FALSE;
+    }
 
 
-	private bool $isStop = false;
+    /**
+     * @throws Exception
+     */
+    public function timerReload()
+    {
+        $this->isReloading = TRUE;
+        $this->process->trigger_reload();
 
-	public function clear()
-	{
-		$this->isStop = true;
-	}
+        $this->process->int = -1;
+
+        $this->loadDirs();
+
+        $this->isReloading = FALSE;
+        $this->process->isReloadingOut = FALSE;
+
+        $this->tick();
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function tick()
-	{
-		if ($this->process->isReloading || $this->isStop) {
-			return;
-		}
+    private bool $isStop = FALSE;
 
-		$this->loadDirs(true);
+    public function clear()
+    {
+        $this->isStop = TRUE;
+    }
 
-		sleep(2);
 
-		$this->tick();
-	}
+    /**
+     * @throws Exception
+     */
+    public function tick()
+    {
+        if ($this->isReloading || $this->isStop) {
+            return;
+        }
+
+        $this->loadDirs(TRUE);
+
+        sleep(2);
+
+        $this->tick();
+    }
 
 }

kiri-gii/Gii.php

@@ -334,6 +334,7 @@ class Gii
 	private function getClassName($tableName): string
 	{
 		$res = [];
+		$tableName = str_replace($this->db->tablePrefix,'', $tableName);
 		foreach (explode('_', $tableName) as $n => $val) {
 			$res[] = ucfirst($val);
 		}

kiri-gii/GiiController.php

@@ -47,9 +47,6 @@ class GiiController extends GiiBase
 		$namespace = rtrim($path['namespace'], '\\');
 		$model_namespace = rtrim($modelPath['namespace'], '\\');
 
-		$prefix = str_replace('_', '', $this->db->tablePrefix);
-		$managerName = str_replace(ucfirst($prefix), '', $managerName);
-
 		$class = '';
 		$controller = str_replace('\\\\', '\\', "$namespace\\{$managerName}Controller");
 

kiri-gii/GiiModel.php

@@ -51,9 +51,6 @@ class GiiModel extends GiiBase
 
 		$namespace = rtrim($modelPath['namespace'], '\\');
 
-		$prefix = str_replace('_', '', $this->db->tablePrefix);
-		$managerName = str_replace(ucfirst($prefix), '', $managerName);
-
 		if (file_exists($modelPath['path'] . '/' . $managerName . '.php')) {
 			try {
 				$className = str_replace('\\\\', '\\', "{$modelPath['namespace']}\\{$managerName}");
@@ -263,7 +260,7 @@ use Database\Model;
 				$field = '\'' . current($val)['Field'] . '\'';
 			}
 			$_field_one .= '
-		[' . $field . ', \'' . $key . '\'],';
+			[' . $field . ', \'' . $key . '\'],';
 		}
 		foreach ($data as $key => $val) {
 			$length = $this->getLength($val);
@@ -279,8 +276,11 @@ use Database\Model;
 	/**
 	 * @return array
 	 */
-    protected array $rules = [' . $_field_one . '
-    ];
+    public function rules(): array
+    {
+        return [' . $_field_one . '
+        ];
+    }
 ';
 	}
 
@@ -311,10 +311,10 @@ use Database\Model;
 			}
 			if (count($_val) == 1) {
 				$_tmp = '
-		[\'' . $_val[0][3] . '\', ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key .']' : $key) . ']';
+			[\'' . $_val[0][3] . '\', ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key .']' : $key) . ']';
 			} else {
 				$_tmp = '
-		[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . $key . ']';
+			[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . $key . ']';
 			}
 			$string[] = $_tmp;
 		}
@@ -338,7 +338,7 @@ use Database\Model;
 			return '';
 		}
 		return '
-		[[\'' . implode('\', \'', $data) . '\'], \'unique\'],';
+			[[\'' . implode('\', \'', $data) . '\'], \'unique\'],';
 	}
 
 	/**
@@ -358,7 +358,7 @@ use Database\Model;
 			return '';
 		}
 		return '
-		[[\'' . implode('\', \'', $data) . '\'], \'required\'],';
+			[[\'' . implode('\', \'', $data) . '\'], \'required\'],';
 	}
 
 	/**