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

App类改进run方法传入Request对象 便于构造自己的Request对象

Browse Source
This commit is contained in:
thinkphp
2016-05-11 12:25:29 +08:00
parent 9843eaf243
commit b50eeb5e7d
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Route.php
View File

@@ -11,8 +11,6 @@
namespace think;
use think\Request;
class Route
{
// 路由规则
@@ -358,7 +356,7 @@ class Route
}
// 检测URL路由
public static function check($url, $depr = '/', $checkDomain = false)
public static function check($request, $url, $depr = '/', $checkDomain = false)
{
// 检测域名部署
if ($checkDomain) {
@@ -429,7 +427,7 @@ class Route
}
$result = self::checkRule($key, $route, $url1, $pattern, $option);
if (false !== $result) {
Request::instance()->route(['rule' => $key, 'route' => $route, 'pattern' => $pattern, 'option' => $option]);
$request->route(['rule' => $key, 'route' => $route, 'pattern' => $pattern, 'option' => $option]);
return $result;
}
}
@@ -442,7 +440,7 @@ class Route
// 规则路由
$result = self::checkRule($rule, $route, $url, $pattern, $option);
if (false !== $result) {
Request::instance()->route(['rule' => $rule, 'route' => $route, 'pattern' => $pattern, 'option' => $option]);
$request->route(['rule' => $rule, 'route' => $route, 'pattern' => $pattern, 'option' => $option]);
return $result;
}
}