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

改进Cache类init方法

Browse Source
This commit is contained in:
thinkphp
2017-12-06 16:52:49 +08:00
parent ecd243bb41
commit cc81f12735
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
library/think/Cache.php
View File

@@ -23,12 +23,12 @@ class Cache
/**
* @var int 缓存读取次数
*/
public static $readTimes = 0;
public static $readTimes = 0;
/**
* @var int 缓存写入次数
*/
public static $writeTimes = 0;
public static $writeTimes = 0;
/**
* @var object 操作句柄
@@ -46,17 +46,21 @@ class Cache
{
$type = !empty($options['type']) ? $options['type'] : 'File';
if (false === $name) $name = md5(serialize($options));
if (false === $name) {
$name = md5(serialize($options));
}
if (true === $name || !isset(self::$instance[$name])) {
$class = false === strpos($type, '\\') ?
'\\think\\cache\\driver\\' . ucwords($type) :
$type;
'\\think\\cache\\driver\\' . ucwords($type) :
$type;
// 记录初始化信息
App::$debug && Log::record('[ CACHE ] INIT ' . $type, 'info');
if (true === $name) return new $class($options);
if (true === $name) {
return new $class($options);
}
self::$instance[$name] = new $class($options);
}
@@ -73,15 +77,15 @@ class Cache
public static function init(array $options = [])
{
if (is_null(self::$handler)) {
if (!empty($options)) {
$connect = self::connect($options);
} elseif ('complex' == Config::get('cache.type')) {
$connect = self::connect(Config::get('cache.default'));
if (empty($options) && 'complex' == Config::get('cache.type')) {
$default = Config::get('cache.default');
// 获取默认缓存配置，并连接
$options = Config::get('cache.' . $default['type']) ?: Config::get('cache.default');
} else {
$connect = self::connect(Config::get('cache'));
$options = !empty($options) ? $options : Config::get('cache');
}
self::$handler = $connect;
self::$handler = self::connect($options);
}
return self::$handler;