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

增加页面授权测试

Browse Source
This commit is contained in:
Anyon 2020-12-21 12:30:33 +08:00
parent 574256b731
commit 32b8e1af1c
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/data/controller/api/Wechat.php
View File

@ -103,16 +103,23 @@ class Wechat extends Controller
/** /**
* 微信jssdk测试 * 页面授权 jssdk 测试
* @return string * @return string
*/ */
public function jssdkTest(): string public function jssdkTest(): string
{ {
$src = sysuri('data/api.wechat/jssdk', [], false, true) . '?mode=1'; $src = sysuri('data/api.wechat/jssdk', [], false, true) . '?mode=1';
return <<<EOL return <<<EOL
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> <html lang="zh">
<script src="{$src}"></script> <header>
<script>document.write(JSON.stringify(wx||{}));</script> <title>页面授权测试</title>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<script src="{$src}"></script>
</header>
<body>
<script>document.write(JSON.stringify(wx||{}));</script>
</body>
</html>
EOL; EOL;
} }

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

@ -232,27 +232,28 @@ class WechatService extends Service
empty($fansinfo) || FansService::instance()->set($fansinfo, $appid); empty($fansinfo) || FansService::instance()->set($fansinfo, $appid);
return ['openid' => $openid, 'fansinfo' => $fansinfo]; return ['openid' => $openid, 'fansinfo' => $fansinfo];
} }
// 解析 GET 参数
parse_str(parse_url($source, PHP_URL_QUERY), $params);
$getVars = [
'code' => $params['code'] ?? input('code', ''),
'rcode' => $params['rcode'] ?? input('rcode', ''),
'state' => $params['state'] ?? input('state', ''),
];
if ($this->getType() === 'api') { if ($this->getType() === 'api') {
$wechat = self::WeChatOauth(); $wechat = self::WeChatOauth();
if (input('state') !== $appid) { if ($getVars['state'] !== $appid || empty($getVars['code'])) {
$params['rcode'] = enbase64url($source);
$snsapi = empty($isfull) ? 'snsapi_base' : 'snsapi_userinfo'; $snsapi = empty($isfull) ? 'snsapi_base' : 'snsapi_userinfo';
$params = (strpos($source, '?') !== false ? '&' : '?') . 'rcode=' . enbase64url($source); $oauthurl = $wechat->getOauthRedirect(explode('?', $source)[0] . '?' . http_build_query($params), $appid, $snsapi);
$oauthurl = $wechat->getOauthRedirect($source . $params, $appid, $snsapi); throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("window.location.href='{$oauthurl}'"));
if ($redirect) {
throw new HttpResponseException(redirect($oauthurl, 301));
} else {
throw new HttpResponseException(response("window.location.href='{$oauthurl}'"));
}
} }
if (($token = $wechat->getOauthAccessToken()) && isset($token['openid'])) { if (($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 (empty($isfull) && input('rcode')) { if (empty($isfull) && $getVars['rcode']) throw new HttpResponseException(redirect(debase64url($getVars['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, $appid); empty($fansinfo) || FansService::instance()->set($fansinfo, $appid);
} }
throw new HttpResponseException(redirect(debase64url(input('rcode')), 301)); if ($getVars['rcode']) throw new HttpResponseException(redirect(debase64url($getVars['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']);