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

添加路由检测匹配成功后的行为执行方法 由路由参数 after_behavior 定义

Browse Source
This commit is contained in:
thinkphp
2016-01-27 11:37:24 +08:00
parent 785172460d
commit 63c3031e04
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Route.php
View File

@@ -393,7 +393,7 @@ class Route
$pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []); $pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []);
$route = $route[0]; $route = $route[0];
} }
$result = self::checkRule($key, $route, $url1, $pattern); $result = self::checkRule($key, $route, $url1, $pattern, $option1);
if (false !== $result) { if (false !== $result) {
return $result; return $result;
} }
@@ -405,7 +405,7 @@ class Route
// 单项路由 // 单项路由
$route = !empty($val['route']) ? $val['route'] : ''; $route = !empty($val['route']) ? $val['route'] : '';
// 规则路由 // 规则路由
$result = self::checkRule($rule, $route, $url, $pattern); $result = self::checkRule($rule, $route, $url, $pattern, $option);
if (false !== $result) { if (false !== $result) {
return $result; return $result;
} }
@@ -471,7 +471,7 @@ class Route
/** /**
* 检查规则路由 * 检查规则路由
*/ */
private static function checkRule($rule, $route, $url, $pattern) private static function checkRule($rule, $route, $url, $pattern, $option)
{ {
// 检查完整规则定义 // 检查完整规则定义
if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', $url)) { if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', $url)) {
@@ -495,6 +495,11 @@ class Route
} }
$pattern = array_merge(self::$pattern, $pattern); $pattern = array_merge(self::$pattern, $pattern);
if (false !== $match = self::match($url, $rule, $pattern)) { if (false !== $match = self::match($url, $rule, $pattern)) {
// 匹配到路由规则
// 检测是否定义路由
if ($option['after_behavior']) {
Hook::exec($option['after_behavior'], $route);
}
if ($route instanceof \Closure) { if ($route instanceof \Closure) {
// 执行闭包 // 执行闭包
return ['type' => 'function', 'function' => $route, 'params' => $match]; return ['type' => 'function', 'function' => $route, 'params' => $match];