修复安装安装时报错
This commit is contained in:
@@ -43,7 +43,8 @@ require $baseDir . '/vendor/workerman/webman-framework/src/support/helpers.php';
|
|||||||
require $baseDir . '/app/functions.php';
|
require $baseDir . '/app/functions.php';
|
||||||
|
|
||||||
Webman\Config::load($baseDir . '/config', ['route', 'middleware', 'process', 'server', 'static']);
|
Webman\Config::load($baseDir . '/config', ['route', 'middleware', 'process', 'server', 'static']);
|
||||||
$thinkorm = config('thinkorm', []);
|
// 与 phinx.php 一致直接加载 thinkorm,避免 Webman config() 与 Phinx 表前缀不一致
|
||||||
|
$thinkorm = require $baseDir . '/config/thinkorm.php';
|
||||||
if (!empty($thinkorm)) {
|
if (!empty($thinkorm)) {
|
||||||
support\think\Db::setConfig($thinkorm);
|
support\think\Db::setConfig($thinkorm);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user