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

改进Url类的生成 调整Route类的getRules方法

Browse Source
This commit is contained in:
thinkphp
2016-07-07 13:50:52 +08:00
parent 4f4eb5445b
commit 8c53d9d8c0
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Route.php
View File

@@ -554,11 +554,7 @@ class Route
*/ */
public static function getRules($method = '') public static function getRules($method = '')
{ {
if ($method) { return $method ? self::$rules[$method] : self::$rules;
return self::$rules[$method];
} else {
return array_merge_recursive(self::$rules['*'], self::$rules['GET'], self::$rules['POST'], self::$rules['PUT'], self::$rules['DELETE']);
}
} }
/** /**

4
library/think/Url.php
View File

@@ -265,7 +265,8 @@ class Url
return $item; return $item;
} }
// 获取路由定义 // 获取路由定义
$rules = Route::getRules(); $array = Route::getRules();
foreach ($array as $type => $rules) {
foreach ($rules as $group => $val) { foreach ($rules as $group => $val) {
$rule = $val['rule']; $rule = $val['rule'];
$route = $val['route']; $route = $val['route'];
@@ -304,6 +305,7 @@ class Url
$item[$route][] = [$rule, $vars, $param]; $item[$route][] = [$rule, $vars, $param];
} }
} }
}
// 检测路由映射 // 检测路由映射
$maps = Route::map(); $maps = Route::map();