* [refac] user can set database of redis.

module/cache/config/form.php

@@ -5,4 +5,4 @@ $config->cache->form->setting['enable']    = array('type' => 'int',    'default'
 $config->cache->form->setting['driver']    = array('type' => 'string', 'default' => '');
 $config->cache->form->setting['scope']     = array('type' => 'string', 'default' => '');
 $config->cache->form->setting['namespace'] = array('type' => 'string', 'default' => '');
-$config->cache->form->setting['redis']     = array('type' => 'array',  'default' => array('host' => '', 'port' => 0, 'username' => '', 'password' => '', 'serializer' => ''));
+$config->cache->form->setting['redis']     = array('type' => 'array',  'default' => array('host' => '', 'port' => 0, 'username' => '', 'password' => '', 'database' => 0, 'serializer' => 'igbinary'));

module/cache/control.php

@@ -32,6 +32,7 @@ class cache extends control
             if(!isset($redis->port))       $redis->port       = '';
             if(!isset($redis->username))   $redis->username   = '';
             if(!isset($redis->password))   $redis->password   = '';
+            if(!isset($redis->database))   $redis->database   = '';
             if(!isset($redis->serializer)) $redis->serializer = '';
 
             if($cache->enable)
@@ -42,6 +43,7 @@ class cache extends control
                 if(empty($cache->namespace)) $errors['namespace'] = sprintf($this->lang->error->notempty, $this->lang->cache->namespace);
                 if($cache->driver == 'redis' && empty($redis->host)) $errors['redis[host]'] = sprintf($this->lang->error->notempty, $this->lang->cache->redis->host);
                 if($cache->driver == 'redis' && empty($redis->port)) $errors['redis[port]'] = sprintf($this->lang->error->notempty, $this->lang->cache->redis->port);
+                if($cache->driver == 'redis' && empty($redis->database) && $redis->database !== '0') $errors['redis[database]'] = sprintf($this->lang->error->notempty, $this->lang->cache->redis->database);
                 if($errors) return $this->send(array('result' => 'fail', 'message' => $errors));
 
                 if($cache->driver == 'apcu')

module/cache/lang/de.php

@@ -37,6 +37,7 @@ $lang->cache->redis->serializerList['igbinary'] = 'igbinary';
 
 $lang->cache->redis->tips = new stdClass();
 $lang->cache->redis->tips->host       = 'Fill in the domain name or IP address, and do not need to fill in the protocol and port number.';
+$lang->cache->redis->tips->database   = 'Fill in the number of the Redis database, the default is 0.';
 $lang->cache->redis->tips->serializer = 'Data needs to be serialized and cached. Changing the serializer will clear the cached data.';
 
 $lang->cache->tips = new stdClass();

module/cache/lang/en.php

@@ -37,6 +37,7 @@ $lang->cache->redis->serializerList['igbinary'] = 'igbinary';
 
 $lang->cache->redis->tips = new stdClass();
 $lang->cache->redis->tips->host       = 'Fill in the domain name or IP address, and do not need to fill in the protocol and port number.';
+$lang->cache->redis->tips->database   = 'Fill in the number of the Redis database, the default is 0.';
 $lang->cache->redis->tips->serializer = 'Data needs to be serialized and cached. Changing the serializer will clear the cached data.';
 
 $lang->cache->tips = new stdClass();

module/cache/lang/fr.php

@@ -37,6 +37,7 @@ $lang->cache->redis->serializerList['igbinary'] = 'igbinary';
 
 $lang->cache->redis->tips = new stdClass();
 $lang->cache->redis->tips->host       = 'Fill in the domain name or IP address, and do not need to fill in the protocol and port number.';
+$lang->cache->redis->tips->database   = 'Fill in the number of the Redis database, the default is 0.';
 $lang->cache->redis->tips->serializer = 'Data needs to be serialized and cached. Changing the serializer will clear the cached data.';
 
 $lang->cache->tips = new stdClass();

module/cache/lang/zh-cn.php

@@ -27,6 +27,7 @@ $lang->cache->redis->host               = 'Redis 主机';
 $lang->cache->redis->port               = 'Redis 端口';
 $lang->cache->redis->username           = 'Redis 用户名';
 $lang->cache->redis->password           = 'Redis 密码';
+$lang->cache->redis->database           = 'Redis 数据库';
 $lang->cache->redis->serializer         = 'Redis 序列化器';
 $lang->cache->redis->notice             = '使用 Redis 缓存需要先加载 Redis 扩展。';
 $lang->cache->redis->notLoaded          = '请加载 Redis 扩展后再开启数据缓存。';
@@ -37,6 +38,7 @@ $lang->cache->redis->serializerList['igbinary'] = 'igbinary';
 
 $lang->cache->redis->tips = new stdClass();
 $lang->cache->redis->tips->host       = '填写域名或 IP 地址，无需填写协议和端口号。';
+$lang->cache->redis->tips->database   = '填写 Redis 数据库的编号，默认为 0。';
 $lang->cache->redis->tips->serializer = '数据需要序列化后缓存。更改序列化器会清空缓存数据。';
 
 $lang->cache->tips = new stdClass();

module/cache/ui/setting.html.php

@@ -10,12 +10,9 @@ declare(strict_types=1);
  */
 namespace zin;
 
-$driver      = !empty($config->cache->driver)     ? $config->cache->driver     : '';
-$namespace   = !empty($config->cache->namespace)  ? $config->cache->namespace  : $config->db->name;
-$serializer  = !empty($config->redis->serializer) ? $config->redis->serializer : 'serialize';
 $hiddenCache = $config->cache->enable ? '' : ' hidden';
-$hiddenApcu  = !$hiddenCache && $driver == 'apcu'  ? '' : ' hidden';
-$hiddenRedis = !$hiddenCache && $driver == 'redis' ? '' : ' hidden';
+$hiddenApcu  = !$hiddenCache && $config->cache->driver == 'apcu'  ? '' : ' hidden';
+$hiddenRedis = !$hiddenCache && $config->cache->driver == 'redis' ? '' : ' hidden';
 
 formPanel
 (
@@ -49,7 +46,7 @@ formPanel
             setClass('w-1/3'),
             set::name('driver'),
             set::items($lang->cache->driverList),
-            set::value($driver),
+            set::value($config->cache->driver),
             set::inline(true)
         ),
         span
@@ -94,7 +91,7 @@ formPanel
         (
             setClass('w-1/3'),
             set::name('namespace'),
-            set::value($namespace)
+            set::value($config->cache->namespace ?: $config->db->name)
         ),
         span
         (
@@ -157,6 +154,27 @@ formPanel
         )
     ),
     formGroup
+    (
+        setClass('redis' . $hiddenRedis),
+        set::label($lang->cache->redis->database),
+        set::required(),
+        input
+        (
+            setClass('w-1/3'),
+            set::type('number'),
+            set::min(0),
+            set::step(1),
+            set::name('redis[database]'),
+            set::value($config->redis->database)
+        ),
+        span
+        (
+            setClass('ml-4 mt-1.5'),
+            icon('info text-warning mr-2'),
+            $lang->cache->redis->tips->database
+        )
+    ),
+    formGroup
     (
         setClass('redis' . $hiddenRedis),
         set::label($lang->cache->redis->serializer),
@@ -165,7 +183,7 @@ formPanel
             setClass('w-1/3'),
             set::name('redis[serializer]'),
             set::items($lang->cache->redis->serializerList),
-            set::value($serializer),
+            set::value($config->redis->serializer),
             set::inline(true)
         ),
         span