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

改进Route的分组

Browse Source
This commit is contained in:
thinkphp
2016-08-01 22:03:31 +08:00
parent 9b92ee62ad
commit 6561dcfcbb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Route.php
View File

@@ -273,10 +273,10 @@ class Route
self::$name[$name] = [$rule, $vars]; self::$name[$name] = [$rule, $vars];
} }
if ($group) { if ($group) {
if (isset(self::$rules[$type][$group]) && true === self::$rules[$type][$group]) { if ('*' != $type) {
self::$rules[$type][$group] = isset(self::$rules['*'][$group]) ? self::$rules['*'][$group] : []; $option['method'] = $type;
} }
self::$rules[$type][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern]; self::$rules['*'][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
} else { } else {
if ('*' != $type && isset(self::$rules['*'][$rule])) { if ('*' != $type && isset(self::$rules['*'][$rule])) {
unset(self::$rules['*'][$rule]); unset(self::$rules['*'][$rule]);
@@ -825,7 +825,7 @@ class Route
if (!self::checkOption($option, $url, $request)) { if (!self::checkOption($option, $url, $request)) {
continue; continue;
} }
$key = str_replace('[think]', '/', $key);
if (is_array($rule)) { if (is_array($rule)) {
// 分组路由 // 分组路由
if (($pos = strpos($key, ':')) || ($pos = strpos($key, '<'))) { if (($pos = strpos($key, ':')) || ($pos = strpos($key, '<'))) {