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

[更新]修正企业打款到银行描述问题，增加单独p12证书支持

Browse Source
This commit is contained in:
Anyon 2018-10-23 18:58:53 +08:00
parent 328d21d32c
commit 60e032cdf6
6 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Test/config.php
View File

@ -20,7 +20,8 @@ return [
// 配置商户支付参数
'mch_id' => "1332187001",
'mch_key' => 'A82DC5BD1F3359081049C568D8502BC5',
// 配置商户支付双向证书目录
// 配置商户支付双向证书目录 （p12 | key,cert 二选一，两者都配置时p12优先）
// 'ssl_p12' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.p12',
'ssl_key' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_key.pem',
'ssl_cer' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.pem',
// 配置缓存目录，需要拥有写权限

29
WeChat/Contracts/BasicPay.php
View File

@ -53,7 +53,7 @@ class BasicPay
throw new InvalidArgumentException("Missing Config -- [mch_key]");
}
if (!empty($options['cache_path'])) {
Tools::$cache_path = $options['cache_path'];
Tools::$CachePath = $options['cache_path'];
}
$this->config = new DataArray($options);
// 商户基础参数
@ -79,10 +79,8 @@ class BasicPay
public function getNotify()
{
$data = Tools::xml2arr(file_get_contents('php://input'));
if (!empty($data['sign'])) {
if ($this->getPaySign($data) === $data['sign']) {
return $data;
}
if (isset($data['sign']) && $this->getPaySign($data) === $data['sign']) {
return $data;
}
throw new InvalidResponseException('Invalid Notify.', '0');
}
@ -96,7 +94,6 @@ class BasicPay
*/
public function getPaySign(array $data, $signType = 'MD5', $buff = '')
{
unset($data['sign']);
ksort($data);
foreach ($data as $k => $v) {
$buff .= "{$k}={$v}&";
@ -112,7 +109,8 @@ class BasicPay
* 转换短链接
* @param string $longUrl 需要转换的URL，签名用原串，传输需URLencode
* @return array
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\ExcInvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function shortUrl($longUrl)
{
@ -145,22 +143,35 @@ class BasicPay
* @param bool $needSignType 是否需要传签名类型参数
* @return array
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true)
{
$option = [];
if ($isCert) {
$option['ssl_p12'] = $this->config->get('ssl_p12');
$option['ssl_cer'] = $this->config->get('ssl_cer');
$option['ssl_key'] = $this->config->get('ssl_key');
if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer']))
if (is_string($option['ssl_p12']) && file_exists($option['ssl_p12'])) {
$content = file_get_contents($option['ssl_p12']);
if (openssl_pkcs12_read($content, $certs, $this->config->get('mch_id'))) {
$option['ssl_key'] = Tools::pushFile(md5($certs['pkey']) . '.pem', $certs['pkey']);
$option['ssl_cer'] = Tools::pushFile(md5($certs['cert']) . '.pem', $certs['cert']);
} else throw new InvalidArgumentException("P12 certificate does not match MCH_ID --- ssl_p12");
}
if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer'])) {
throw new InvalidArgumentException("Missing Config -- ssl_cer", '0');
if (empty($option['ssl_key']) || !file_exists($option['ssl_key']))
}
if (empty($option['ssl_key']) || !file_exists($option['ssl_key'])) {
throw new InvalidArgumentException("Missing Config -- ssl_key", '0');
}
}
$params = $this->params->merge($data);
$needSignType && ($params['sign_type'] = strtoupper($signType));
$params['sign'] = $this->getPaySign($params, $signType);
print_r($params);
$result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
print_r($result);
if ($result['return_code'] !== 'SUCCESS') {
throw new InvalidResponseException($result['return_msg'], '0');
}

2
WeChat/Contracts/BasicWeChat.php
View File

@ -70,7 +70,7 @@ class BasicWeChat
$this->GetAccessTokenCallback = $options['GetAccessTokenCallback'];
}
if (!empty($options['cache_path'])) {
Tools::$cache_path = $options['cache_path'];
Tools::$CachePath = $options['cache_path'];
}
$this->config = new DataArray($options);
}

48
WeChat/Contracts/Tools.php
View File

@ -29,7 +29,7 @@ class Tools
* 缓存路径
* @var null
*/
public static $cache_path = null;
public static $CachePath = null;
/**
@ -75,10 +75,8 @@ class Tools
if (empty($mines)) {
$content = file_get_contents('http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
preg_match_all('#^([^\s]{2,}?)\s+(.+?)$#ism', $content, $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
foreach (explode(" ", $match[2]) as $ext) {
$mines[$ext] = $match[1];
}
foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) {
$mines[$ext] = $match[1];
}
self::setCache('all_ext_mine', $mines);
}
@ -256,20 +254,34 @@ class Tools
return (intval($status["http_code"]) === 200) ? $content : false;
}
/**
* 写入文件
* @param string $name 文件名称
* @param string $content 文件内容
* @return string
* @throws LocalCacheException
*/
public static function pushFile($name, $content)
{
$file = self::getCacheName($name);
if (!file_put_contents($file, $content)) throw new LocalCacheException('local file write error.', '0');
return $file;
}
/**
* 缓存配置与存储
* @param string $name 缓存名称
* @param string $value 缓存内容
* @param int $expired 缓存时间(0表示永久缓存)
* @return string
* @throws LocalCacheException
*/
public static function setCache($name, $value = '', $expired = 3600)
{
$cache_file = self::getCacheName($name);
$file = self::getCacheName($name);
$content = serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]);
if (!file_put_contents($cache_file, $content)) {
throw new LocalCacheException('local cache error.', '0');
}
if (!file_put_contents($file, $content)) throw new LocalCacheException('local cache error.', '0');
return $file;
}
/**
@ -279,8 +291,8 @@ class Tools
*/
public static function getCache($name)
{
$cache_file = self::getCacheName($name);
if (file_exists($cache_file) && ($content = file_get_contents($cache_file))) {
$file = self::getCacheName($name);
if (file_exists($file) && ($content = file_get_contents($file))) {
$data = unserialize($content);
if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
return $data['value'];
@ -297,8 +309,8 @@ class Tools
*/
public static function delCache($name)
{
$cache_file = self::getCacheName($name);
return file_exists($cache_file) ? unlink($cache_file) : true;
$file = self::getCacheName($name);
return file_exists($file) ? unlink($file) : true;
}
/**
@ -308,11 +320,11 @@ class Tools
*/
private static function getCacheName($name)
{
if (empty(self::$cache_path)) {
self::$cache_path = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
if (empty(self::$CachePath)) {
self::$CachePath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
}
self::$cache_path = rtrim(self::$cache_path, '/\\') . DIRECTORY_SEPARATOR;
file_exists(self::$cache_path) || mkdir(self::$cache_path, 0755, true);
return self::$cache_path . $name;
self::$CachePath = rtrim(self::$CachePath, '/\\') . DIRECTORY_SEPARATOR;
file_exists(self::$CachePath) || mkdir(self::$CachePath, 0755, true);
return self::$CachePath . $name;
}
}

5
WePay/TransfersBank.php
View File

@ -53,7 +53,6 @@ class TransfersBank extends BasicPay
if (!isset($options['amount'])) {
throw new InvalidArgumentException('Missing Options -- [amount]');
}
isset($options['desc']) && $this->params->set('desc', $options['desc']);
$this->params->offsetUnset('appid');
return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
'amount' => $options['amount'],
@ -61,6 +60,7 @@ class TransfersBank extends BasicPay
'partner_trade_no' => $options['partner_trade_no'],
'enc_bank_no' => $this->rsaEncode($options['enc_bank_no']),
'enc_true_name' => $this->rsaEncode($options['enc_true_name']),
'desc' => isset($options['desc']) ? $options['desc'] : '',
], true, 'MD5', false);
}
@ -68,7 +68,8 @@ class TransfersBank extends BasicPay
* 商户企业付款到银行卡操作进行结果查询
* @param string $partnerTradeNo 商户订单号，需保持唯一
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function query($partnerTradeNo)
{

1
composer.json
View File

@ -20,6 +20,7 @@
],
"require": {
"php": ">=5.4",
"ext-json": "*",
"ext-curl": "*",
"ext-openssl": "*"
},