Merge pull request #60 from wonder-game/develop

feat: cacheGet增加mergeExt形参
wonder-game · Oct 18, 2023 · 6f3be77 · 6f3be77
2 parents a83e11f + 9cfd9d9
commit 6f3be77
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Common/OrmCache/Strings.php b/src/Common/OrmCache/Strings.php
@@ -221,9 +221,9 @@ public function cacheSet($id, $data = [], $bloom = false)
         }, $this->redisPoolName);
     }
 
-    public function cacheGet($id)
+    public function cacheGet($id, $mergeExt = null)
     {
-        return RedisPool::invoke(function (Redis $redis) use ($id) {
+        return RedisPool::invoke(function (Redis $redis) use ($id, $mergeExt) {
 
             if ($this->bloom) {
                 $bloomKey = $id;
@@ -261,7 +261,7 @@ public function cacheGet($id)
                 return false;
             }
             is_string($data) && $data = json_decode_ext($data);
-            $this->mergeExt && $data = $this->_mergeExt($data);
+            (is_null($mergeExt) ? $this->mergeExt : $mergeExt) && $data = $this->_mergeExt($data);
             return $data;
         }, $this->redisPoolName);
     }