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

完善路由类

Browse Source
This commit is contained in:
thinkphp
2015-11-22 21:22:06 +08:00
parent 75f32db911
commit 6c08b6cfe1
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

@@ -65,7 +65,7 @@ class Route
}
} else {
if (0 === strpos($rule, '[')) {
self::$rules[$type][substr(substr($rule, -1), 1)] = ['routes' => $route, 'option' => $option];
self::$rules[$type][substr($rule, 1, -1)] = ['routes' => $route, 'option' => $option];
} else {
self::$rules[$type][$rule] = ['route' => $route, 'option' => $option];
}
@@ -75,7 +75,7 @@ class Route
}
// 路由分组
public static function group($name, $routes = [], $type='*',$option = [])
public static function group($name, $routes = [], $type = '*', $option = [])
{
self::$rules[$type][$name] = ['routes' => $routes, 'option' => $option];
}
@@ -201,7 +201,6 @@ class Route
// 路由规则检测
if (!empty($rules)) {
foreach ($rules as $rule => $val) {
$option = $val['option'];
// 请求类型检测
if (isset($option['method']) && REQUEST_METHOD != strtoupper($option['method'])) {
@@ -229,6 +228,9 @@ class Route
}
// 匹配到路由分组
foreach ($val['routes'] as $key => $route) {
if (is_numeric($key)) {
$key = array_shift($route);
}
$regx1 = substr($regx, strlen($rule) + 1);
if (0 === strpos($key, '/') && preg_match($key, $regx1, $matches)) {
// 检查正则路由
@@ -242,6 +244,9 @@ class Route
}
}
} else {
if (is_numeric($rule)) {
$rule = array_shift($val);
}
// 单项路由
$route = $val['route'];
if (0 === strpos($rule, '/') && preg_match($rule, $regx, $matches)) {