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

@@ -19,6 +19,20 @@ class NoteManager
 	private static array $_mapping = [];
 
 
+	/**
+	 * @return void
+	 */
+	public static function clear()
+	{
+		static::$_classTarget = [];
+		static::$_classMethodNote = [];
+		static::$_classMethod = [];
+		static::$_classPropertyNote = [];
+		static::$_classProperty = [];
+		static::$_mapping = [];
+	}
+
+
 	/**
 	 * @param ReflectionClass $class
 	 */
@@ -214,7 +228,7 @@ class NoteManager
 	public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
 	{
 		$class = self::getAttributeTrees($attribute, $class);
-        if (empty($class) || !isset($class['method'])){
+		if (empty($class) || !isset($class['method'])) {
 			return null;
 		}
 		if (empty($method)) {

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,8 +25,8 @@ class HotReload extends Command
 {
 
 
-	public bool $isReloading = false;
-	public bool $isReloadingOut = false;
+    public bool $isReloading = FALSE;
+    public bool $isReloadingOut = FALSE;
     public ?array $dirs = [];
 
     public int $events;
@@ -33,7 +34,7 @@ class HotReload extends Command
     public int $int = -1;
 
 
-	private ?Process $process = null;
+    private ?Process $process = NULL;
 
 
     public Inotify|Scaner $driver;
@@ -43,11 +44,11 @@ class HotReload extends Command
     public Logger $logger;
 
 
-	protected mixed $source = null;
+    protected mixed $source = NULL;
 
     protected mixed $pipes = [];
 
-	protected ?Coroutine\Channel $channel = null;
+    protected ?Coroutine\Channel $channel = NULL;
 
 
     /**
@@ -65,6 +66,7 @@ class HotReload extends Command
      */
     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]);
@@ -81,8 +83,7 @@ class HotReload extends Command
      */
     public function setProcessName()
     {
-		swoole_async_set(['enable_coroutine' => false]);
-		set_error_handler([$this, 'errorHandler']);
+        swoole_async_set(['enable_coroutine' => FALSE]);
         if (Kiri::getPlatform()->isLinux()) {
             swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
         }
@@ -97,7 +98,7 @@ class HotReload extends Command
         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);
+                Process::kill($pid, 15) && Process::wait(TRUE);
             }
         }
         file_put_contents(storage('.manager.pid'), getmypid());
@@ -134,7 +135,6 @@ class HotReload extends Command
         $this->initCore();
 
         $this->trigger_reload();
-
         Timer::tick(1000, fn() => $this->healthCheck());
 
         Process::signal(SIGTERM, [$this, 'onSignal']);
@@ -151,6 +151,9 @@ class HotReload extends Command
     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();
@@ -174,7 +177,7 @@ class HotReload extends Command
         $this->driver->clear();
         $this->stopServer();
         $this->stopManager();
-		while ($ret = Process::wait(true)) {
+        while ($ret = Process::wait(TRUE)) {
             echo "PID={$ret['pid']}\n";
             sleep(1);
         }
@@ -199,7 +202,7 @@ class HotReload extends Command
     protected function stopManager()
     {
         if ($this->process && Process::kill($this->process->pid, 0)) {
-			Process::kill($this->process->pid) && Process::wait(true);
+            Process::kill($this->process->pid) && Process::wait(TRUE);
         }
     }
 

kiri-engine/FileListen/Inotify.php

@@ -15,7 +15,7 @@ class Inotify
     private array $watchFiles = [];
 
 
-    protected bool $isReloading = FALSE;
+    public bool $isReloading = FALSE;
 
 
     protected int $cid;
@@ -29,6 +29,17 @@ class Inotify
      */
     public function __construct(protected array $dirs, public HotReload $process)
     {
+        set_error_handler([$this, 'error']);
+        set_exception_handler([$this, 'error']);
+    }
+
+
+    /**
+     * @return void
+     */
+    public function error(): void
+    {
+
     }
 
 
@@ -75,7 +86,7 @@ class Inotify
             }
             //非重启类型
             if (str_ends_with($ev['name'], '.php')) {
-                Timer::after(3000, fn()=>$this->reload());
+                Timer::after(3000, fn() => $this->reload());
                 $this->isReloading = TRUE;
             }
         }
