增加配置的深度合并，避免覆盖

Author: leeqvip

helper.php

@@ -49,6 +49,24 @@ function site_config($key)
     return Config::get($key);
 }
 
+function array_deep_merge(array $a, array $b)
+{
+    foreach ($a as $key => $val) {
+        if (isset($b[$key])) {
+            if (gettype($a[$key]) != gettype($b[$key])) {
+                continue;
+            }
+            if (is_array($a[$key])) {
+                $a[$key] = array_deep_merge($a[$key], $b[$key]);
+            } else {
+                $a[$key] = $b[$key];
+            }
+        }
+    }
+
+    return $a;
+}
+
 \think\Console::addDefaultCommands([
     'tadmin:init' => \tadmin\command\Init::class,
     'tadmin:migrate:run' => \tadmin\command\Migrate::class,

src/behavior/Boot.php

@@ -66,12 +66,17 @@ protected function loadConfig()
                 $configName = pathinfo($file, PATHINFO_FILENAME);
                 $config = $this->app->config->pull($configName);
 
-                $this->app->config->load($file, $configName);
+                $config = array_deep_merge(
+                    require_once $file,
+                    $config
+                );
+
+                $this->app->config->set($config, $configName);
 
                 // 重新加载应用中的同名配置，以覆盖此配置
-                if (is_file($this->app->getConfigPath().basename($file))) {
-                    $this->app->config->load($this->app->getConfigPath().basename($file), $configName);
-                }
+                // if (is_file($this->app->getConfigPath().basename($file))) {
+                //     $this->app->config->load($this->app->getConfigPath().basename($file), $configName);
+                // }
             }
         }
     }