From b0c5be2f359b43fa5d442e1eec6bd1c900bd4907 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 10 Jul 2017 10:53:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]Composer=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8F=8A=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- .../zoujingli/wechat-php-sdk/Wechat/WechatPay.php | 6 ++++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index b718da834..adf33b9f4 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7::getLoader(); +return ComposerAutoloaderInit3690105f7719931c5f8f2ffabcf1c6ab::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 943c4f56d..56be4ea63 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7 +class ComposerAutoloaderInit3690105f7719931c5f8f2ffabcf1c6ab { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit3690105f7719931c5f8f2ffabcf1c6ab', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit3690105f7719931c5f8f2ffabcf1c6ab', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit3690105f7719931c5f8f2ffabcf1c6ab::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit3690105f7719931c5f8f2ffabcf1c6ab::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire7a89897f38ba6b2cbfe9f97509e03de7($fileIdentifier, $file); + composerRequire3690105f7719931c5f8f2ffabcf1c6ab($fileIdentifier, $file); } return $loader; } } -function composerRequire7a89897f38ba6b2cbfe9f97509e03de7($fileIdentifier, $file) +function composerRequire3690105f7719931c5f8f2ffabcf1c6ab($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 1361e495a..18241f99c 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7 +class ComposerStaticInit3690105f7719931c5f8f2ffabcf1c6ab { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -383,9 +383,9 @@ class ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit3690105f7719931c5f8f2ffabcf1c6ab::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit3690105f7719931c5f8f2ffabcf1c6ab::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit3690105f7719931c5f8f2ffabcf1c6ab::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 1bd67efb3..6a325d01d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -49,18 +49,18 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/wechat-php-sdk.git", - "reference": "caeb3d93a4c7ad78c6aaf7bcdbb0086f0e1f3ae8" + "reference": "4431e3a9684dde09c0a1642ca1d83b62a2af6b3e" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/zoujingli/wechat-php-sdk/caeb3d93a4c7ad78c6aaf7bcdbb0086f0e1f3ae8.zip", - "reference": "caeb3d93a4c7ad78c6aaf7bcdbb0086f0e1f3ae8", + "url": "https://files.phpcomposer.com/files/zoujingli/wechat-php-sdk/4431e3a9684dde09c0a1642ca1d83b62a2af6b3e.zip", + "reference": "4431e3a9684dde09c0a1642ca1d83b62a2af6b3e", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2017-05-10T07:41:59+00:00", + "time": "2017-07-10T02:49:05+00:00", "type": "project", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/wechat-php-sdk/Wechat/WechatPay.php b/vendor/zoujingli/wechat-php-sdk/Wechat/WechatPay.php index 8be39107e..d0504ec4d 100644 --- a/vendor/zoujingli/wechat-php-sdk/Wechat/WechatPay.php +++ b/vendor/zoujingli/wechat-php-sdk/Wechat/WechatPay.php @@ -202,10 +202,11 @@ class WechatPay { * @param string $goods_tag 商品标记，代金券或立减优惠功能的参数 * @return bool|string */ - public function getPrepayId($openid, $body, $out_trade_no, $total_fee, $notify_url, $trade_type = "JSAPI", $goods_tag = null) { + public function getPrepayId($openid, $body, $out_trade_no, $total_fee, $notify_url, $trade_type = "JSAPI", $goods_tag = null, $fee_type = 'CNY') { $postdata = array( "body" => $body, "out_trade_no" => $out_trade_no, + "fee_type" => $fee_type, "total_fee" => $total_fee, "notify_url" => $notify_url, "trade_type" => $trade_type, @@ -230,10 +231,11 @@ class WechatPay { * @param string $goods_tag 商品标记，代金券或立减优惠功能的参数 * @return bool|string */ - public function getQrcPrepayId($openid, $body, $out_trade_no, $total_fee, $notify_url, $goods_tag = null) { + public function getQrcPrepayId($openid, $body, $out_trade_no, $total_fee, $notify_url, $goods_tag = null, $fee_type = 'CNY') { $postdata = array( "body" => $body, "out_trade_no" => $out_trade_no, + "fee_type" => $fee_type, "total_fee" => $total_fee, "notify_url" => $notify_url, "trade_type" => 'NATIVE',