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

优化路由分组方法

Browse Source
This commit is contained in:
thinkphp
2016-10-26 18:11:38 +08:00
parent 9062808a05
commit c977af7921
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Route.php
View File

@@ -302,13 +302,12 @@ class Route
$rule = substr($rule, 0, -1); $rule = substr($rule, 0, -1);
} }
if ('/' != $rule) { if ('/' != $rule || $group) {
$rule = trim($rule, '/'); $rule = trim($rule, '/');
} }
$vars = self::parseVar($rule); $vars = self::parseVar($rule);
if (isset($name)) { if (isset($name)) {
$rule = ltrim($rule, '/'); $key = $group ? $group . ($rule ? '/' . $rule : '') : $rule;
$key = $group ? $group . ($rule ? '/' . $rule : '') : $rule;
self::name(strtolower($name), [$key, $vars, self::$domain]); self::name(strtolower($name), [$key, $vars, self::$domain]);
} }
if ($group) { if ($group) {
@@ -426,10 +425,10 @@ class Route
$options['complete_match'] = true; $options['complete_match'] = true;
$key = substr($key, 0, -1); $key = substr($key, 0, -1);
} }
$key = trim($key, '/');
$vars = self::parseVar($key); $vars = self::parseVar($key);
$item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => $options, 'pattern' => $patterns]; $item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => $options, 'pattern' => $patterns];
// 设置路由标识 // 设置路由标识
$key = ltrim($key, '/');
self::name($route, [$name . ($key ? '/' . $key : ''), $vars, self::$domain]); self::name($route, [$name . ($key ? '/' . $key : ''), $vars, self::$domain]);
} }
self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern]; self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern];