内核更新

2016-08-07 07:44:03 +08:00
parent fed3a1d215
commit ebde0fc13e
6 changed files with 36 additions and 32 deletions
--- a/core/library/think/App.php
+++ b/core/library/think/App.php
@@ -483,13 +483,19 @@ class App
                if (is_array($rules)) {
                    Route::rules($rules);
                }
-            } elseif (is_file(CONF_PATH . 'route' . CONF_EXT)) {
-                // 导入路由配置
-                $rules = include CONF_PATH . 'route' . CONF_EXT;
-                if (is_array($rules)) {
-                    Route::import($rules);
+            } else {
+                $files = $config['route_config_file'];
+                foreach ($files as $file) {
+                    if (is_file(CONF_PATH . $file . CONF_EXT)) {
+                        // 导入路由配置
+                        $rules = include CONF_PATH . $file . CONF_EXT;
+                        if (is_array($rules)) {
+                            Route::import($rules);
+                        }
+                    }
                }
            }
+
            // 路由检测（根据路由定义返回不同的URL调度）
            $result = Route::check($request, $path, $depr, $config['url_domain_deploy']);
            $must   = !is_null(self::$routeMust) ? self::$routeMust : $config['url_route_must'];