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

优化Route类的变量传值 统一使用Request类的param方法获取

Browse Source
This commit is contained in:
thinkphp
2016-09-09 18:25:16 +08:00
parent 96f5428a5e
commit f52a7bf978
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/App.php
View File

@@ -135,15 +135,15 @@ class App
break; break;
case 'controller': case 'controller':
// 执行控制器操作 // 执行控制器操作
$data = Loader::action($dispatch['controller'], $dispatch['params']); $data = Loader::action($dispatch['controller']);
break; break;
case 'method': case 'method':
// 执行回调方法 // 执行回调方法
$data = self::invokeMethod($dispatch['method'], $dispatch['params']); $data = self::invokeMethod($dispatch['method']);
break; break;
case 'function': case 'function':
// 执行闭包 // 执行闭包
$data = self::invokeFunction($dispatch['function'], $dispatch['params']); $data = self::invokeFunction($dispatch['function']);
break; break;
case 'response': case 'response':
$data = $dispatch['response']; $data = $dispatch['response'];
@@ -181,12 +181,11 @@ class App
* @access public * @access public
* @param array|string $dispatch 调度信息 * @param array|string $dispatch 调度信息
* @param string $type 调度类型 * @param string $type 调度类型
* @param array $params 参数
* @return void * @return void
*/ */
public static function dispatch($dispatch, $type = 'module', $params = []) public static function dispatch($dispatch, $type = 'module')
{ {
self::$dispatch = ['type' => $type, $type => $dispatch, 'params' => $params]; self::$dispatch = ['type' => $type, $type => $dispatch];
} }
/** /**

8
library/think/Route.php
View File

@@ -1346,7 +1346,7 @@ class Route
} }
// 路由规则重定向 // 路由规则重定向
if ($result instanceof Response) { if ($result instanceof Response) {
return ['type' => 'response', 'response' => $result, 'params' => $matches]; return ['type' => 'response', 'response' => $result];
} elseif (is_array($result)) { } elseif (is_array($result)) {
return $result; return $result;
} }
@@ -1354,17 +1354,17 @@ class Route
if ($route instanceof \Closure) { if ($route instanceof \Closure) {
// 执行闭包 // 执行闭包
$result = ['type' => 'function', 'function' => $route, 'params' => $matches]; $result = ['type' => 'function', 'function' => $route];
} elseif (0 === strpos($route, '/') || 0 === strpos($route, 'http')) { } elseif (0 === strpos($route, '/') || 0 === strpos($route, 'http')) {
// 路由到重定向地址 // 路由到重定向地址
$result = ['type' => 'redirect', 'url' => $route, 'status' => isset($option['status']) ? $option['status'] : 301]; $result = ['type' => 'redirect', 'url' => $route, 'status' => isset($option['status']) ? $option['status'] : 301];
} elseif (0 === strpos($route, '\\')) { } elseif (0 === strpos($route, '\\')) {
// 路由到方法 // 路由到方法
$method = strpos($route, '@') ? explode('@', $route) : $route; $method = strpos($route, '@') ? explode('@', $route) : $route;
$result = ['type' => 'method', 'method' => $method, 'params' => $matches]; $result = ['type' => 'method', 'method' => $method];
} elseif (0 === strpos($route, '@')) { } elseif (0 === strpos($route, '@')) {
// 路由到控制器 // 路由到控制器
$result = ['type' => 'controller', 'controller' => substr($route, 1), 'params' => $matches]; $result = ['type' => 'controller', 'controller' => substr($route, 1)];
} else { } else {
// 路由到模块/控制器/操作 // 路由到模块/控制器/操作
$result = self::parseModule($route); $result = self::parseModule($route);