diff --git a/convention.php b/convention.php index 1dcf80dc..d9003ca6 100644 --- a/convention.php +++ b/convention.php @@ -18,7 +18,7 @@ return [ // 注册的根命名空间 'root_namespace' => [], // 扩展配置文件 - 'extra_config_list' => ['database', 'route', 'validate'], + 'extra_config_list' => ['database', 'validate'], // 扩展函数文件 'extra_file_list' => [THINK_PATH . 'helper' . EXT], // 默认输出类型 diff --git a/library/think/App.php b/library/think/App.php index c1388b51..30350e3a 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -437,9 +437,6 @@ class App if ($config['extra_config_list']) { foreach ($config['extra_config_list'] as $name => $file) { $filename = CONF_PATH . $module . $file . CONF_EXT; - if ('route' == $module . $file && is_file(RUNTIME_PATH . 'route.php')) { - continue; - } Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME)); } } @@ -485,10 +482,11 @@ class App if ($check) { // 开启路由 if (is_file(RUNTIME_PATH . 'route.php')) { - Route::rules(include RUNTIME_PATH . 'route.php'); - } elseif (!empty($config['route'])) { + // 读取路由缓存 + 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']); diff --git a/library/think/console/command/optimize/Route.php b/library/think/console/command/optimize/Route.php index 2860cef3..2d879b69 100644 --- a/library/think/console/command/optimize/Route.php +++ b/library/think/console/command/optimize/Route.php @@ -6,7 +6,7 @@ // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- -// | Author: yunwuxin <448901948@qq.com> +// | Author: liu21st // +---------------------------------------------------------------------- namespace think\console\command\optimize; @@ -27,9 +27,7 @@ class Route extends Command protected function execute(Input $input, Output $output) { - file_put_contents(RUNTIME_PATH . 'route.php', $this->buildRouteCache()); - $output->writeln('Succeed!'); }