yanglin 6 years ago
parent
commit
3b67a8a607
2 changed files with 13 additions and 2 deletions
  1. 1 1
      console/config/main.php
  2. 12 1
      console/yii

+ 1 - 1
console/config/main.php

@@ -30,7 +30,7 @@ return [
                 ],
             ],
         ],
-        'db' =>   require __DIR__ . '/../../common/config/db-local.php',
+        'db' =>   require __DIR__ . '/../../common/config/db.php',
     ],
     'params' => $params,
 ];

+ 12 - 1
console/yii

@@ -17,7 +17,18 @@ require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 // 一定要包含这个文件进来,完成设置的@console的别名
 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);
 $exitCode = $application->run();