内核更新

bug修复

core/library/think/Request.php

@@ -1476,23 +1476,37 @@ class Request
      */
     public function cache($key, $expire = null)
     {
-        if (false !== strpos($key, ':')) {
-            $param = $this->param();
-            foreach ($param as $item => $val) {
-                if (is_string($val) && false !== strpos($key, ':' . $item)) {
-                    $key = str_replace(':' . $item, $val, $key);
+        if ($this->isGet()) {
+            if (false !== strpos($key, ':')) {
+                $param = $this->param();
+                foreach ($param as $item => $val) {
+                    if (is_string($val) && false !== strpos($key, ':' . $item)) {
+                        $key = str_replace(':' . $item, $val, $key);
+                    }
+                }
+            } elseif ('__URL__' == $key) {
+                // 当前URL地址作为缓存标识
+                $key = md5($this->url());
+            } elseif (strpos($key, ']')) {
+                if ('[' . $this->ext() . ']' == $key) {
+                    // 缓存某个后缀的请求
+                    $key = md5($this->url());
+                } else {
+                    return;
                 }
             }
-        }
-        if (Cache::has($key)) {
-            // 读取缓存
-            $content  = Cache::get($key);
-            $response = Response::create($content)
-                ->code(304)
-                ->header('Content-Type', Cache::get($key . '_header'));
-            throw new \think\exception\HttpResponseException($response);
-        } else {
-            $this->cache = [$key, $expire];
+
+            if (strtotime($this->server('HTTP_IF_MODIFIED_SINCE')) + $expire > $_SERVER['REQUEST_TIME']) {
+                // 读取缓存
+                $response = Response::create()->code(304);
+                throw new \think\exception\HttpResponseException($response);
+            } elseif (Cache::has($key)) {
+                list($content, $header) = Cache::get($key);
+                $response               = Response::create($content)->header($header);
+                throw new \think\exception\HttpResponseException($response);
+            } else {
+                $this->cache = [$key, $expire];
+            }
         }
     }