内核更新

This commit is contained in:
2016-08-03 23:44:44 +08:00
parent d6e2aa4068
commit 8094b9249a
9 changed files with 181 additions and 125 deletions

View File

@@ -65,6 +65,7 @@ class App
protected static $routeMust;
protected static $dispatch;
protected static $file = [];
/**
* 执行应用程序
@@ -388,8 +389,9 @@ class App
if (!empty($config['extra_file_list'])) {
foreach ($config['extra_file_list'] as $file) {
$file = strpos($file, '.') ? $file : APP_PATH . $file . EXT;
if (is_file($file)) {
include_once $file;
if (is_file($file) && !isset(self::$file[$file])) {
include $file;
self::$file[$file] = true;
}
}
}
@@ -479,9 +481,12 @@ class App
$check = !is_null(self::$routeCheck) ? self::$routeCheck : $config['url_route_on'];
if ($check) {
// 开启路由
if (!empty($config['route'])) {
if (is_file(RUNTIME_PATH . 'route.php')) {
// 读取路由缓存
Route::rules(include RUNTIME_PATH . 'route.php' ?: []);
} elseif (is_file(CONF_PATH . 'route' . CONF_EXT)) {
// 导入路由配置
Route::import($config['route']);
Route::import(include CONF_PATH . 'route' . CONF_EXT ?: []);
}
// 路由检测根据路由定义返回不同的URL调度
$result = Route::check($request, $path, $depr, $config['url_domain_deploy']);