mirror of
https://gitee.com/fastadminnet/framework.git
synced 2026-07-07 15:12:48 +08:00
改进Hook类 改进Model类时间戳写入
This commit is contained in:
thinkphp
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
// +----------------------------------------------------------------------
|
// +----------------------------------------------------------------------
|
||||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||||
// +----------------------------------------------------------------------
|
// +----------------------------------------------------------------------
|
||||||
@@ -19,112 +18,115 @@ use think\Log;
|
|||||||
class Hook
|
class Hook
|
||||||
{
|
{
|
||||||
|
|
||||||
private static $tags = [];
|
private static $tags = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 动态添加行为扩展到某个标签
|
* 动态添加行为扩展到某个标签
|
||||||
* @param string $tag 标签名称
|
* @param string $tag 标签名称
|
||||||
* @param mixed $behavior 行为名称
|
* @param mixed $behavior 行为名称
|
||||||
* @param bool $first 是否放到开头执行
|
* @param bool $first 是否放到开头执行
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function add($tag, $behavior, $first = false)
|
public static function add($tag, $behavior, $first = false)
|
||||||
{
|
{
|
||||||
isset(self::$tags[$tag]) || self::$tags[$tag] = [];
|
isset(self::$tags[$tag]) || self::$tags[$tag] = [];
|
||||||
if (is_array($behavior) && !is_callable($behavior)) {
|
if (is_array($behavior) && !is_callable($behavior)) {
|
||||||
if (!array_key_exists('_overlay', $behavior) || !$behavior['_overlay']) {
|
if (!array_key_exists('_overlay', $behavior) || !$behavior['_overlay']) {
|
||||||
unset($behavior['_overlay']);
|
unset($behavior['_overlay']);
|
||||||
self::$tags[$tag] = array_merge(self::$tags[$tag], $behavior);
|
self::$tags[$tag] = array_merge(self::$tags[$tag], $behavior);
|
||||||
} else {
|
} else {
|
||||||
unset($behavior['_overlay']);
|
unset($behavior['_overlay']);
|
||||||
self::$tags[$tag] = $behavior;
|
self::$tags[$tag] = $behavior;
|
||||||
}
|
}
|
||||||
} elseif ($first) {
|
} elseif ($first) {
|
||||||
array_unshift(self::$tags[$tag], $behavior);
|
array_unshift(self::$tags[$tag], $behavior);
|
||||||
} else {
|
} else {
|
||||||
self::$tags[$tag][] = $behavior;
|
self::$tags[$tag][] = $behavior;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量导入插件
|
* 批量导入插件
|
||||||
* @param array $tags 插件信息
|
* @param array $tags 插件信息
|
||||||
* @param boolean $recursive 是否递归合并
|
* @param boolean $recursive 是否递归合并
|
||||||
*/
|
*/
|
||||||
public static function import(array $tags, $recursive = true)
|
public static function import(array $tags, $recursive = true)
|
||||||
{
|
{
|
||||||
if ($recursive) {
|
if ($recursive) {
|
||||||
foreach ($tags as $tag => $behavior) {
|
foreach ($tags as $tag => $behavior) {
|
||||||
self::add($tag, $behavior);
|
self::add($tag, $behavior);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
self::$tags = $tags + self::$tags;
|
self::$tags = $tags + self::$tags;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取插件信息
|
* 获取插件信息
|
||||||
* @param string $tag 插件位置 留空获取全部
|
* @param string $tag 插件位置 留空获取全部
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function get($tag = '')
|
public static function get($tag = '')
|
||||||
{
|
{
|
||||||
if (empty($tag)) {//获取全部的插件信息
|
if (empty($tag)) {
|
||||||
return self::$tags;
|
//获取全部的插件信息
|
||||||
} else {
|
return self::$tags;
|
||||||
return array_key_exists($tag, self::$tags) ? self::$tags[$tag] : [];
|
} else {
|
||||||
}
|
return array_key_exists($tag, self::$tags) ? self::$tags[$tag] : [];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 监听标签的行为
|
* 监听标签的行为
|
||||||
* @param string $tag 标签名称
|
* @param string $tag 标签名称
|
||||||
* @param mixed $params 传入参数
|
* @param mixed $params 传入参数
|
||||||
* @param mixed $extra 额外参数
|
* @param mixed $extra 额外参数
|
||||||
* @param bool $once 只获取一个有效返回值
|
* @param bool $once 只获取一个有效返回值
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
public static function listen($tag, &$params = null, $extra = null, $once = false)
|
public static function listen($tag, &$params = null, $extra = null, $once = false)
|
||||||
{
|
{
|
||||||
$results = [];
|
$results = [];
|
||||||
$tags = static::get($tag);
|
$tags = static::get($tag);
|
||||||
foreach ($tags as $key => $name) {
|
foreach ($tags as $key => $name) {
|
||||||
$results[$key] = self::exec($name, $tag, $params, $extra);
|
$results[$key] = self::exec($name, $tag, $params, $extra);
|
||||||
if (false === $results[$key]) {// 如果返回false 则中断行为执行
|
if (false === $results[$key]) {
|
||||||
break;
|
// 如果返回false 则中断行为执行
|
||||||
} elseif (!is_null($results[$key]) && $once) {
|
break;
|
||||||
break;
|
} elseif (!is_null($results[$key]) && $once) {
|
||||||
}
|
break;
|
||||||
}
|
}
|
||||||
return $once ? end($results) : $results;
|
}
|
||||||
}
|
return $once ? end($results) : $results;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 执行某个行为
|
* 执行某个行为
|
||||||
* @param mixed $class 要执行的行为
|
* @param mixed $class 要执行的行为
|
||||||
* @param string $tag 方法名（标签名）
|
* @param string $tag 方法名（标签名）
|
||||||
* @param Mixed $params 传人的参数
|
* @param Mixed $params 传人的参数
|
||||||
* @param mixed $extra 额外参数
|
* @param mixed $extra 额外参数
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
public static function exec($class, $tag = '', &$params = null, $extra = null)
|
public static function exec($class, $tag = '', &$params = null, $extra = null)
|
||||||
{
|
{
|
||||||
App::$debug && Debug::remark('behavior_start', 'time');
|
App::$debug && Debug::remark('behavior_start', 'time');
|
||||||
if (is_callable($class)) {
|
if (is_callable($class)) {
|
||||||
$result = call_user_func_array($class, [ & $params, $extra]);
|
$result = call_user_func_array($class, [ & $params, $extra]);
|
||||||
$class = 'Closure';
|
$class = 'Closure';
|
||||||
} elseif (is_object($class)) {
|
} elseif (is_object($class)) {
|
||||||
$result = call_user_func_array([$class, $tag], [ & $params, $extra]);
|
$result = $class->$tag($params, $extra);
|
||||||
$class = get_class($class);
|
$class = get_class($class);
|
||||||
} else {
|
} else {
|
||||||
$obj = new $class();
|
$obj = new $class();
|
||||||
$result = ($tag && is_callable([$obj, $tag])) ? $obj->$tag($params, $extra) : $obj->run($params, $extra);
|
$method = ($tag && is_callable([$obj, $tag])) ? $tag : 'run';
|
||||||
}
|
$result = $obj->$method($params, $extra);
|
||||||
if (App::$debug) {
|
}
|
||||||
Debug::remark('behavior_end', 'time');
|
if (App::$debug) {
|
||||||
Log::record('[ BEHAVIOR ] Run ' . $class . ' @' . $tag . ' [ RunTime:' . Debug::getRangeTime('behavior_start', 'behavior_end') . 's ]', 'info');
|
Debug::remark('behavior_end', 'time');
|
||||||
}
|
Log::record('[ BEHAVIOR ] Run ' . $class . ' @' . $tag . ' [ RunTime:' . Debug::getRangeTime('behavior_start', 'behavior_end') . 's ]', 'info');
|
||||||
return $result;
|
}
|
||||||
}
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -326,7 +326,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
|
|||||||
$value = date($format, $_SERVER['REQUEST_TIME']);
|
$value = date($format, $_SERVER['REQUEST_TIME']);
|
||||||
break;
|
break;
|
||||||
case 'timestamp':
|
case 'timestamp':
|
||||||
case 'int':
|
case 'integer':
|
||||||
|
default:
|
||||||
$value = $_SERVER['REQUEST_TIME'];
|
$value = $_SERVER['REQUEST_TIME'];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user