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

Update WechatService.php

Browse Source
This commit is contained in:
Anyon 2020-11-23 14:42:46 +08:00
parent b142006a01
commit 1809ee9153
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,13 +195,14 @@ class WechatService extends Service
'mch_key' => sysconf('wechat.mch_key'), 'mch_key' => sysconf('wechat.mch_key'),
'cache_path' => $this->app->getRuntimePath() . 'wechat', 'cache_path' => $this->app->getRuntimePath() . 'wechat',
]; ];
$local = LocalStorage::instance();
switch (strtolower(sysconf('wechat.mch_ssl_type'))) { switch (strtolower(sysconf('wechat.mch_ssl_type'))) {
case 'p12': case 'p12':
$options['ssl_p12'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_p12'), true); $options['ssl_p12'] = $local->path(sysconf('wechat.mch_ssl_p12'), true);
break; break;
case 'pem': case 'pem':
$options['ssl_key'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_key'), true); $options['ssl_key'] = $local->path(sysconf('wechat.mch_ssl_key'), true);
$options['ssl_cer'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_cer'), true); $options['ssl_cer'] = $local->path(sysconf('wechat.mch_ssl_cer'), true);
break; break;
} }
return $options; return $options;
@ -276,7 +277,7 @@ class WechatService extends Service
*/ */
public function getWebJssdkSign(?string $location = null) public function getWebJssdkSign(?string $location = null)
{ {
$location = is_null($location) ? $this->app->request->url(true) : $location; $location = $location ?: $this->app->request->url(true);
if ($this->getType() === 'api') { if ($this->getType() === 'api') {
return self::WeChatScript()->getJsSign($location); return self::WeChatScript()->getJsSign($location);
} else { } else {