获取授权登陆地址

app/www/controllers/JoinController.php → app/www/controllers/WxOpenController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace open\controllers;
+namespace www\controllers;
 
 use common\services\xhMerchantExtendService;
 use Yii;
@@ -17,27 +17,29 @@ use common\components\stringUtil;
 use common\components\weixinUtil;
 use common\services\xhSetMealService;
 
-class JoinController extends PublicController
+class WxOpenController extends PublicController
 {
-	
+
 	public $withoutLogin = ['callback-create-first-merchant'];
-	
-	public function actionApply()
+
+	public function actionGetAuthUrl()
 	{
-		$id = configDict::getConfig('openId');
-		$open = xhWxOpenService::getById($id);
+		$redirect = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=12548&pre_auth_code=55665&redirect_uri=6789";
+		util::success(['url' => $redirect]);
+
+		$open = xhWxOpenService::getById(1);
 		$pre = weixinOpenUtil::getPreAuthCode($open);
 		$appId = $open['appId'];
 		$oData = [];
 		$oData['preAuthCodeTime'] = date("Y-m-d H:i:s");//设置预授码过期，让下个用户可以获取新的预授码
 		xhWxOpenService::updateById($id, $oData);
-		$url = $this->openUrl . '/join/callback';
+		$url = Yii::$app->params['w'] . '/join/callback';
 		$merchantId = $open['merchantId'];//如果平台没有绑定商家，先去创建第一个商家
 		if (empty($merchantId)) {
-			$url = $this->openUrl . '/join/callback-create-first-merchant';
+			$url = Yii::$app->params['w'] . '/join/callback-create-first-merchant';
 		}
 		$redirect = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid={$appId}&pre_auth_code={$pre}&redirect_uri={$url}";
-		return $this->renderPartial('apply', ['url' => $redirect]);
+		util::success(['url' => $redirect]);
 	}
 	
 	public function actionCheckMerchantName()

common/config/params.php

@@ -61,34 +61,40 @@ if (getenv('YII_ENV') == 'local') {
 		$config['b'] = $prefixHttp . 'api.h.hhb.com';
 	}
 	$config['s'] = $prefixHttp . 'api.s.hhb.com';
+	$config['w'] = $prefixHttp . 'api.w.hhb.com';
 	$config['host'] = 'hhb.com';
 	$config['imgUrl'] = $prefixHttp . 'img.hhb.com';
 }
 if (getenv('YII_ENV') == 'test') {
-	$config['c'] = $prefixHttp . 'api.m.huaml.com';
-	$config['b'] = $prefixHttp . 'api.b.huaml.com';
+	$config['c'] = $prefixHttp . 'api.m.hzghd.com';
+	$config['b'] = $prefixHttp . 'api.b.hzghd.com';
 	if (strpos($referrer, $prefixHttp . 'h') === true || strpos($referrer, $prefixHttp . 'api.h') === true) {
-		$config['b'] = $prefixHttp . 'api.h.huaml.com';
+		$config['b'] = $prefixHttp . 'api.h.hzghd.com';
 	}
-	$config['s'] = $prefixHttp . 'api.s.huaml.com';
-	$config['host'] = 'huaml.com';
-	$config['imgUrl'] = $prefixHttp . 'img.huaml.com';
+	$config['s'] = $prefixHttp . 'api.s.hzghd.com';
+	$config['w'] = $prefixHttp . 'api.w.hzghd.com';
+	$config['host'] = 'hzghd.com';
+	$config['imgUrl'] = $prefixHttp . 'img.hzghd.com';
 }
-if (getenv('YII_ENV') == 'development') {
+if (getenv('YII_ENV') == 'dev') {
 	$config['c'] = $prefixHttp . 'api.m.huaml.com';
 	$config['b'] = $prefixHttp . 'api.b.huaml.com';
 	if (strpos($referrer, $prefixHttp . 'h') === true || strpos($referrer, $prefixHttp . 'api.h') === true) {
 		$config['b'] = $prefixHttp . 'api.h.huaml.com';
 	}
 	$config['s'] = $prefixHttp . 'api.s.huaml.com';
+	$config['w'] = $prefixHttp . 'api.w.huaml.com';
 	$config['host'] = 'huaml.com';
 	$config['imgUrl'] = $prefixHttp . 'img.huaml.com';
 }
 if (getenv('YII_ENV') == 'production') {
 	$config['c'] = $prefixHttp . 'api.m.huahb.com';
 	$config['b'] = $prefixHttp . 'api.b.huahb.com';
-	$config['b'] = $prefixHttp . 'api.h.huahb.com';
+	if (strpos($referrer, $prefixHttp . 'h') === true || strpos($referrer, $prefixHttp . 'api.h') === true) {
+		$config['b'] = $prefixHttp . 'api.h.huahb.com';
+	}
 	$config['s'] = $prefixHttp . 'api.s.huahb.com';
+	$config['w'] = $prefixHttp . 'api.w.huahb.com';
 	$config['host'] = 'huahb.com';
 	$config['imgUrl'] = $prefixHttp . 'img.huahb.com';
 }

console/controllers/UpgradeController.php

@@ -984,13 +984,27 @@ ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '
 		
 		$sql = "ALTER TABLE xhGoods ADD `briefContent` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '简单内容介绍，移动端添加商品' AFTER `content`;";
 		Yii::$app->db->createCommand($sql)->execute();
-		
+
+		//各个环境开放平台的更新
+		$env = getenv("YII_ENV");
+		//花美灵
+		if($env == 'dev'){
+			$sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
+			$sql .= "insert  into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wxe4428cfe08fc74d6','花美灵','cdbcb1ea6bf2249b269c542c870bd96d',12358,1,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
+			Yii::$app->db->createCommand($sql)->execute();
+		}
+		//花掌柜助手
+		if($env == 'test'){
+			$sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
+			$sql .= "insert  into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wx364800c320a0cf53','花掌柜助手','6a83bfa98f3ff5e66b1a85a19c54ebdb',12358,1,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
+			Yii::$app->db->createCommand($sql)->execute();
+		}
 	}
-	
+
 	//重新拉取并保存国兰客户的头像和图片 shish 2020.1.12
 	public function actionSyncAvatar()
 	{
 		UserService::syncAvatar(12358);
 	}
-	
+
 }