内核更新

This commit is contained in:
2016-07-29 13:48:52 +08:00
parent 75125bb298
commit 9da53fc969
27 changed files with 770 additions and 530 deletions

View File

@@ -82,7 +82,7 @@ class App
}
$config = self::initCommon();
$request->filter($config['default_filter']);
try {
// 开启多语言机制
@@ -104,6 +104,7 @@ class App
}
// 记录当前调度信息
$request->dispatch($dispatch);
// 记录路由信息
self::$debug && Log::record('[ ROUTE ] ' . var_export($dispatch, true), 'info');
// 监听app_begin
@@ -415,6 +416,8 @@ class App
// 加载初始化文件
if (is_file(APP_PATH . $module . 'init' . EXT)) {
include APP_PATH . $module . 'init' . EXT;
} elseif (is_file(RUNTIME_PATH . $module . 'init' . EXT)) {
include RUNTIME_PATH . $module . 'init' . EXT;
} else {
$path = APP_PATH . $module;
// 加载模块配置
@@ -466,7 +469,7 @@ class App
*/
public static function routeCheck($request, array $config)
{
$path = rtrim($request->path(), '/');
$path = $request->path();
$depr = $config['pathinfo_depr'];
$result = false;
// 路由检测