diff --git a/vendor/autoload.php b/vendor/autoload.php index 5502f1b4f..628adbbcd 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2::getLoader(); +return ComposerAutoloaderInite4f62b825d40d3e077bb16351eabf2a4::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index e1b49ae52..df2d928c5 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2 +class ComposerAutoloaderInite4f62b825d40d3e077bb16351eabf2a4 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInite4f62b825d40d3e077bb16351eabf2a4', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInite4f62b825d40d3e077bb16351eabf2a4', '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\ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInite4f62b825d40d3e077bb16351eabf2a4::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$files; + $includeFiles = Composer\Autoload\ComposerStaticInite4f62b825d40d3e077bb16351eabf2a4::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire08d118919634ee23e1a930bd6ef41bc2($fileIdentifier, $file); + composerRequiree4f62b825d40d3e077bb16351eabf2a4($fileIdentifier, $file); } return $loader; } } -function composerRequire08d118919634ee23e1a930bd6ef41bc2($fileIdentifier, $file) +function composerRequiree4f62b825d40d3e077bb16351eabf2a4($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 41a421a33..0a10923c7 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2 +class ComposerStaticInite4f62b825d40d3e077bb16351eabf2a4 { public static $files = array ( '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php', @@ -303,9 +303,9 @@ class ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInite4f62b825d40d3e077bb16351eabf2a4::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInite4f62b825d40d3e077bb16351eabf2a4::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInite4f62b825d40d3e077bb16351eabf2a4::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 3a1ba589d..f7049b38a 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -443,17 +443,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.1.16", - "version_normalized": "1.1.16.0", + "version": "v1.1.17", + "version_normalized": "1.1.17.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "8cd19c0e19ada95428709aa35f58e2bd00340b47" + "reference": "7438d3b7081ddbdb8320cf7762896d705710cf28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/8cd19c0e19ada95428709aa35f58e2bd00340b47", - "reference": "8cd19c0e19ada95428709aa35f58e2bd00340b47", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/7438d3b7081ddbdb8320cf7762896d705710cf28", + "reference": "7438d3b7081ddbdb8320cf7762896d705710cf28", "shasum": "", "mirrors": [ { @@ -468,7 +468,7 @@ "ext-openssl": "*", "php": ">=5.4" }, - "time": "2018-10-24T08:59:25+00:00", + "time": "2018-10-27T07:50:34+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php index 263ede660..eff91acd2 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php @@ -95,9 +95,8 @@ class BasicPay public function getPaySign(array $data, $signType = 'MD5', $buff = '') { ksort($data); - foreach ($data as $k => $v) { - $buff .= "{$k}={$v}&"; - } + if (isset($data['sign'])) unset($data['sign']); + foreach ($data as $k => $v) $buff .= "{$k}={$v}&"; $buff .= ("key=" . $this->config->get('mch_key')); if (strtoupper($signType) === 'MD5') { return strtoupper(md5($buff)); @@ -109,7 +108,7 @@ class BasicPay * 转换短链接 * @param string $longUrl 需要转换的URL,签名用原串,传输需URLencode * @return array - * @throws \WeChat\Exceptions\ExcInvalidResponseException + * @throws InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException */ public function shortUrl($longUrl)