改名

system/Abstracts/BaseApplication.php

@@ -15,6 +15,7 @@ use HttpServer\Http\Response;
 use HttpServer\Route\Router;
 use HttpServer\Server;
 use Snowflake\Annotation\Annotation;
+use Snowflake\Cache\Redis;
 use Snowflake\Config;
 use Snowflake\Di\Service;
 use Snowflake\Error\ErrorHandler;
@@ -26,6 +27,8 @@ use Snowflake\Pool\RedisClient;
 use Snowflake\Processes;
 use Snowflake\Snowflake;
 use Snowflake\Event;
+use Database\Connection as DbConnection;
+use Snowflake\Pool\Pool as SPool;
 
 /**
  * Class BaseApplication
@@ -35,8 +38,9 @@ use Snowflake\Event;
  * @property Event $event
  * @property Router $router
  * @property Processes $processes
- * @property \Snowflake\Pool\Pool $pool
+ * @property SPool $pool
  * @property Server $servers
+ * @property DbConnection $db
  * @property Connection $connections
  * @property Logger $logger
  */
@@ -204,6 +208,15 @@ abstract class BaseApplication extends Service
 	}
 
 
+	/**
+	 * @return mixed
+	 * @throws ComponentException
+	 */
+	public function getRedis()
+	{
+		return $this->get('redis');
+	}
+
 	/**
 	 * @param $ip
 	 * @return bool
@@ -223,14 +236,16 @@ abstract class BaseApplication extends Service
 			'event'             => ['class' => Event::class],
 			'annotation'        => ['class' => Annotation::class],
 			'processes'         => ['class' => Processes::class],
+			'db'                => ['class' => DbConnection::class],
 			'connections'       => ['class' => Connection::class],
 			'redis_connections' => ['class' => RedisClient::class],
-			'pool'              => ['class' => \Snowflake\Pool\Pool::class],
+			'pool'              => ['class' => SPool::class],
 			'response'          => ['class' => Response::class],
 			'request'           => ['class' => Request::class],
 			'config'            => ['class' => Config::class],
 			'logger'            => ['class' => Logger::class],
 			'router'            => ['class' => Router::class],
+			'redis'             => ['class' => Redis::class],
 		]);
 	}
 }

system/Cache/Redis.php

@@ -12,6 +12,7 @@ use Exception;
 use Snowflake\Abstracts\Component;
 use Snowflake\Config;
 use Snowflake\Event;
+use Snowflake\Exception\ConfigException;
 use Snowflake\Snowflake;
 use Swoole\Coroutine;
 
@@ -331,17 +332,27 @@ class Redis extends Component
 
 	/**
 	 * @return array
+	 * @throws ConfigException
 	 */
 	public function get_config(): array
 	{
+		$config = Config::get('cache.redis', false, [
+			'host'         => '127.0.0.1',
+			'port'         => '6379',
+			'prefix'       => Config::get('id'),
+			'auth'         => '',
+			'databases'    => '0',
+			'timeout'      => -1,
+			'read_timeout' => -1,
+		]);
 		return [
-			'host'         => env('REDIS.HOST', $this->host),
-			'port'         => env('REDIS.PORT', $this->port),
-			'auth'         => env('REDIS.PASSWORD', $this->auth),
-			'timeout'      => env('REDIS.TIMEOUT', 2),
-			'databases'    => env('REDIS.DATABASE', $this->databases),
-			'read_timeout' => env('REDIS.READ_TIMEOUT', 10),
-			'prefix'       => env('REDIS.PREFIX', 'system:'),
+			'host'         => $config['host'],
+			'port'         => $config['port'],
+			'auth'         => $config['auth'],
+			'timeout'      => $config['conn_timeout'],
+			'databases'    => $config['databases'],
+			'read_timeout' => $config['read_timeout'],
+			'prefix'       => $config['prefix'],
 		];
 	}