|
|
@@ -295,13 +295,7 @@ class WxOpenController extends PublicController
|
|
|
$alias = $authorize_info['alias'];
|
|
|
$qrCodeUrl = $authorize_info['qrcode_url'];
|
|
|
$accessTokenTime = date("Y-m-d H:i:s", (time() + $expires_in - 100));//安全起见,将过期时间设置得比微信里还短100秒
|
|
|
-
|
|
|
- //开放平台还没有关联公众号,先将开放平台关联公众号
|
|
|
- $open = WxOpenService::getOpen();
|
|
|
- if (isset($open['merchantId']) && empty($open['merchantId'])) {
|
|
|
- WxOpenService::updateById(1, ['merchantId' => $id]);
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
$extend = MerchantExtendClass::getByMerchantId($id);
|
|
|
|
|
|
$open = WxOpenService::getOpen();
|
|
|
@@ -326,6 +320,12 @@ class WxOpenController extends PublicController
|
|
|
if (getenv('YII_ENV') == 'dev') {
|
|
|
//花美玲
|
|
|
$miniAppSecret = '12f90039b1245ba6abf2e4184462fb30';
|
|
|
+ }elseif(getenv('YII_ENV') == 'test'){
|
|
|
+ //花掌柜
|
|
|
+ $miniAppSecret = 'fd21ef3ebbc70e89d5c3a5a3c013edb6';
|
|
|
+ }else{
|
|
|
+ echo '未知平台';
|
|
|
+ Yii::$app->end();
|
|
|
}
|
|
|
$miniData['miniAppSecret'] = $miniAppSecret;
|
|
|
|