blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-05-21 22:39:16 +08:00
Code Issues Projects Releases Wiki Activity

Update WechatService.php

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

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

@ -97,7 +97,7 @@ class WechatService extends Service
*/ */
public static function __callStatic(string $name, array $arguments) public static function __callStatic(string $name, array $arguments)
{ {
[$type, $class, $classname] = self::parseName($name); [$type, $class, $classname] = static::parseName($name);
if ("{$type}{$class}" !== $name) { if ("{$type}{$class}" !== $name) {
throw new \think\Exception("抱歉，实例 {$name} 不在符合规则！"); throw new \think\Exception("抱歉，实例 {$name} 不在符合规则！");
} }
@ -105,7 +105,7 @@ class WechatService extends Service
if ($type === 'ThinkService') { if ($type === 'ThinkService') {
throw new \think\Exception("抱歉，接口模式不能实例 {$classname} 对象！"); throw new \think\Exception("抱歉，接口模式不能实例 {$classname} 对象！");
} }
return new $classname(self::instance()->getConfig()); return new $classname(static::instance()->getConfig());
} else { } else {
[$appid, $appkey] = [sysconf('wechat.thr_appid'), sysconf('wechat.thr_appkey')]; [$appid, $appkey] = [sysconf('wechat.thr_appid'), sysconf('wechat.thr_appkey')];
$data = ['class' => $name, 'appid' => $appid, 'time' => time(), 'nostr' => uniqid()]; $data = ['class' => $name, 'appid' => $appid, 'time' => time(), 'nostr' => uniqid()];
@ -240,7 +240,7 @@ class WechatService extends Service
'rcode' => $params['rcode'] ?? input('rcode', ''), 'rcode' => $params['rcode'] ?? input('rcode', ''),
'state' => $params['state'] ?? input('state', ''), 'state' => $params['state'] ?? input('state', ''),
]; ];
$wechat = self::WeChatOauth(); $wechat = static::WeChatOauth();
if ($getVars['state'] !== $appid || empty($getVars['code'])) { if ($getVars['state'] !== $appid || empty($getVars['code'])) {
$params['rcode'] = enbase64url($source); $params['rcode'] = enbase64url($source);
$location = strstr("{$source}?", '?', true) . '?' . http_build_query($params); $location = strstr("{$source}?", '?', true) . '?' . http_build_query($params);
@ -263,7 +263,7 @@ class WechatService extends Service
throw new \think\Exception('Query params [rcode] not find.'); throw new \think\Exception('Query params [rcode] not find.');
} }
} else { } else {
$result = self::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull); $result = static::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']);
$this->app->session->set("{$appid}_fansinfo", $userinfo = $result['fans']); $this->app->session->set("{$appid}_fansinfo", $userinfo = $result['fans']);
if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) { if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
@ -293,9 +293,9 @@ class WechatService extends Service
{ {
$location = $location ?: $this->app->request->url(true); $location = $location ?: $this->app->request->url(true);
if ($this->getType() === 'api') { if ($this->getType() === 'api') {
return self::WeChatScript()->getJsSign($location); return static::WeChatScript()->getJsSign($location);
} else { } else {
return self::ThinkServiceConfig()->jsSign($location); return static::ThinkServiceConfig()->jsSign($location);
} }
} }
} }