1

kiri-engine/Context.php

@@ -24,10 +24,13 @@ class Context extends BaseContext
 	 */
 	public static function setContext($id, $context, $coroutineId = null): mixed
 	{
-		if (Coroutine::getCid() === -1) {
-			return static::$_contents[$id] = $context;
-		}
-		return Coroutine::getContext($coroutineId)[$id] = $context;
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
+		if (Coroutine::getCid() !== -1) {
+            return Coroutine::getContext($coroutineId)[$id] = $context;
+        }
+        return static::$_contents[$id] = $context;
 	}
 
 	/**
@@ -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) {
-			return isset((Coroutine::getContext($coroutineId)[$id] ?? [])[$key]);
+        $value = Coroutine::getContext($coroutineId)[$id];
+		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['param'] = $message;
-			if (!empty($data)) {
-				$params['exPageInfo'] = $data;
-			}
-			$params['message'] = 'System success.';
+            $params['message'] = 'System success.';
+            $params['param'] = $message;
+            if (!empty($data)) {
+                $params['exPageInfo'] = $data;
+            }
 		} else {
 			$params['message'] = $message;
 			$params['param'] = $data;

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')) {
-			$this->tableName = $input->getArgument('name');
+		if ($input->hasOption('name')) {
+			$this->tableName = $input->getOption('name');
 			$redis->del('column:' . $this->tableName);
 		}
 		return match ($make) {

kiri-gii/GiiCommand.php

@@ -32,9 +32,9 @@ class GiiCommand extends Command
 	protected function configure()
 	{
 		$this->setName('sw:gii')
-			->addArgument('action', InputArgument::REQUIRED)
-			->addArgument('name', InputArgument::OPTIONAL)
-			->addArgument('databases', InputArgument::OPTIONAL)
+			->addOption('make','m', InputArgument::OPTIONAL)
+			->addOption('name','t', 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-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.