From 026fdb0ceebc80d3ca272e4441afb1a4fece5839 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Wed, 26 Apr 2023 19:34:44 +0800
Subject: [PATCH] * Fix can't load the config directory.

---
 framework/router.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index 8c1cf34e5d..845aebcde7 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -376,6 +376,9 @@ class router extends baseRouter
         /* 先获得模块的主配置文件。Get the main config file for current module first. */
         $mainConfigFile = $this->getModulePath($appName, $moduleName) . 'config.php';
 
+        /* 获取 config 目录的配置文件。Get config files from config directory. */
+        $configDirFiles = helper::ls($this->getModulePath($appName, $moduleName) . DS . 'config', '.php');
+
         /* 查找扩展配置文件。Get extension config files. */
         if($config->framework->extensionLevel > 0) $extConfigPath = $this->getModuleExtPath($appName, $moduleName, 'config');
         if($config->framework->extensionLevel >= 1)
@@ -390,7 +393,7 @@ class router extends baseRouter
         $extConfigFiles = array_merge($commonExtConfigFiles, $siteExtConfigFiles);
 
         /* 将主配置文件和扩展配置文件合并在一起。Put the main config file and extension config files together. */
-        $configFiles = array_merge(array($mainConfigFile), $extConfigFiles);
+        $configFiles = array_merge(array($mainConfigFile), $configDirFiles, $extConfigFiles);
 
         /* 加载每一个配置文件。Load every config file. */
         static $loadedConfigs = array();