1、安装文件更新

2、内核更新

core/library/think/cache/driver/File.php

@@ -69,19 +69,17 @@ class File
         $name = md5($name);
         if ($this->options['cache_subdir']) {
             // 使用子目录
-            $dir = '';
-            $len = $this->options['path_level'];
-            for ($i = 0; $i < $len; $i++) {
-                $dir .= $name{$i} . DS;
-            }
-            if (!is_dir($this->options['path'] . $dir)) {
-                mkdir($this->options['path'] . $dir, 0755, true);
-            }
-            $filename = $dir . $this->options['prefix'] . $name . '.php';
-        } else {
-            $filename = $this->options['prefix'] . $name . '.php';
+            $name = substr($md5, 0, 2) . DS . substr($md5, 2);
         }
-        return $this->options['path'] . $filename;
+        if ($this->options['prefix']) {
+            $name = $this->options['prefix'] . DS . $name;
+        }
+        $filename = $this->options['path'] . $name . '.php';
+        $dir      = dirname($filename);
+        if (!is_dir($dir)) {
+            mkdir($dir, 0755, true);
+        }
+        return $filename;
     }
 
     /**
@@ -163,17 +161,16 @@ class File
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
         if ($this->has($name)) {
             $value = $this->get($name) + $step;
         } else {
             $value = $step;
         }
-        return $this->set($name, $value, $expire) ? $value : false;
+        return $this->set($name, $value, 0) ? $value : false;
     }
 
     /**
@@ -181,17 +178,16 @@ class File
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
         if ($this->has($name)) {
             $value = $this->get($name) - $step;
         } else {
             $value = $step;
         }
-        return $this->set($name, $value, $expire) ? $value : false;
+        return $this->set($name, $value, 0) ? $value : false;
     }
 
     /**

core/library/think/cache/driver/Lite.php

@@ -118,17 +118,16 @@ class Lite
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
         if ($this->has($name)) {
             $value = $this->get($name) + $step;
         } else {
             $value = $step;
         }
-        return $this->set($name, $value, $expire) ? $value : false;
+        return $this->set($name, $value, 0) ? $value : false;
     }
 
     /**
@@ -136,17 +135,16 @@ class Lite
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
         if ($this->has($name)) {
             $value = $this->get($name) - $step;
         } else {
             $value = $step;
         }
-        return $this->set($name, $value, $expire) ? $value : false;
+        return $this->set($name, $value, 0) ? $value : false;
     }
 
     /**

core/library/think/cache/driver/Memcache.php

@@ -105,10 +105,9 @@ class Memcache
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
         return $this->handler->increment($name, $step);
     }
@@ -118,10 +117,9 @@ class Memcache
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
         return $this->handler->decrement($name, $step);
     }

core/library/think/cache/driver/Memcached.php

@@ -111,10 +111,9 @@ class Memcached
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
         return $this->handler->increment($name, $step);
     }
@@ -124,10 +123,9 @@ class Memcached
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
         return $this->handler->decrement($name, $step);
     }

core/library/think/cache/driver/Redis.php

@@ -111,10 +111,9 @@ class Redis
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
         return $this->handler->incrby($name, $step);
     }
@@ -124,10 +123,9 @@ class Redis
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
         return $this->handler->decrby($name, $step);
     }

core/library/think/cache/driver/Sqlite.php

@@ -115,17 +115,16 @@ class Sqlite
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
         if ($this->has($name)) {
             $value = $this->get($name) + $step;
         } else {
             $value = $step;
         }
-        return $this->set($name, $value, $expire) ? $value : false;
+        return $this->set($name, $value, 0) ? $value : false;
     }
 
     /**
@@ -133,17 +132,16 @@ class Sqlite
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
         if ($this->has($name)) {
             $value = $this->get($name) - $step;
         } else {
             $value = $step;
         }
-        return $this->set($name, $value, $expire) ? $value : false;
+        return $this->set($name, $value, 0) ? $value : false;
     }
 
     /**

core/library/think/cache/driver/Wincache.php

@@ -90,12 +90,11 @@ class Wincache
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
-        return wincache_ucache_inc($name, $step, $expire);
+        return wincache_ucache_inc($name, $step);
     }
 
     /**
@@ -103,12 +102,11 @@ class Wincache
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
-        return wincache_ucache_dec($name, $step, $expire);
+        return wincache_ucache_dec($name, $step);
     }
 
     /**

core/library/think/cache/driver/Xcache.php

@@ -90,12 +90,11 @@ class Xcache
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function inc($name, $step = 1, $expire = null)
+    public function inc($name, $step = 1)
     {
-        return xcache_inc($name, $step, $expire);
+        return xcache_inc($name, $step);
     }
 
     /**
@@ -103,12 +102,11 @@ class Xcache
      * @access public
      * @param string    $name 缓存变量名
      * @param int       $step 步长
-     * @param int       $expire  有效时间 0为永久
      * @return false|int
      */
-    public function dec($name, $step = 1, $expire = null)
+    public function dec($name, $step = 1)
     {
-        return xcache_dec($name, $step, $expire);
+        return xcache_dec($name, $step);
     }
 
     /**