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

改进Route类 路由别名支持条件检测

Browse Source
This commit is contained in:
thinkphp
2016-06-09 08:50:56 +08:00
parent 6de814bd54
commit c4edb2e426
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/think/Route.php
View File

@@ -445,15 +445,16 @@ class Route
* 注册别名路由
* @access public
* @param string|array $rule 路由别名
* @param string $route 别名对应的路由地址
* @param string $route 路由地址
* @param array $option 路由参数
* @return void
*/
public static function alias($rule, $route = '')
public static function alias($rule, $route = '', $option = [])
{
if (is_array($rule)) {
self::$alias[$rule] = array_merge(self::$alias, $alias);
self::$alias = array_merge(self::$alias, $rule);
} else {
self::$alias[$rule] = $route;
self::$alias[$rule] = $option ? [$route, $option] : $route;
}
}
@@ -632,8 +633,17 @@ class Route
if (strpos($url, '/') && isset(self::$alias[strstr($url, '/', true)])) {
// 路由别名
$array = explode('/', $url, 2);
$rule = self::$alias[$array[0]];
if (0 === strpos($rule, '\\')) {
$item = self::$alias[$array[0]];
if (is_array($item)) {
list($rule, $option) = $item;
} else {
$rule = $item;
}
// 参数有效性检查
if (isset($option) && !self::checkOption($option, $url, $request)) {
// 路由不匹配
} elseif (0 === strpos($rule, '\\')) {
// 路由到类
return self::bindToClass($array[1], substr($rule, 1));
} elseif (0 === strpos($url, '@')) {