1、更新tp5内核

2、修复后台文档模型创建的bug
This commit is contained in:
2016-08-05 17:32:10 +08:00
parent 4b09ebce88
commit bce968f5a3
12 changed files with 165 additions and 95 deletions
+8 -6
View File
@@ -78,10 +78,6 @@ class App
{
is_null($request) && $request = Request::instance();
if ('ico' == $request->ext()) {
throw new HttpException(404, 'ico file not exists');
}
$config = self::initCommon();
$request->filter($config['default_filter']);
try {
@@ -483,10 +479,16 @@ class App
// 开启路由
if (is_file(RUNTIME_PATH . 'route.php')) {
// 读取路由缓存
Route::rules(include RUNTIME_PATH . 'route.php' ?: []);
$rules = include RUNTIME_PATH . 'route.php';
if (is_array($rules)) {
Route::rules($rules);
}
} elseif (is_file(CONF_PATH . 'route' . CONF_EXT)) {
// 导入路由配置
Route::import(include CONF_PATH . 'route' . CONF_EXT ?: []);
$rules = include CONF_PATH . 'route' . CONF_EXT;
if (is_array($rules)) {
Route::import($rules);
}
}
// 路由检测(根据路由定义返回不同的URL调度)
$result = Route::check($request, $path, $depr, $config['url_domain_deploy']);