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

改进路由分组的全局完整路由匹配

Browse Source
This commit is contained in:
thinkphp
2017-07-08 08:35:54 +08:00
parent 1245d8fae9
commit 8e61503111
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Route.php
View File

@@ -428,7 +428,8 @@ class Route
self::$rules['*'][$name]['pattern'] = $pattern; self::$rules['*'][$name]['pattern'] = $pattern;
} }
} else { } else {
$item = []; $item = [];
$completeMatch = Config::get('route_complete_match');
foreach ($routes as $key => $val) { foreach ($routes as $key => $val) {
if (is_numeric($key)) { if (is_numeric($key)) {
$key = array_shift($val); $key = array_shift($val);
@@ -447,6 +448,8 @@ class Route
// 是否完整匹配 // 是否完整匹配
$options['complete_match'] = true; $options['complete_match'] = true;
$key = substr($key, 0, -1); $key = substr($key, 0, -1);
} elseif ($completeMatch) {
$options['complete_match'] = true;
} }
$key = trim($key, '/'); $key = trim($key, '/');
$vars = self::parseVar($key); $vars = self::parseVar($key);