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

修正JS跳转规则

Browse Source
This commit is contained in:
Anyon 2020-12-21 13:00:02 +08:00
parent 32b8e1af1c
commit 3abdc309c1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,16 +244,18 @@ class WechatService extends Service
if ($getVars['state'] !== $appid || empty($getVars['code'])) {
$params['rcode'] = enbase64url($source);
$snsapi = empty($isfull) ? 'snsapi_base' : 'snsapi_userinfo';
$oauthurl = $wechat->getOauthRedirect(explode('?', $source)[0] . '?' . http_build_query($params), $appid, $snsapi);
$oauthurl = $wechat->getOauthRedirect(strstr("{$source}?", '?', true) . '?' . http_build_query($params), $appid, $snsapi);
throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("window.location.href='{$oauthurl}'"));
}
if (($token = $wechat->getOauthAccessToken($getVars['code'])) && isset($token['openid'])) {
} elseif (($token = $wechat->getOauthAccessToken($getVars['code'])) && isset($token['openid'])) {
$this->app->session->set("{$appid}_openid", $openid = $token['openid']);
if (empty($isfull) && $getVars['rcode']) throw new HttpResponseException(redirect(debase64url($getVars['rcode']), 301));
$this->app->session->set("{$appid}_fansinfo", $fansinfo = $wechat->getUserInfo($token['access_token'], $openid));
empty($fansinfo) || FansService::instance()->set($fansinfo, $appid);
}
if ($getVars['rcode']) throw new HttpResponseException(redirect(debase64url($getVars['rcode']), 301));
if ($getVars['rcode']) {
$location = debase64url($getVars['rcode']);
throw new HttpResponseException($redirect ? redirect($location, 301) : response("window.location.href='{$location}'"));
}
} else {
$result = self::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull);
$this->app->session->set("{$appid}_openid", $openid = $result['openid']);