blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-07-14 11:21:06 +08:00
Code Issues Projects Releases Wiki Activity

fix: 更新微信参数配置

Browse Source
This commit is contained in:
邹景立 2025-03-04 14:02:27 +08:00
parent 3572908808
commit 6adf4c9120
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/think-plugs-wechat/src/service/WechatService.php
View File

@ -189,9 +189,6 @@ class WechatService extends Service
'token' => sysconf('wechat.token'), 'token' => sysconf('wechat.token'),
'appsecret' => sysconf('wechat.appsecret'), 'appsecret' => sysconf('wechat.appsecret'),
'encodingaeskey' => sysconf('wechat.encodingaeskey'), 'encodingaeskey' => sysconf('wechat.encodingaeskey'),
'mch_id' => sysconf('wechat.mch_id'),
'mch_key' => sysconf('wechat.mch_key'),
'mch_v3_key' => sysconf('wechat.mch_v3_key'),
'cache_path' => syspath('runtime/wechat'), 'cache_path' => syspath('runtime/wechat'),
]); ]);
} }
@ -210,11 +207,7 @@ class WechatService extends Service
'appsecret' => $wxapp['appkey'] ?? '', 'appsecret' => $wxapp['appkey'] ?? '',
'cache_path' => syspath('runtime/wechat'), 'cache_path' => syspath('runtime/wechat'),
]; ];
return $ispay ? static::withWxpayCert(array_merge([ return $ispay ? static::withWxpayCert($config) : $config;
'mch_id' => sysconf('wechat.mch_id'),
'mch_key' => sysconf('wechat.mch_key'),
'mch_v3_key' => sysconf('wechat.mch_v3_key'),
], $config)) : $config;
} }
/** /**
@ -227,8 +220,8 @@ class WechatService extends Service
{ {
// 文本模式主要是为了解决分布式部署 // 文本模式主要是为了解决分布式部署
$data = sysdata('plugin.wechat.payment'); $data = sysdata('plugin.wechat.payment');
$name1 = sprintf("wxpay/%s_%s_cer.pem", $options['mch_id'], md5($data['ssl_cer_text'])); $name1 = sprintf("wxpay/%s_%s_cer.pem", $data['mch_id'], md5($data['ssl_cer_text']));
$name2 = sprintf("wxpay/%s_%s_key.pem", $options['mch_id'], md5($data['ssl_key_text'])); $name2 = sprintf("wxpay/%s_%s_key.pem", $data['mch_id'], md5($data['ssl_key_text']));
$local = LocalStorage::instance(); $local = LocalStorage::instance();
if ($local->has($name1, true) && $local->has($name2, true)) { if ($local->has($name1, true) && $local->has($name2, true)) {
$sslCer = $local->path($name1, true); $sslCer = $local->path($name1, true);
@ -237,6 +230,9 @@ class WechatService extends Service
$sslCer = $local->set($name1, $data['ssl_cer_text'], true)['file']; $sslCer = $local->set($name1, $data['ssl_cer_text'], true)['file'];
$sslKey = $local->set($name2, $data['ssl_key_text'], true)['file']; $sslKey = $local->set($name2, $data['ssl_key_text'], true)['file'];
} }
$options['mch_id'] = $data['mch_id'];
$options['mch_key'] = $data['mch_key'];
$options['mch_v3_key'] = $data['mch_v3_key'];
$options['ssl_cer'] = $sslCer; $options['ssl_cer'] = $sslCer;
$options['ssl_key'] = $sslKey; $options['ssl_key'] = $sslKey;
$options['cert_public'] = $sslCer; $options['cert_public'] = $sslCer;