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

路由配置文件支持多个 使用 route_config_file 配置参数配置

Browse Source
This commit is contained in:
thinkphp
2016-08-06 17:08:58 +08:00
parent de4d8253da
commit 82103dee3a
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -81,6 +81,8 @@ return [
'url_param_type' => 0, 'url_param_type' => 0,
// 是否开启路由 // 是否开启路由
'url_route_on' => true, 'url_route_on' => true,
// 路由配置文件（支持配置多个）
'route_config_file' => ['route'],
// 是否强制使用路由 // 是否强制使用路由
'url_route_must' => false, 'url_route_must' => false,
// 域名部署 // 域名部署

16
library/think/App.php
View File

@@ -483,13 +483,19 @@ class App
if (is_array($rules)) { if (is_array($rules)) {
Route::rules($rules); Route::rules($rules);
} }
} elseif (is_file(CONF_PATH . 'route' . CONF_EXT)) { } else {
// 导入路由配置 $files = $config['route_config_file'];
$rules = include CONF_PATH . 'route' . CONF_EXT; foreach ($files as $file) {
if (is_array($rules)) { if (is_file(CONF_PATH . $file . CONF_EXT)) {
Route::import($rules); // 导入路由配置
$rules = include CONF_PATH . $file . CONF_EXT;
if (is_array($rules)) {
Route::import($rules);
}
}
} }
} }
// 路由检测（根据路由定义返回不同的URL调度） // 路由检测（根据路由定义返回不同的URL调度）
$result = Route::check($request, $path, $depr, $config['url_domain_deploy']); $result = Route::check($request, $path, $depr, $config['url_domain_deploy']);
$must = !is_null(self::$routeMust) ? self::$routeMust : $config['url_route_must']; $must = !is_null(self::$routeMust) ? self::$routeMust : $config['url_route_must'];

11
library/think/console/command/optimize/Route.php
View File

@@ -33,9 +33,14 @@ class Route extends Command
protected function buildRouteCache() protected function buildRouteCache()
{ {
$config = include CONF_PATH . 'route' . CONF_EXT; $files = \think\Config::get('route_config_file');
if ($config) { foreach ($files as $file) {
\think\Route::import($config); if (is_file(CONF_PATH . $file . CONF_EXT)) {
$config = include CONF_PATH . $file . CONF_EXT;
if ($config) {
\think\Route::import($config);
}
}
} }
$rules = \think\Route::rules(true); $rules = \think\Route::rules(true);
array_walk_recursive($rules, [$this, 'buildClosure']); array_walk_recursive($rules, [$this, 'buildClosure']);