内核更新

core/library/think/cache/driver/Redis.php

@@ -11,6 +11,8 @@
 
 namespace think\cache\driver;
 
+use think\cache\Driver;
+
 /**
  * Redis缓存驱动，适合单机部署、有前端代理实现高可用的场景，性能最好
  * 有需要在业务层实现读写分离、或者使用RedisCluster的需求，请使用Redisd驱动
@@ -18,7 +20,7 @@ namespace think\cache\driver;
  * 要求安装phpredis扩展：https://github.com/nicolasff/phpredis
  * @author    尘缘 <130775@qq.com>
  */
-class Redis
+class Redis extends Driver
 {
     protected $handler = null;
     protected $options = [
@@ -61,7 +63,7 @@ class Redis
      */
     public function has($name)
     {
-        return $this->handler->get($this->options['prefix'] . $name) ? true : false;
+        return $this->handler->get($this->getCacheKey($name)) ? true : false;
     }
 
     /**
@@ -73,7 +75,7 @@ class Redis
      */
     public function get($name, $default = false)
     {
-        $value = $this->handler->get($this->options['prefix'] . $name);
+        $value = $this->handler->get($this->getCacheKey($name));
         if (is_null($value)) {
             return $default;
         }
@@ -95,14 +97,18 @@ class Redis
         if (is_null($expire)) {
             $expire = $this->options['expire'];
         }
-        $name = $this->options['prefix'] . $name;
+        if ($this->tag && !$this->has($name)) {
+            $first = true;
+        }
+        $key = $this->getCacheKey($name);
         //对数组/对象数据进行缓存处理，保证数据完整性  byron sampson<xiaobo.sun@qq.com>
         $value = (is_object($value) || is_array($value)) ? json_encode($value) : $value;
         if (is_int($expire) && $expire) {
-            $result = $this->handler->setex($name, $expire, $value);
+            $result = $this->handler->setex($key, $expire, $value);
         } else {
-            $result = $this->handler->set($name, $value);
+            $result = $this->handler->set($key, $value);
         }
+        isset($first) && $this->setTagItem($key);
         return $result;
     }
 
@@ -115,8 +121,8 @@ class Redis
      */
     public function inc($name, $step = 1)
     {
-        $name = $this->options['prefix'] . $name;
-        return $this->handler->incrby($name, $step);
+        $key = $this->getCacheKey($name);
+        return $this->handler->incrby($key, $step);
     }
 
     /**
@@ -128,8 +134,8 @@ class Redis
      */
     public function dec($name, $step = 1)
     {
-        $name = $this->options['prefix'] . $name;
-        return $this->handler->decrby($name, $step);
+        $key = $this->getCacheKey($name);
+        return $this->handler->decrby($key, $step);
     }
 
     /**
@@ -140,16 +146,26 @@ class Redis
      */
     public function rm($name)
     {
-        return $this->handler->delete($this->options['prefix'] . $name);
+        return $this->handler->delete($this->getCacheKey($name));
     }
 
     /**
      * 清除缓存
      * @access public
+     * @param string $tag 标签名
      * @return boolean
      */
-    public function clear()
+    public function clear($tag = null)
     {
+        if ($tag) {
+            // 指定标签清除
+            $keys = $this->getTagItem($tag);
+            foreach ($keys as $key) {
+                $this->handler->delete($key);
+            }
+            $this->rm('tag_' . md5($tag));
+            return true;
+        }
         return $this->handler->flushDB();
     }