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

改进cache类的store方法为当次有效

Browse Source
This commit is contained in:
thinkphp
2017-03-22 17:12:00 +08:00
parent 00fd0b5e20
commit 5a1cb9cea1
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
library/think/Cache.php
View File

@@ -51,28 +51,29 @@ class Cache
self::$instance[$name] = new $class($options); self::$instance[$name] = new $class($options);
} }
} }
self::$handler = self::$instance[$name]; return self::$instance[$name];
return self::$handler;
} }
/** /**
* 自动初始化缓存 * 自动初始化缓存
* @access public * @access public
* @param array $options 配置数组 * @param array $options 配置数组
* @return void * @return Driver
*/ */
public static function init(array $options = []) public static function init(array $options = [])
{ {
if (is_null(self::$handler)) { if (is_null(self::$handler)) {
// 自动初始化缓存 // 自动初始化缓存
if (!empty($options)) { if (!empty($options)) {
self::connect($options); $connect = self::connect($options);
} elseif ('complex' == Config::get('cache.type')) { } elseif ('complex' == Config::get('cache.type')) {
self::connect(Config::get('cache.default')); $connect = self::connect(Config::get('cache.default'));
} else { } else {
self::connect(Config::get('cache')); $connect = self::connect(Config::get('cache'));
} }
self::$handler = $connect;
} }
return self::$handler;
} }
/** /**
@@ -84,9 +85,9 @@ class Cache
public static function store($name = '') public static function store($name = '')
{ {
if ('' !== $name && 'complex' == Config::get('cache.type')) { if ('' !== $name && 'complex' == Config::get('cache.type')) {
self::connect(Config::get('cache.' . $name), strtolower($name)); return self::connect(Config::get('cache.' . $name), strtolower($name));
} }
return self::$handler; return self::init();
} }
/** /**
@@ -97,9 +98,8 @@ class Cache
*/ */
public static function has($name) public static function has($name)
{ {
self::init();
self::$readTimes++; self::$readTimes++;
return self::$handler->has($name); return self::init()->has($name);
} }
/** /**
@@ -111,9 +111,8 @@ class Cache
*/ */
public static function get($name, $default = false) public static function get($name, $default = false)
{ {
self::init();
self::$readTimes++; self::$readTimes++;
return self::$handler->get($name, $default); return self::init()->get($name, $default);
} }
/** /**
@@ -126,9 +125,8 @@ class Cache
*/ */
public static function set($name, $value, $expire = null) public static function set($name, $value, $expire = null)
{ {
self::init();
self::$writeTimes++; self::$writeTimes++;
return self::$handler->set($name, $value, $expire); return self::init()->set($name, $value, $expire);
} }
/** /**
@@ -140,9 +138,8 @@ class Cache
*/ */
public static function inc($name, $step = 1) public static function inc($name, $step = 1)
{ {
self::init();
self::$writeTimes++; self::$writeTimes++;
return self::$handler->inc($name, $step); return self::init()->inc($name, $step);
} }
/** /**
@@ -154,9 +151,8 @@ class Cache
*/ */
public static function dec($name, $step = 1) public static function dec($name, $step = 1)
{ {
self::init();
self::$writeTimes++; self::$writeTimes++;
return self::$handler->dec($name, $step); return self::init()->dec($name, $step);
} }
/** /**
@@ -167,9 +163,8 @@ class Cache
*/ */
public static function rm($name) public static function rm($name)
{ {
self::init();
self::$writeTimes++; self::$writeTimes++;
return self::$handler->rm($name); return self::init()->rm($name);
} }
/** /**
@@ -180,9 +175,8 @@ class Cache
*/ */
public static function clear($tag = null) public static function clear($tag = null)
{ {
self::init();
self::$writeTimes++; self::$writeTimes++;
return self::$handler->clear($tag); return self::init()->clear($tag);
} }
/** /**
@@ -193,10 +187,9 @@ class Cache
*/ */
public static function pull($name) public static function pull($name)
{ {
self::init();
self::$readTimes++; self::$readTimes++;
self::$writeTimes++; self::$writeTimes++;
return self::$handler->pull($name); return self::init()->pull($name);
} }
/** /**
@@ -209,9 +202,8 @@ class Cache
*/ */
public static function remember($name, $value, $expire = null) public static function remember($name, $value, $expire = null)
{ {
self::init();
self::$readTimes++; self::$readTimes++;
return self::$handler->remember($name, $value, $expire); return self::init()->remember($name, $value, $expire);
} }
/** /**
@@ -224,8 +216,7 @@ class Cache
*/ */
public static function tag($name, $keys = null, $overlay = false) public static function tag($name, $keys = null, $overlay = false)
{ {
self::init(); return self::init()->tag($name, $keys, $overlay);
return self::$handler->tag($name, $keys, $overlay);
} }
} }