From 5e12c653290bffbe29aa3f6a31fd6c53fd33b5df Mon Sep 17 00:00:00 2001
From: tanszhe <1018595261@qq.com>
Date: Fri, 31 May 2019 16:36:42 +0800
Subject: [PATCH] del default

---
 src/Cache/Redis.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Cache/Redis.php b/src/Cache/Redis.php
index 7362c6b..b48e460 100644
--- a/src/Cache/Redis.php
+++ b/src/Cache/Redis.php
@@ -21,8 +21,6 @@ class Redis extends Cache
 
     private $retry_count = 3;
 
-    public $keep_default = false;
-
     public function __construct($key = 'default')
     {
         $this->setConnection($key);
@@ -89,12 +87,12 @@ class Redis extends Cache
     {
         try {
             $rs  = $this->pop();
-            $val = $rs->get($this->keep_default === false ? $this->getTagKey($key, $tags) : $key);
+            $val = $rs->get($this->getTagKey($key, $tags));
             $this->push($rs);
             if ((!$val) && $closure) {
                 $val = $closure();
                 $this->set($key, $val, $ttl, $tags);
-            } else if ($val && $this->keep_default === false) {
+            } else if ($val) {
                 $val = unserialize($val);
             }
             $this->setRetryCount();
@@ -108,7 +106,7 @@ class Redis extends Cache
     {
 
         try {
-            if (is_string($key) && $this->keep_default === false) {
+            if (is_string($key)) {
                 $key = $this->getTagKey($key);
             }
             $rs  = $this->pop();
@@ -137,12 +135,8 @@ class Redis extends Cache
     public function set($key, $val, $ttl = null, $tags = [])
     {
         try {
-            $rs = $this->pop();
-            if ($this->keep_default === false) {
-                $ret = $rs->set($this->getTagKey($key, $tags), serialize($val), $ttl);
-            } else {
-                $ret = $rs->set($key, $val, $ttl);
-            }
+            $rs  = $this->pop();
+            $ret = $rs->set($this->getTagKey($key, $tags), serialize($val), $ttl);
             $this->push($rs);
             $this->setRetryCount();
             return $ret;
-- 
GitLab