|
@@ -17,7 +17,18 @@ require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
|
|
// 一定要包含这个文件进来,完成设置的@console的别名
|
|
// 一定要包含这个文件进来,完成设置的@console的别名
|
|
require(__DIR__ . '/../common/config/bootstrap.php');
|
|
require(__DIR__ . '/../common/config/bootstrap.php');
|
|
|
|
|
|
-$config = require(__DIR__ . '/config/main.php');
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+require __DIR__ . '/config/bootstrap.php';
|
|
|
|
+$config = yii\helpers\ArrayHelper::merge(
|
|
|
|
+ require __DIR__ . '/../common/config/main.php',
|
|
|
|
+ require __DIR__ . '/../common/config/main-local.php',
|
|
|
|
+ require __DIR__ . '/config/main.php',
|
|
|
|
+ require __DIR__ . '/config/main-local.php'
|
|
|
|
+);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
$application = new yii\console\Application($config);
|
|
$application = new yii\console\Application($config);
|
|
$exitCode = $application->run();
|
|
$exitCode = $application->run();
|