mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

请求缓存支持缓存标签设置

Browse Source
This commit is contained in:
thinkphp
2017-08-17 14:22:53 +08:00
parent db965e1786
commit 5d80302da5
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Request.php
View File

@@ -1534,10 +1534,16 @@ class Request
* @param string $key 缓存标识，支持变量规则 ，例如 item/:name/:id * @param string $key 缓存标识，支持变量规则 ，例如 item/:name/:id
* @param mixed $expire 缓存有效期 * @param mixed $expire 缓存有效期
* @param array $except 缓存排除 * @param array $except 缓存排除
* @param string $tag 缓存标签
* @return void * @return void
*/ */
public function cache($key, $expire = null, $except = []) public function cache($key, $expire = null, $except = [], $tag = null)
{ {
if (!is_array($except)) {
$tag = $except;
$except = [];
}
if (false !== $key && $this->isGet() && !$this->isCheckCache) { if (false !== $key && $this->isGet() && !$this->isCheckCache) {
// 标记请求缓存检查 // 标记请求缓存检查
$this->isCheckCache = true; $this->isCheckCache = true;
@@ -1591,7 +1597,7 @@ class Request
$response = Response::create($content)->header($header); $response = Response::create($content)->header($header);
throw new \think\exception\HttpResponseException($response); throw new \think\exception\HttpResponseException($response);
} else { } else {
$this->cache = [$key, $expire]; $this->cache = [$key, $expire, $tag];
} }
} }
} }

2
library/think/Response.php
View File

@@ -106,7 +106,7 @@ class Response
$this->header['Cache-Control'] = 'max-age=' . $cache[1] . ',must-revalidate'; $this->header['Cache-Control'] = 'max-age=' . $cache[1] . ',must-revalidate';
$this->header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT'; $this->header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT';
$this->header['Expires'] = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT'; $this->header['Expires'] = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT';
Cache::set($cache[0], [$data, $this->header], $cache[1]); Cache::tag($cache[2])->set($cache[0], [$data, $this->header], $cache[1]);
} }
} }

5
library/think/Route.php
View File

@@ -1512,12 +1512,13 @@ class Route
if ($request->isGet() && isset($option['cache'])) { if ($request->isGet() && isset($option['cache'])) {
$cache = $option['cache']; $cache = $option['cache'];
if (is_array($cache)) { if (is_array($cache)) {
list($key, $expire) = $cache; list($key, $expire, $tag) = array_pad($cache, 3, null);
} else { } else {
$key = str_replace('|', '/', $pathinfo); $key = str_replace('|', '/', $pathinfo);
$expire = $cache; $expire = $cache;
$tag = null;
} }
$request->cache($key, $expire); $request->cache($key, $expire, $tag);
} }
return $result; return $result;
} }

4
library/think/cache/Driver.php vendored
View File

@@ -140,7 +140,9 @@ abstract class Driver
*/ */
public function tag($name, $keys = null, $overlay = false) public function tag($name, $keys = null, $overlay = false)
{ {
if (is_null($keys)) { if (is_null($name)) {
} elseif (is_null($keys)) {
$this->tag = $name; $this->tag = $name;
} else { } else {
$key = 'tag_' . md5($name); $key = 'tag_' . md5($name);