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

修正Route类checkRouteAlias方法

Browse Source
This commit is contained in:
thinkphp
2016-10-13 12:31:39 +08:00
parent cb3278b725
commit fff423a5eb
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/Route.php
View File

@@ -944,18 +944,12 @@ class Route
if (is_array($item)) { if (is_array($item)) {
list($rule, $option) = $item; list($rule, $option) = $item;
$action = $array[0]; $action = $array[0];
if (isset($option['allow'])) { if (isset($option['allow']) && !in_array($action, explode(',', $option['allow']))) {
// 允许操作 // 允许操作
$allow = is_string($option['allow']) ? explode(',', $option['allow']) : $option['allow']; return false;
if (!in_array($action, $allow)) { } elseif (isset($option['except']) && in_array($action, explode(',', $option['except']))) {
return false;
}
} elseif (isset($option['except'])) {
// 排除操作 // 排除操作
$except = is_string($option['except']) ? explode(',', $option['except']) : $option['except']; return false;
if (in_array($action, $except)) {
return false;
}
} }
if (isset($option['method'][$action])) { if (isset($option['method'][$action])) {
$option['method'] = $option['method'][$action]; $option['method'] = $option['method'][$action];
@@ -971,7 +965,7 @@ class Route
} elseif (0 === strpos($rule, '\\')) { } elseif (0 === strpos($rule, '\\')) {
// 路由到类 // 路由到类
return self::bindToClass($bind, substr($rule, 1), $depr); return self::bindToClass($bind, substr($rule, 1), $depr);
} elseif (0 === strpos($url, '@')) { } elseif (0 === strpos($rule, '@')) {
// 路由到控制器类 // 路由到控制器类
return self::bindToController($bind, substr($rule, 1), $depr); return self::bindToController($bind, substr($rule, 1), $depr);
} else { } else {