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

改进

Browse Source
This commit is contained in:
thinkphp
2016-07-26 12:41:49 +08:00
parent 7c09214962
commit 867c5638bd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Route.php
View File

@@ -682,7 +682,7 @@ class Route
if ('/' != $depr) { if ('/' != $depr) {
$url = str_replace($depr, '/', $url); $url = str_replace($depr, '/', $url);
} }
$url = '/' != $url ? rtrim($url, '/') : $url;
if (strpos($url, '/') && isset(self::$rules['alias'][strstr($url, '/', true)])) { if (strpos($url, '/') && isset(self::$rules['alias'][strstr($url, '/', true)])) {
// 检测路由别名 // 检测路由别名
$result = self::checkRouteAlias($request, $url, $depr); $result = self::checkRouteAlias($request, $url, $depr);
@@ -703,7 +703,9 @@ class Route
if (false !== $return) { if (false !== $return) {
return $return; return $return;
} }
if ('/' != $url) {
$url = rtrim($url, '/');
}
if (isset($rules[$url])) { if (isset($rules[$url])) {
// 静态路由规则检测 // 静态路由规则检测
$rule = $rules[$url]; $rule = $rules[$url];
@@ -843,7 +845,7 @@ class Route
return self::bindToNamespace($url, self::$bind['namespace'], $depr); return self::bindToNamespace($url, self::$bind['namespace'], $depr);
case 'module': case 'module':
// 如果有模块/控制器绑定 针对路由到 模块/控制器 有效 // 如果有模块/控制器绑定 针对路由到 模块/控制器 有效
$url = self::$bind['module'] . '/' . $url; $url = self::$bind['module'] . '/' . ltrim($url, '/');
break; break;
case 'group': case 'group':
// 绑定到路由分组 // 绑定到路由分组