diff --git a/phinx-bootstrap.php b/phinx-bootstrap.php index 3f6c3e1..75d5b3a 100644 --- a/phinx-bootstrap.php +++ b/phinx-bootstrap.php @@ -42,9 +42,12 @@ if (!function_exists('env')) { require $baseDir . '/vendor/workerman/webman-framework/src/support/helpers.php'; require $baseDir . '/app/functions.php'; -Webman\Config::load($baseDir . '/config', ['route', 'middleware', 'process', 'server', 'static']); -// 与 phinx.php 一致直接加载 thinkorm,避免 Webman config() 与 Phinx 表前缀不一致 -$thinkorm = require $baseDir . '/config/thinkorm.php'; +use Webman\Config; + +Config::clear(); +Config::load($baseDir . '/config', ['route', 'middleware', 'process', 'server', 'static']); +// 与 Webman\ThinkOrm\ThinkOrm::start() 一致,并与 phinx.php 中 $thinkorm 来源一致 +$thinkorm = array_replace_recursive(config('thinkorm', []), config('think-orm', [])); if (!empty($thinkorm)) { support\think\Db::setConfig($thinkorm); } diff --git a/phinx.php b/phinx.php index b4cf22a..d35998c 100644 --- a/phinx.php +++ b/phinx.php @@ -1,7 +1,7 @@