2.17.3

fecshop · Aug 23, 2021 · e91b43e · e91b43e
1 parent 0b45221
commit e91b43e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/appfront/web/install/index.php b/appfront/web/install/index.php
@@ -3,6 +3,7 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_COMPILE_WARNING );
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('FEC_INSTALL') or define('FEC_INSTALL', true);
 $http = ($_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
 $homeUrl = $http.'://'.$_SERVER['HTTP_HOST'].rtrim(dirname($_SERVER['SCRIPT_NAME']), '\\/');
 require(__DIR__ . '/../../../vendor/autoload.php');

diff --git a/common/config/bootstrap.php b/common/config/bootstrap.php
@@ -18,16 +18,8 @@
 
 // 下面的代码部分为：命令行执行sql初始化，不加载应用插件部分。
 $is_install = false;
-if (isset($argv) && is_array($argv)) {
-    foreach ($argv as $av) {
-        if ($av == '--migrationPath=@fecshop/migrations/mysqldb') {
-            $is_install = true; 
-            break;
-        }
-    }
-}  
 
-if (!$is_install) {
+if (!FEC_INSTALL) {
     $dbConfig = isset($fecmall_common_main_local_config['components']['db']) ? $fecmall_common_main_local_config['components']['db'] : '';
     if (is_array($dbConfig) && !empty($dbConfig)) {
         $connection = Yii::createObject($dbConfig);