From b9579677a67e377e86197e744317e6f5ffc84101 Mon Sep 17 00:00:00 2001 From: top_nuomi <1130395124@qq.com> Date: Mon, 2 Sep 2019 12:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=93=E5=AD=98=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/library/cache/driver/File.php | 100 ++++++++++++++--------- framework/library/cache/driver/Redis.php | 23 ++---- 2 files changed, 70 insertions(+), 53 deletions(-) diff --git a/framework/library/cache/driver/File.php b/framework/library/cache/driver/File.php index 0a228ea..01277cc 100644 --- a/framework/library/cache/driver/File.php +++ b/framework/library/cache/driver/File.php @@ -21,6 +21,12 @@ class File implements CacheIfs */ private static $instance; + /** + * 已读取的文件 + * @var array + */ + private $files = []; + /** * 默认缓存位置 * @var null|string @@ -64,11 +70,14 @@ class File implements CacheIfs { $this->createCacheDir(); $filename = $this->getFileName($key); - if (is_array($value) || is_object($value)) { - $value = json_encode($value); - } - $content = '' . PHP_EOL . $value; + $cacheArray = [ + 'create' => time(), + 'time' => $timeout, + 'value' => $value + ]; + $content = serialize($cacheArray); if (file_put_contents($filename, $content)) { + $this->files[$key] = $cacheArray; return true; } return false; @@ -82,17 +91,12 @@ class File implements CacheIfs */ public function get($key = null, $callable = null) { - $filename = $this->getFileName($key); - // 如果缓存文件存在 - if (file_exists($filename)) { - // 判断文件是否有效 - if ($this->isTimeOut($key)) { - // 返回缓存数据 - return $this->getCacheContent($key); - } - } - // 如果缓存不存在或缓存无效并且存在callable - if (is_callable($callable)) { + // 判断缓存是否存在 + if ($this->exists($key)) { + // 返回缓存数据 + return $this->getCacheContent($key); + } elseif (is_callable($callable)) { + // 如果缓存不存在但是存在callable，则调用 return $callable($this); } return false; @@ -106,7 +110,7 @@ class File implements CacheIfs public function remove($key = null) { $filename = $this->getFileName($key); - if (file_exists($filename)) { + if (is_file($filename)) { @unlink($filename); } return true; @@ -119,7 +123,11 @@ class File implements CacheIfs */ public function exists($key) { - return $this->isTimeOut($key); + $filename = $this->getFileName($key); + if (is_file($filename) && !$this->timeOut($key)) { + return true; + } + return false; } /** @@ -129,16 +137,8 @@ class File implements CacheIfs */ private function getCacheContent($key) { - $filename = $this->getFileName($key); - ob_start(); - require $filename; - $content = ob_get_contents(); - ob_clean(); - $jsonDecode = json_decode($content, true); - if (is_null($jsonDecode)) { - return $content; - } - return $jsonDecode; + $content = $this->readCacheFile($key); + return (!$content) ? false : $content['value']; } /** @@ -146,25 +146,47 @@ class File implements CacheIfs * @param $key * @return bool */ - private function isTimeOut($key) + private function timeOut($key) { - $filename = $this->getFileName($key); - if (file_exists($filename)) { - ob_start(); - require $filename; - ob_clean(); - $mtime = filemtime($filename); + $content = $this->readCacheFile($key); + // 缓存文件存在，已读取到内容 + if (!empty($content)) { + $mtime = $content['create']; + $timeout = $content['time']; if ($timeout == 0) { - return true; + return false; } elseif ((time() - $mtime >= $timeout)) { // 已超时，删除缓存 $this->remove($key); - return false; - } else { return true; + } else { + return false; } } - return false; + // 否则直接返回超时 + return true; + } + + /** + * 读取缓存文件 + * @param $key + * @return mixed + */ + private function readCacheFile($key) + { + if (!isset($this->files[$key])) { + // 获取文件名 + $filename = $this->getFileName($key); + if (is_file($filename)) { + $content = file_get_contents($filename); + $this->files[$key] = unserialize($content); + unset($content); + } else { + // 文件不存在 + $this->files[$key] = false; + } + } + return $this->files[$key]; } /** @@ -174,7 +196,7 @@ class File implements CacheIfs */ public function getFileName($key) { - return $this->dir . $key . '.php'; + return $this->dir . $key . '.txt'; } /** diff --git a/framework/library/cache/driver/Redis.php b/framework/library/cache/driver/Redis.php index 0534a23..f3e338b 100644 --- a/framework/library/cache/driver/Redis.php +++ b/framework/library/cache/driver/Redis.php @@ -2,7 +2,6 @@ namespace top\library\cache\driver; - use top\library\cache\ifs\CacheIfs; use top\library\Config; use top\traits\Instance; @@ -14,6 +13,7 @@ use top\traits\Instance; */ class Redis implements CacheIfs { + use Instance; /** @@ -55,9 +55,8 @@ class Redis implements CacheIfs */ public function set($key, $value, $timeout = 10) { - if (is_array($value) || is_object($value)) { - $value = json_encode($value); - } + $data = ['value' => $value]; + $value = serialize($data); $timeout = $timeout == 0 ? null : $timeout; return $this->redis->set($key, $value, $timeout); } @@ -71,22 +70,18 @@ class Redis implements CacheIfs public function get($key = null, $callable = null) { $status = $this->exists($key); - $value = $status == 0 ? false : $this->redis->get($key); + $value = $status ? $this->redis->get($key) : false; // 如果获取不到结果但是callable存在 if ($value === false) { if (is_callable($callable)) { return $callable($this); } return false; + } else { + $data = unserialize($value); + // 返回转换后的数据 + return $data['value']; } - // 判断值是否是json字符串 - $jsonDecode = json_decode($value, true); - if (is_null($jsonDecode)) { - // 原始数据 - return $value; - } - // 返回转换后的数据 - return $jsonDecode; } /** @@ -106,6 +101,6 @@ class Redis implements CacheIfs */ public function exists($key) { - return $this->redis->exists($key); + return $this->redis->exists($key) ? true : false; } }