改名

core/Abstracts/BaseApplication.php

@@ -319,7 +319,7 @@ abstract class BaseApplication extends Component
 	 */
 	public function getRedis(): Redis|\Redis
 	{
-		return $this->get('redis');
+		return Kiri::getDi()->get(Redis::class);
 	}
 
 	/**
@@ -463,7 +463,6 @@ abstract class BaseApplication extends Component
 			'config'          => ['class' => Config::class],
 			'logger'          => ['class' => Logger::class],
 			'annotation'      => ['class' => SAnnotation::class],
-			'redis'           => ['class' => Redis::class],
 			'databases'       => ['class' => Connection::class],
 			'aop'             => ['class' => AspectManager::class],
 			'input'           => ['class' => HttpParams::class],

core/Abstracts/TraitApplication.php

@@ -15,7 +15,6 @@ use Server\Server;
 use Http\Shutdown;
 use Kiri\Crontab\Producer;
 use Kiri\Async;
-use Kiri\Cache\Redis;
 use Kiri\Error\Logger;
 use Kiri\Jwt\Jwt;
 
@@ -23,7 +22,6 @@ use Kiri\Jwt\Jwt;
  * Trait TraitApplication
  * @package Kiri\Abstracts
  * @property Router $router
- * @property \Redis|Redis $redis
  * @property Server $server
  * @property DatabasesProviders $db
  * @property Async $async

function.php

@@ -394,7 +394,7 @@ if (!function_exists('redis')) {
      */
     function redis(): \Kiri\Cache\Redis|Redis
     {
-        return Kiri::app()->getRedis();
+        return Kiri::getDi()->get(\Kiri\Cache\Redis::class);
     }
 }
 

kiri-gii/Gii.php

@@ -12,6 +12,7 @@ namespace Gii;
 use Database\Connection;
 use Database\Db;
 use Exception;
+use Kiri\Cache\Redis;
 use Kiri\Exception\ComponentException;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
@@ -64,7 +65,6 @@ class Gii
 	 * @param $db
 	 * @return array
 	 * @throws ComponentException
-	 * @throws ConfigException
 	 * @throws Exception
 	 */
 	public function gen(InputInterface $input, $db): array
@@ -103,7 +103,6 @@ class Gii
 	 * @param $make
 	 * @param $input
 	 * @return array
-	 * @throws ComponentException
 	 * @throws Exception
 	 */
 	private function getModel($make, $input): array
@@ -126,7 +125,7 @@ class Gii
 	 */
 	private function makeByDatabases($make, InputInterface $input): array
 	{
-		$redis = Kiri::app()->getRedis();
+		$redis = Kiri::getDi()->get(Redis::class);
 		if (!empty($input->getArgument('name'))) {
 			$this->tableName = $input->getArgument('name');
 			$redis->del('column:' . $this->tableName);