1、样式修复
2、内核升级
This commit is contained in:
@@ -141,11 +141,13 @@ class App
|
||||
break;
|
||||
case 'controller':
|
||||
// 执行控制器操作
|
||||
$data = Loader::action($dispatch['controller']);
|
||||
$vars = Request::instance()->param();
|
||||
$data = Loader::action($dispatch['controller'], array_merge($vars, $dispatch['var']));
|
||||
break;
|
||||
case 'method':
|
||||
// 执行回调方法
|
||||
$data = self::invokeMethod($dispatch['method']);
|
||||
$vars = Request::instance()->param();
|
||||
$data = self::invokeMethod($dispatch['method'], array_merge($vars, $dispatch['var']));
|
||||
break;
|
||||
case 'function':
|
||||
// 执行闭包
|
||||
@@ -220,7 +222,7 @@ class App
|
||||
public static function invokeMethod($method, $vars = [])
|
||||
{
|
||||
if (is_array($method)) {
|
||||
$class = is_object($method[0]) ? $method[0] : new $method[0](Request::instance());
|
||||
$class = is_object($method[0]) ? $method[0] : self::invokeClass($method[0]);
|
||||
$reflect = new \ReflectionMethod($class, $method[1]);
|
||||
} else {
|
||||
// 静态方法
|
||||
@@ -386,7 +388,7 @@ class App
|
||||
} elseif (is_callable([$instance, '_empty'])) {
|
||||
// 空操作
|
||||
$call = [$instance, '_empty'];
|
||||
$vars = [$action];
|
||||
$vars = [$actionName];
|
||||
} else {
|
||||
// 操作不存在
|
||||
throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
|
||||
|
||||
Reference in New Issue
Block a user