导入省市区

.env.example

@@ -3,6 +3,7 @@ YII_ENV=local
 YII_DEBUG=false
 
 DB_DSN='mysql:host=127.0.0.1;dbname=huahuibao'
+DB_DSN_CONSOLE='mysql:host=127.0.0.1;dbname=huahuibao'
 DB_DSN_BAK='mysql:host=127.0.0.1;dbname=hhb'
 DB_USERNAME='root'
 DB_PASSWORD='zt20152008'

common/components/dirUtil.php

@@ -8,7 +8,7 @@ class dirUtil
 {
 
 	//整个项目的根目录 shish 2020.1.7
-	public static function rootDir()
+	public static function getRootDir()
 	{
 		return Yii::getAlias('@vendor') . '/..';
 	}

console/config/main.php

@@ -1,32 +1,32 @@
 <?php
 $params = array_merge(
-    require(__DIR__ . '/../../common/config/params.php'),
-    require(__DIR__ . '/../../common/config/params-local.php'),
-    require(__DIR__ . '/params.php'),
-    require(__DIR__ . '/params-local.php')
+	require(__DIR__ . '/../../common/config/params.php'),
+	require(__DIR__ . '/../../common/config/params-local.php'),
+	require(__DIR__ . '/params.php'),
+	require(__DIR__ . '/params-local.php')
 );
 
 return [
-    'id' => 'app-console',
-    'basePath' => dirname(__DIR__),
-    'bootstrap' => ['log'],
-    'controllerNamespace' => 'console\controllers',
-    'components' => [
-        'log' => [
-            'targets' => [
-                [
-                    'class' => 'yii\log\FileTarget',
-                    'levels' => ['error', 'warning'],
-                ],
-            ],
-        ],
-        'db' => [
-	        'class' => 'yii\db\Connection',
-	        'dsn' => 'mysql:host=127.0.0.1;dbname=huahuibao',
-	        'username' => 'root',
-	        'password' => 'zt20152008',
-	        'charset' => 'utf8',
-        ],
-    ],
-    'params' => $params,
+	'id' => 'app-console',
+	'basePath' => dirname(__DIR__),
+	'bootstrap' => ['log'],
+	'controllerNamespace' => 'console\controllers',
+	'components' => [
+		'log' => [
+			'targets' => [
+				[
+					'class' => 'yii\log\FileTarget',
+					'levels' => ['error', 'warning'],
+				],
+			],
+		],
+		'db' => [
+			'class' => 'yii\db\Connection',
+			'dsn' => getenv('DB_DSN_CONSOLE'),
+			'username' => getenv('DB_USERNAME'),
+			'password' => getenv('DB_PASSWORD'),
+			'charset' => 'utf8',
+		],
+	],
+	'params' => $params,
 ];

console/controllers/UpgradeController.php

@@ -721,6 +721,11 @@ ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '
 		$sql = "ALTER TABLE `xhMerchant` ADD `deadline` INT NOT NULL DEFAULT 0 COMMENT '帐号过期时间' AFTER `status`;UPDATE `xhMerchant` SET `deadline`=1607589778;";
 		Yii::$app->db->createCommand($sql)->execute();
 		
+		//导入省市区
+		$root = dirUtil::getRootDir();
+		$sql = file_get_contents($root . '/region.sql');
+		Yii::$app->db->createCommand($sql)->execute();
+		
 	}
 	
 	public function actionInit2()

sql2.txt

@@ -1,7 +1,13 @@
 注意第一家店分类与用途迁移；已经完成；需要再确认迁移是否正确
+从微信那边重新拉取国兰客户的头像、还有商品图片；如果没有小图，需要去生成小图；
 
 
 
+
+
+以下未完成：
+
+
 统计表的变更 注意线上哪些统计相关的表有数据，要转化（注意里面涉及的表）！！！
 
 商家流水相关表修改 ！！！
@@ -18,4 +24,3 @@ xhOrder xhOrderGoods 关联关系
 
 国兰的商品款式表要给对应上，注意xhGoods表里的goodsStyle也要改
 
-从微信那边重新拉取国兰客户的头像、还有商品图片；如果没有小图，需要去生成小图；