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

修改配置类名

Browse Source
This commit is contained in:
邹景立 2019-12-14 22:34:52 +08:00
parent 9ef680364e
commit e4dd0efbe9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/wechat/controller/Config.php
View File

@ -46,9 +46,9 @@ class Config extends Controller
sysconf('wechat.type', 'thr');
sysconf('wechat.thr_appid', input('appid'));
sysconf('wechat.thr_appkey', input('appkey'));
WechatService::ThinkAdminConfig()->setApiNotifyUri($this->thrNotify);
WechatService::ThinkServiceConfig()->setApiNotifyUri($this->thrNotify);
}
$this->wechat = WechatService::ThinkAdminConfig()->getConfig();
$this->wechat = WechatService::ThinkServiceConfig()->getConfig();
} catch (\Exception $e) {
$this->message = $e->getMessage();
$this->wechat = [];
@ -64,7 +64,7 @@ class Config extends Controller
foreach ($this->request->post() as $k => $v) sysconf($k, $v);
if ($this->request->post('wechat.type') === 'thr') {
try {
WechatService::ThinkAdminConfig()->setApiNotifyUri($this->thrNotify);
WechatService::ThinkServiceConfig()->setApiNotifyUri($this->thrNotify);
} catch (\Exception $exception) {
$this->error($exception->getMessage());
}

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

@ -76,7 +76,7 @@ use think\exception\HttpResponseException;
* @method \WeOpen\Service WeOpenService() static 第三方服务
*
* ----- ThinkService -----
* @method mixed ThinkAdminConfig() static 平台服务配置
* @method mixed ThinkServiceConfig() static 平台服务配置
*/
class WechatService extends Service
{
@ -131,7 +131,7 @@ class WechatService extends Service
*/
private static function paraseName($name)
{
foreach (['WeChat', 'WeMini', 'WeOpen', 'WePay', 'ThinkAdmin'] as $type) {
foreach (['WeChat', 'WeMini', 'WeOpen', 'WePay', 'ThinkService'] as $type) {
if (strpos($name, $type) === 0) {
list(, $class) = explode($type, $name);
return [$type, $class, "\\{$type}\\{$class}"];
@ -235,7 +235,7 @@ class WechatService extends Service
}
throw new HttpResponseException(redirect(enbase64url(input('rcode')), 301));
} else {
$result = self::ThinkAdminConfig()->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}_fansinfo", $fansinfo = $result['fans']);
if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($fansinfo))) {
@ -266,7 +266,7 @@ class WechatService extends Service
if ($this->getType() === 'api') {
return self::WeChatScript()->getJsSign($url);
} else {
return self::ThinkAdminConfig()->jsSign($url);
return self::ThinkServiceConfig()->jsSign($url);
}
}
}