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

页面授权优化

Browse Source
This commit is contained in:
Anyon 2020-12-21 13:22:29 +08:00
parent effeaab4e5
commit 1cc97ec834
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,10 +245,10 @@ class WechatService extends Service
$params['rcode'] = enbase64url($source); $params['rcode'] = enbase64url($source);
$location = strstr("{$source}?", '?', true) . '?' . http_build_query($params); $location = strstr("{$source}?", '?', true) . '?' . http_build_query($params);
$oauthurl = $wechat->getOauthRedirect($location, $appid, $isfull ? 'snsapi_userinfo' : 'snsapi_base'); $oauthurl = $wechat->getOauthRedirect($location, $appid, $isfull ? 'snsapi_userinfo' : 'snsapi_base');
throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("window.location.href='{$oauthurl}'")); throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("location.href='{$oauthurl}'"));
} elseif (($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']); $this->app->session->set("{$appid}_openid", $openid = $token['openid']);
if ($isfull && !empty($token['access_token'])) { if ($isfull && isset($token['access_token'])) {
$userinfo = $wechat->getUserInfo($token['access_token'], $openid); $userinfo = $wechat->getUserInfo($token['access_token'], $openid);
$this->app->session->set("{$appid}_fansinfo", $userinfo); $this->app->session->set("{$appid}_fansinfo", $userinfo);
empty($userinfo) || FansService::instance()->set($userinfo, $appid); empty($userinfo) || FansService::instance()->set($userinfo, $appid);
@ -256,7 +256,7 @@ class WechatService extends Service
} }
if ($getVars['rcode']) { if ($getVars['rcode']) {
$location = debase64url($getVars['rcode']); $location = debase64url($getVars['rcode']);
throw new HttpResponseException($redirect ? redirect($location, 301) : response("window.location.href='{$location}'")); throw new HttpResponseException($redirect ? redirect($location, 301) : response("location.href='{$location}'"));
} elseif ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) { } elseif ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
return ['openid' => $openid, 'fansinfo' => $userinfo]; return ['openid' => $openid, 'fansinfo' => $userinfo];
} else { } else {
@ -273,7 +273,7 @@ class WechatService extends Service
if ($redirect && !empty($result['url'])) { if ($redirect && !empty($result['url'])) {
throw new HttpResponseException(redirect($result['url'], 301)); throw new HttpResponseException(redirect($result['url'], 301));
} else { } else {
throw new HttpResponseException(response("window.location.href='{$result['url']}'")); throw new HttpResponseException(response("location.href='{$result['url']}'"));
} }
} }
} }