diff --git a/convention.php b/convention.php
index 133dbd36..83431ab3 100644
--- a/convention.php
+++ b/convention.php
@@ -19,8 +19,6 @@ return [
     'auto_bind_module'       => false,
     // 注册的根命名空间
     'root_namespace'         => [],
-    // 扩展配置文件
-    '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 12748712..95ef5e50 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -444,12 +444,18 @@ class App
             $path = APP_PATH . $module;
             // 加载模块配置
             $config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT);
-
+            // 读取数据库配置文件
+            $filename = CONF_PATH . $module . 'database' . CONF_EXT;
+            Config::load($filename, 'database');
             // 读取扩展配置文件
-            if ($config['extra_config_list']) {
-                foreach ($config['extra_config_list'] as $name => $file) {
-                    $filename = CONF_PATH . $module . $file . CONF_EXT;
-                    Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
+            if (is_dir(CONF_PATH . $module . 'extra')) {
+                $path  = CONF_PATH . $module . 'extra';
+                $files = scandir($path);
+                foreach ($files as $file) {
+                    if (strpos($file, CONF_EXT)) {
+                        $filename = $path . DS . $file;
+                        Config::load($filename, pathinfo($file, PATHINFO_FILENAME));
+                    }
                 }
             }