@@ -103,9 +114,9 @@ class Inotify
     {
         foreach ($this->watchFiles as $wd) {
             try {
-				inotify_rm_watch($this->inotify, $wd);
+                @inotify_rm_watch($this->inotify, $wd);
             } catch (\Throwable $exception) {
-				logger()->addError($exception->getMessage(), 'throwable');
+//				logger()->addError($exception->getMessage(), 'throwable');
             }
         }
         $this->watchFiles = [];

kiri-engine/FileListen/Scaner.php

@@ -3,12 +3,16 @@
 namespace Kiri\FileListen;
 
 use Exception;
+use Swoole\Timer;
 
 class Scaner
 {
 
     private array $md5Map = [];
 
+    public bool $isReloading = FALSE;
+
+
     /**
      * @param array $dirs
      * @param HotReload $process
@@ -32,7 +36,7 @@ class Scaner
      * @param bool $isReload
      * @throws Exception
      */
-	private function loadDirs(bool $isReload = false)
+    private function loadDirs(bool $isReload = FALSE)
     {
         foreach ($this->dirs as $value) {
             if (is_bool($path = realpath($value))) {
@@ -52,7 +56,7 @@ class Scaner
      * @return void
      * @throws Exception
      */
-	private function loadByDir($path, bool $isReload = false): void
+    private function loadByDir($path, bool $isReload = FALSE): void
     {
         if (!is_string($path)) {
             return;
@@ -64,7 +68,8 @@ class Scaner
             }
             if (is_file($value)) {
                 if ($this->checkFile($value, $isReload)) {
-					$this->timerReload();
+                    Timer::after(2000, fn() => $this->timerReload());
+                    $this->isReloading = TRUE;
                     break;
                 }
             }
@@ -83,18 +88,18 @@ class Scaner
         $mTime = filectime($value);
         if (!isset($this->md5Map[$md5])) {
             if ($isReload) {
-				return true;
+                return TRUE;
             }
             $this->md5Map[$md5] = $mTime;
         } else {
             if ($this->md5Map[$md5] != $mTime) {
                 if ($isReload) {
-					return true;
+                    return TRUE;
                 }
                 $this->md5Map[$md5] = $mTime;
             }
         }
-		return false;
+        return FALSE;
     }
 
 
@@ -103,28 +108,25 @@ class Scaner
      */
     public function timerReload()
     {
-		if ($this->process->isReloading) {
-			return;
-		}
-		$this->process->isReloading = true;
+        $this->isReloading = TRUE;
         $this->process->trigger_reload();
 
         $this->process->int = -1;
 
         $this->loadDirs();
 
-		$this->process->isReloading = FALSE;
+        $this->isReloading = FALSE;
         $this->process->isReloadingOut = FALSE;
 
         $this->tick();
     }
 
 
-	private bool $isStop = false;
+    private bool $isStop = FALSE;
 
     public function clear()
     {
-		$this->isStop = true;
+        $this->isStop = TRUE;
     }
 
 
@@ -133,11 +135,11 @@ class Scaner
      */
     public function tick()
     {
-		if ($this->process->isReloading || $this->isStop) {
+        if ($this->isReloading || $this->isStop) {
             return;
         }
 
-		$this->loadDirs(true);
+        $this->loadDirs(TRUE);
 
         sleep(2);
 

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}");
@@ -279,8 +276,11 @@ use Database\Model;
 	/**
 	 * @return array
 	 */
-    protected array $rules = [' . $_field_one . '
+    public function rules(): array
+    {
+        return [' . $_field_one . '
         ];
+    }
 ';
 	}