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

改进模板缓存检测方式；增加全局布局文件开关

Browse Source
This commit is contained in:
oldrind
2016-02-18 21:23:55 +08:00
parent c364b91ff5
commit 4dc26f5dab
8 changed files with 199 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
library/think/template/driver/File.php
View File

@@ -15,7 +15,12 @@ use think\Exception;
class File
{
// 写入编译缓存
/**
* 写入编译缓存
* @string $cacheFile 缓存的文件名
* @string $content 缓存的内容
* @return void|array
*/
public function write($cacheFile, $content)
{
// 检测模板目录
@@ -29,22 +34,43 @@ class File
}
}
// 读取编译编译
public function read($cacheFile, $vars)
/**
* 读取编译编译
* @string $cacheFile 缓存的文件名
* @array $vars 变量数组
* @boolean $isReturn 是否返回内容
* @return void|array
*/
public function read($cacheFile, $vars = [], $isReturn = false)
{
// 模板阵列变量分解成为独立变量
extract($vars, EXTR_OVERWRITE);
//载入模版缓存文件
include $cacheFile;
if (!empty($vars) && is_array($vars)) {
// 模板阵列变量分解成为独立变量
extract($vars, EXTR_OVERWRITE);
}
if ($isReturn) {
//载入模版缓存文件
include $cacheFile;
} else {
return include $cacheFile;
}
}
// 检查编译缓存是否有效
public function check($template, $cacheFile, $cacheTime)
/**
* 检查编译缓存是否有效
* @array $template 用到的模板更新时间列表
* @string $cacheFile 缓存的文件名
* @int $cacheTime 缓存时间
* @return boolean
*/
public function check($files, $cacheFile, $cacheTime)
{
if (!is_file($cacheFile) || (is_file($template) && filemtime($template) > filemtime($cacheFile))) {
// 模板文件如果有更新则缓存需要更新
return false;
} elseif (0 != $cacheTime && time() > filemtime($cacheFile) + $cacheTime) {
foreach($files as $time => $path) {
if (is_file($path) && filemtime($path) > $time) {
// 模板文件如果有更新则缓存需要更新
return false;
}
}
if (0 != $cacheTime && time() > filemtime($cacheFile) + $cacheTime) {
// 缓存是否在有效期
return false;
}

44
library/think/template/driver/Sae.php
View File

@@ -35,7 +35,12 @@ class Sae
}
}
// 写入编译缓存
/**
* 写入编译缓存
* @string $cacheFile 缓存的文件名
* @string $content 缓存的内容
* @return void|array
*/
public function write($cacheFile, $content)
{
// 添加写入时间
@@ -48,23 +53,42 @@ class Sae
}
}
// 读取编译编译
public function read($cacheFile, $vars)
/**
* 读取编译编译
* @string $cacheFile 缓存的文件名
* @array $vars 变量数组
* @boolean $isReturn 是否返回内容
* @return void|array
*/
public function read($cacheFile, $vars = [], $isReturn = false)
{
if (!is_null($vars)) {
if (!empty($vars) && is_array($vars)) {
extract($vars, EXTR_OVERWRITE);
}
eval('?>' . $this->get($cacheFile, 'content'));
if ($isReturn) {
return $this->get($cacheFile, 'content');
} else {
eval('?>' . $this->get($cacheFile, 'content'));
}
}
// 检查编译缓存是否有效
/**
* 检查编译缓存是否有效
* @array $template 用到的模板更新时间列表
* @string $cacheFile 缓存的文件名
* @int $cacheTime 缓存时间
* @return boolean
*/
public function check($template, $cacheFile, $cacheTime)
{
foreach($template as $time => $path) {
if (is_file($path) && filemtime($path) > $time) {
// 模板文件如果有更新则缓存需要更新
return false;
}
}
$mtime = $this->get($cacheFile, 'mtime');
if (!$this->get($cacheFile, 'content') || (is_file($template) && filemtime($template) > $mtime)) {
// 模板文件如果有更新则缓存需要更新
return false;
}if (0 != $cacheTime && time() > $mtime + $cacheTime) {
if (0 != $cacheTime && time() > $mtime + $cacheTime) {
// 缓存是否在有效期
return false;
} else {