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;
@@ -30,7 +29,7 @@ if (!function_exists('make')) {
      * @return mixed
      * @throws
      */
-	function make($name, $default = null): mixed
+    function make($name, $default = NULL): mixed
     {
         if (class_exists($name)) {
             return Kiri::createObject($name);
@@ -45,7 +44,7 @@ if (!function_exists('make')) {
             return Kiri::app()->get($default);
         }
         $class = Kiri::createObject($default);
-		class_alias($name, $default, true);
+        class_alias($name, $default, TRUE);
         return $class;
     }
 
@@ -81,7 +80,7 @@ if (!function_exists('checkPortIsAlready')) {
     {
         if (!Kiri::getPlatform()->isLinux()) {
             exec("lsof -i :" . $port . " | grep -i 'LISTEN' | awk '{print $2}'", $output);
-			if (empty($output)) return false;
+            if (empty($output)) return FALSE;
             $output = explode(PHP_EOL, $output[0]);
             return $output[0];
         }
@@ -93,7 +92,7 @@ if (!function_exists('checkPortIsAlready')) {
 
         exec('netstat -lnp | grep ' . $port . ' | grep "LISTEN" | awk \'{print $7}\'', $output);
         if (empty($output)) {
-			return false;
+            return FALSE;
         }
         return explode('/', $output[0])[0];
     }
@@ -173,7 +172,7 @@ if (!function_exists('now')) {
      */
     function now(): string
     {
-		return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(true));
+        return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(TRUE));
     }
 }
 
@@ -229,6 +228,20 @@ if (!function_exists('scan_directory')) {
 
 }
 
+if (!class_exists('ReturnTypeWillChange')) {
+
+    /**
+     * @since 8.1
+     */
+    #[Attribute(Attribute::TARGET_METHOD)]
+    final class ReturnTypeWillChange
+    {
+        public function __construct() {}
+    }
+
+
+}
+
 
 if (!function_exists('injectRuntime')) {
 
@@ -247,6 +260,9 @@ if (!function_exists('injectRuntime')) {
         $router = [];
         foreach ($fileLists as $class) {
             foreach (NoteManager::getTargetNote($class) as $value) {
+                if (!method_exists($value, 'execute')) {
+                    continue;
+                }
                 $value->execute($class);
             }
             $methods = $di->getMethodAttribute($class);
@@ -258,6 +274,9 @@ if (!function_exists('injectRuntime')) {
                     if ($item instanceof Route) {
                         $router[] = [$item, $class, $method];
                     } else {
+                        if (!method_exists($item, 'execute')) {
+                            continue;
+                        }
                         $item->execute($class, $method);
                     }
                 }
@@ -266,6 +285,9 @@ if (!function_exists('injectRuntime')) {
         if (!empty($router)) {
             foreach ($router as $class) {
                 [$item, $class, $method] = $class;
+                if (!method_exists($item, 'execute')) {
+                    continue;
+                }
                 $item->execute($class, $method);
             }
         }
@@ -313,14 +335,14 @@ if (!function_exists('isUrl')) {
      * @param bool $get_info
      * @return false|array
      */
-	function isUrl($url, bool $get_info = true): bool|array
+    function isUrl($url, bool $get_info = TRUE): bool|array
     {
         if (str_starts_with($url, '/')) {
-			return false;
+            return FALSE;
         }
         $queryMatch = '/((http[s]?):\/\/)?(([\w\-\_]+\.)+\w+(:\d+)?)(\/.*)?/';
         if (!preg_match($queryMatch, $url, $outPut)) {
-			return false;
+            return FALSE;
         }
         $port = str_replace(':', '', $outPut[5]);
 
@@ -346,8 +368,8 @@ if (!function_exists('split_request_uri')) {
      */
     function split_request_uri($url): bool|array
     {
-		if (($parse = isUrl($url, null)) === false) {
+        if (($parse = isUrl($url, NULL)) === FALSE) {
-			return false;
+            return FALSE;
         }
 
         [$isHttps, $domain, $port, $path] = $parse;
@@ -371,7 +393,7 @@ if (!function_exists('hadDomain')) {
     function hadDomain($url): bool|array
     {
         $param = split_request_uri($url);
-		return !is_array($param) ? false : $param[0];
+        return !is_array($param) ? FALSE : $param[0];
     }
 
 }
@@ -420,7 +442,7 @@ if (!function_exists('loadByDir')) {
                 classAutoload($namespace, $value);
             } else {
                 $pos = strpos($value, '.php');
-				if ($pos === false || strlen($value) - 4 != $pos) {
+                if ($pos === FALSE || strlen($value) - 4 != $pos) {
                     continue;
                 }
 
@@ -498,7 +520,7 @@ if (!function_exists('instance_load')) {
 
     function instance_load()
     {
-		$content = json_decode(file_get_contents(__DIR__ . '/composer.json'), true);
+        $content = json_decode(file_get_contents(__DIR__ . '/composer.json'), TRUE);
         if (isset($content['autoload']) && isset($content['autoload']['psr-4'])) {
             $psr4 = $content['autoload']['psr-4'];
             foreach ($psr4 as $namespace => $dirname) {
@@ -548,7 +570,7 @@ if (!function_exists('trim_blank')) {
      * @param bool $htmlTags
      * @return array|string|null
      */
-	function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = true): array|string|null
+    function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = TRUE): array|string|null
     {
         $str = trim($content);
         if ($htmlTags) {
@@ -793,7 +815,7 @@ if (!function_exists('get_file_extension')) {
             $mimeType = finfo_file($fInfo, $filename);
             finfo_close($fInfo);
             $mimeType = current(explode('; ', $mimeType));
-			if (($search = array_search($mimeType, $mime_types)) == false) {
+            if (($search = array_search($mimeType, $mime_types)) == FALSE) {
                 return $mimeType;
             }
             return $search;
@@ -818,7 +840,7 @@ if (!function_exists('storage')) {
         if (!empty($path)) {
             $path = ltrim($path, '/');
             if (!is_dir($basePath . '/' . $path)) {
-				mkdir($basePath . '/' . $path, 0777, true);
+                mkdir($basePath . '/' . $path, 0777, TRUE);
             }
         }
         if (empty($fileName)) {
@@ -842,7 +864,7 @@ if (!function_exists('event')) {
      * @param bool $isAppend
      * @throws Exception
      */
-	function event($name, $callback, bool $isAppend = true)
+    function event($name, $callback, bool $isAppend = TRUE)
     {
         $pro = di(EventProvider::class);
         $pro->on($name, $callback, 0);
@@ -859,7 +881,7 @@ if (!function_exists('name')) {
      * @throws ConfigException
      * @throws Exception
      */
-	function name(int $pid, string $prefix = null)
+    function name(int $pid, string $prefix = NULL)
     {
         if (Kiri::getPlatform()->isMac()) {
             return;
@@ -890,10 +912,10 @@ if (!function_exists('env')) {
      * @param null $default
      * @return array|string|null
      */
-	#[Pure] function env($key, $default = null): null|array|string
+    #[Pure] function env($key, $default = NULL): null|array|string
     {
         $env = getenv($key);
-		if ($env === false) {
+        if ($env === FALSE) {
             return $default;
         }
         return $env;
@@ -926,7 +948,7 @@ if (!function_exists('interval')) {
      * @param int $interval
      * @param bool $is
      */
-	function interval(callable $callback, int $interval = 1000, bool $is = false)
+    function interval(callable $callback, int $interval = 1000, bool $is = FALSE)
     {
         usleep($interval * 1000);
 
@@ -949,7 +971,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;
     }
 
 }
@@ -1001,7 +1027,7 @@ if (!function_exists('swoole_unserialize')) {
     function swoole_unserialize($data): mixed
     {
         if (empty($data)) {
-			return null;
+            return NULL;
         }
 //        if (class_exists('swoole_serialize')) {
 //            return \swoole_serialize::unpack($data);
@@ -1082,7 +1108,7 @@ if (!function_exists('jTraceEx')) {
      * @param bool $toHtml
      * @return string
      */
-	function jTraceEx($e, $seen = null, bool $toHtml = false): string
+    function jTraceEx($e, $seen = NULL, bool $toHtml = FALSE): string
     {
         $starter = $seen ? 'Caused by: ' : '';
         $result = [];
@@ -1098,12 +1124,12 @@ if (!function_exists('jTraceEx')) {
                 count($value) && array_key_exists('class', $value) ? str_replace('\\', '.', $value['class']) : '',
                 count($value) && array_key_exists('class', $value) && array_key_exists('function', $value) ? '.' : '',
                 count($value) && array_key_exists('function', $value) ? str_replace('\\', '.', $value['function']) : '(main)',
-				$line === null ? $file : basename($file),
+                $line === NULL ? $file : basename($file),
-				$line === null ? '' : ':',
+                $line === NULL ? '' : ':',
-				$line === null ? '' : $line);
+                $line === NULL ? '' : $line);
 
             $file = array_key_exists('file', $value) ? $value['file'] : 'Unknown Source';
-			$line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : null;
+            $line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : NULL;
         }
         $result = join($toHtml ? "<br>" : "\n", $result);
         if ($prev) {
@@ -1127,7 +1153,7 @@ if (!function_exists('swoole_substr_json_decode')) {
      */
     function swoole_substr_json_decode($packet, int $length = 0): mixed
     {
-		return json_decode($packet, true);
+        return json_decode($packet, TRUE);
     }
 
 }

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/Context.php

@@ -24,11 +24,14 @@ class Context extends BaseContext
 	 */
 	public static function setContext($id, $context, $coroutineId = null): mixed
 	{
-		if (Coroutine::getCid() === -1) {
+        if (is_null($coroutineId)) {
-			return static::$_contents[$id] = $context;
+            $coroutineId = Coroutine::getCid();
         }
+		if (Coroutine::getCid() !== -1) {
             return Coroutine::getContext($coroutineId)[$id] = $context;
         }
+        return static::$_contents[$id] = $context;
+	}
 
 	/**
 	 * @param $id
@@ -38,6 +41,9 @@ class Context extends BaseContext
 	 */
 	public static function increment($id, int $value = 1, $coroutineId = null): bool|int
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
 			Coroutine::getContext($coroutineId)[$id] = 0;
 		}
@@ -52,6 +58,9 @@ class Context extends BaseContext
 	 */
 	public static function decrement($id, int $value = 1, $coroutineId = null): bool|int
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
 			Coroutine::getContext($coroutineId)[$id] = 0;
 		}
@@ -81,6 +90,9 @@ class Context extends BaseContext
 	 */
 	private static function loadByContext($id, $default = null, $coroutineId = null): mixed
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		return Coroutine::getContext($coroutineId)[$id] ?? $default;
 	}
 
@@ -115,6 +127,9 @@ class Context extends BaseContext
 	 */
 	public static function remove(string $id, $coroutineId = null)
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!static::hasContext($id, $coroutineId)) {
 			return;
 		}
@@ -165,11 +180,15 @@ class Context extends BaseContext
 	 */
 	private static function searchByCoroutine($id, $key = null, $coroutineId = null): bool
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
 			return false;
 		}
-		if ($key !== null) {
+        $value = Coroutine::getContext($coroutineId)[$id];
-			return isset((Coroutine::getContext($coroutineId)[$id] ?? [])[$key]);
+		if ($key !== null && is_array($value)) {
+			return isset($value[$key]);
 		}
 		return true;
 	}

kiri-engine/Core/Json.php

@@ -66,11 +66,11 @@ class Json
 	{
 		$params['code'] = $code;
 		if (!is_string($message)) {
+            $params['message'] = 'System success.';
             $params['param'] = $message;
             if (!empty($data)) {
                 $params['exPageInfo'] = $data;
             }
-			$params['message'] = 'System success.';
 		} else {
 			$params['message'] = $message;
 			$params['param'] = $data;

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
 	 */

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 $isReloading = FALSE;
-	public bool $isReloadingOut = 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]);
+        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');
         }
@@ -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
+    {
+
     }
 
 
@@ -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) {
+        $this->isReloading = TRUE;
-			return;
-		}
-		$this->process->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

@@ -68,7 +68,7 @@ class Gii
 		$this->input = $input;
 		$this->db = $db;
 
-		$make = $this->input->getArgument('action');
+		$make = $this->input->getOption('make');
 		if (empty($make)) {
 			throw new Exception('构建类型不能为空~');
 		}
@@ -120,8 +120,8 @@ class Gii
 	private function makeByDatabases($make, InputInterface $input): array
 	{
 		$redis = Kiri::getDi()->get(Redis::class);
-		if ($input->hasArgument('name')) {
+		if ($input->hasOption('name')) {
-			$this->tableName = $input->getArgument('name');
+			$this->tableName = $input->getOption('name');
 			$redis->del('column:' . $this->tableName);
 		}
 		return match ($make) {
@@ -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/GiiCommand.php

@@ -32,9 +32,9 @@ class GiiCommand extends Command
 	protected function configure()
 	{
 		$this->setName('sw:gii')
-			->addArgument('action', InputArgument::REQUIRED)
+			->addOption('make','m', InputArgument::OPTIONAL)
-			->addArgument('name', InputArgument::OPTIONAL)
+			->addOption('name','t', InputArgument::OPTIONAL)
-			->addArgument('databases', InputArgument::OPTIONAL)
+			->addOption('databases','d', InputArgument::OPTIONAL)
 			->setDescription('./snowflake sw:gii make=model|controller|task|interceptor|limits|middleware name=xxxx');
 	}
 
@@ -52,12 +52,12 @@ class GiiCommand extends Command
 		$gii = Kiri::app()->get('gii');
 
 		$connections = Kiri::app()->get('db');
-		if (($db = $input->getArgument('databases')) != null) {
+		if (($db = $input->getOption('databases')) != null) {
 			$gii->run($connections->get($db), $input);
 			return 1;
 		}
 
-		$action = $input->getArgument('action');
+		$action = $input->getOption('make');
 		if (!in_array($action, ['model', 'controller'])) {
 			$gii->run(null, $input);
 			return 1;

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 . '
         ];
+    }
 ';
 	}
 

kiri-note/Attribute.php

@@ -17,6 +17,7 @@ abstract class Attribute implements INote
      * @param mixed|string $method
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function execute(mixed $class, mixed $method = ''): mixed
     {
         // TODO: Implement execute() method.