Support Redis 6.0 username + password

Author: walkor

src/config/think-cache.php

@@ -10,6 +10,10 @@
             'type' => 'redis',
             // 服务器地址
             'host' => '127.0.0.1',
+            // 无 ACL 用户请留空 username（Redis 6.0 起支持用户名 + 密码认证）
+            'username' => '',
+            // redis密码
+            'password' => '',
             // 缓存前缀
             'prefix' => 'cache:',
             // 默认缓存有效期 0表示永久缓存

src/driver/Redis.php

@@ -32,6 +32,7 @@ class Redis extends Driver
     protected $options = [
         'host'       => '127.0.0.1',
         'port'       => 6379,
+        'username'   => '',
         'password'   => '',
         'select'     => 0,
         'timeout'    => 0,
@@ -58,7 +59,11 @@ public function __construct(array $options = [])
             $this->handler = new \Redis;
             $this->handler->connect($this->options['host'], (int) $this->options['port'], (int) $this->options['timeout']);
             if ('' != $this->options['password']) {
-                $this->handler->auth($this->options['password']);
+                if ('' != $this->options['username']) {
+                    $this->handler->auth([$this->options['username'], $this->options['password']]);
+                } else {
+                    $this->handler->auth($this->options['password']);
+                }
             }
         } elseif (class_exists('\Predis\Client')) {
             $params = [];
@@ -71,6 +76,9 @@ public function __construct(array $options = [])
             if ('' == $this->options['password']) {
                 unset($this->options['password']);
             }
+            if ('' == $this->options['username']) {
+                unset($this->options['username']);
+            }
             $this->handler = new \Predis\Client($this->options, $params);
             $this->options['prefix'] = '';
         } else {