blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Update WechatService.php

Browse Source
This commit is contained in:
Anyon 2019-12-23 15:42:06 +08:00
parent bc8d312f22
commit d40ba27fcf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/wechat/service/WechatService.php
View File

@ -224,7 +224,7 @@ class WechatService extends Service
$wechat = self::WeChatOauth(); $wechat = self::WeChatOauth();
if (input('state') !== $appid) { if (input('state') !== $appid) {
$snsapi = empty($isfull) ? 'snsapi_base' : 'snsapi_userinfo'; $snsapi = empty($isfull) ? 'snsapi_base' : 'snsapi_userinfo';
$param = (strpos($source, '?') !== false ? '&' : '?') . 'rcode=' . encode($source); $param = (strpos($source, '?') !== false ? '&' : '?') . 'rcode=' . enbase64url($source);
$oauthurl = $wechat->getOauthRedirect($source . $param, $appid, $snsapi); $oauthurl = $wechat->getOauthRedirect($source . $param, $appid, $snsapi);
if ($redirect) throw new HttpResponseException(redirect($oauthurl, 301)); if ($redirect) throw new HttpResponseException(redirect($oauthurl, 301));
exit("window.location.href='{$oauthurl}'"); exit("window.location.href='{$oauthurl}'");
@ -232,12 +232,12 @@ class WechatService extends Service
if (($token = $wechat->getOauthAccessToken()) && isset($token['openid'])) { if (($token = $wechat->getOauthAccessToken()) && isset($token['openid'])) {
$this->app->session->set("{$appid}_openid", $openid = $token['openid']); $this->app->session->set("{$appid}_openid", $openid = $token['openid']);
if (empty($isfull) && input('rcode')) { if (empty($isfull) && input('rcode')) {
throw new HttpResponseException(redirect(enbase64url(input('rcode')), 301)); throw new HttpResponseException(redirect(debase64url(input('rcode')), 301));
} }
$this->app->session->set("{$appid}_fansinfo", $fansinfo = $wechat->getUserInfo($token['access_token'], $openid)); $this->app->session->set("{$appid}_fansinfo", $fansinfo = $wechat->getUserInfo($token['access_token'], $openid));
empty($fansinfo) || FansService::instance()->set($fansinfo); empty($fansinfo) || FansService::instance()->set($fansinfo);
} }
throw new HttpResponseException(redirect(enbase64url(input('rcode')), 301)); throw new HttpResponseException(redirect(debase64url(input('rcode')), 301));
} else { } else {
$result = self::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull); $result = self::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull);
$this->app->session->set("{$appid}_openid", $openid = $result['openid']); $this->app->session->set("{$appid}_openid", $openid = $result['openid']);