From e9fe22e79e453a9917dde9cda9d43f1a93cf5f87 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 16 Jan 2019 18:10:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]ComposerUpdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- thinkphp/helper.php | 4 +-- thinkphp/library/think/App.php | 2 +- thinkphp/library/think/Model.php | 27 ++++++++++++++++ thinkphp/library/think/Request.php | 14 +++++--- thinkphp/library/think/Template.php | 2 +- thinkphp/library/think/Validate.php | 10 +++++- thinkphp/library/think/db/Query.php | 22 +++++++++---- thinkphp/library/think/log/driver/File.php | 24 ++++++++------ .../think/model/relation/BelongsToMany.php | 1 + thinkphp/library/think/response/Download.php | 10 +++--- thinkphp/library/think/route/Rule.php | 2 +- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 ++++---- vendor/composer/autoload_static.php | 8 ++--- vendor/composer/installed.json | 32 +++++++++---------- vendor/symfony/options-resolver/LICENSE | 2 +- .../wechat-developer/AliPay/Bill.php | 1 + .../zoujingli/wechat-developer/AliPay/Pos.php | 1 + .../wechat-developer/AliPay/Scan.php | 1 + .../wechat-developer/AliPay/Transfer.php | 1 + .../WeChat/Contracts/BasicAliPay.php | 22 ++++++++++--- .../wechat-developer/WeChat/Script.php | 2 +- .../wechat-developer/_test/alipay.php | 4 ++- 23 files changed, 141 insertions(+), 67 deletions(-) diff --git a/thinkphp/helper.php b/thinkphp/helper.php index 9c4653350..88be727bf 100644 --- a/thinkphp/helper.php +++ b/thinkphp/helper.php @@ -313,9 +313,9 @@ if (!function_exists('download')) { * @param integer $expire 有效期（秒） * @return \think\response\Download */ - function download($filename, $name = '', $content = false, $expire = 360, $openinBrower = false) + function download($filename, $name = '', $content = false, $expire = 360, $openinBrowser = false) { - return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire)->openinBrower($openinBrower); + return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire)->openinBrowser($openinBrowser); } } diff --git a/thinkphp/library/think/App.php b/thinkphp/library/think/App.php index ac8b0e91b..c9a3e3e89 100644 --- a/thinkphp/library/think/App.php +++ b/thinkphp/library/think/App.php @@ -20,7 +20,7 @@ use think\route\Dispatch; */ class App extends Container { - const VERSION = '5.1.32 LTS'; + const VERSION = '5.1.33 LTS'; /** * 当前模块路径 diff --git a/thinkphp/library/think/Model.php b/thinkphp/library/think/Model.php index 9896f9ff5..b22ee5bcc 100644 --- a/thinkphp/library/think/Model.php +++ b/thinkphp/library/think/Model.php @@ -18,6 +18,33 @@ use think\db\Query; * Class Model * @package think * @mixin Query + * @method Query where(mixed $field, string $op = null, mixed $condition = null) static 查询条件 + * @method Query whereRaw(string $where, array $bind = []) static 表达式查询 + * @method Query whereExp(string $field, string $condition, array $bind = []) static 字段表达式查询 + * @method Query when(mixed $condition, mixed $query, mixed $otherwise = null) static 条件查询 + * @method Query join(mixed $join, mixed $condition = null, string $type = 'INNER') static JOIN查询 + * @method Query view(mixed $join, mixed $field = null, mixed $on = null, string $type = 'INNER') static 视图查询 + * @method Query with(mixed $with) static 关联预载入 + * @method Query count(string $field) static Count统计查询 + * @method Query min(string $field) static Min统计查询 + * @method Query max(string $field) static Max统计查询 + * @method Query sum(string $field) static SUM统计查询 + * @method Query avg(string $field) static Avg统计查询 + * @method Query field(mixed $field, boolean $except = false) static 指定查询字段 + * @method Query fieldRaw(string $field, array $bind = []) static 指定查询字段 + * @method Query union(mixed $union, boolean $all = false) static UNION查询 + * @method Query limit(mixed $offset, integer $length = null) static 查询LIMIT + * @method Query order(mixed $field, string $order = null) static 查询ORDER + * @method Query orderRaw(string $field, array $bind = []) static 查询ORDER + * @method Query cache(mixed $key = null , integer $expire = null) static 设置查询缓存 + * @method mixed value(string $field) static 获取某个字段的值 + * @method array column(string $field, string $key = '') static 获取某个列的值 + * @method mixed find(mixed $data = null) static 查询单个记录 + * @method mixed select(mixed $data = null) static 查询多个记录 + * @method mixed get(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 支持关联预载入 + * @method mixed getOrFail(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 不存在则抛出异常 + * @method mixed findOrEmpty(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 不存在则返回空模型 + * @method mixed all(mixed $data = null,mixed $with =[],bool $cache= false) static 查询多个记录 支持关联预载入 * @method \think\Model withAttr(array $name,\Closure $closure) 动态定义获取器 */ abstract class Model implements \JsonSerializable, \ArrayAccess diff --git a/thinkphp/library/think/Request.php b/thinkphp/library/think/Request.php index 6ba6e7d77..36ed87468 100644 --- a/thinkphp/library/think/Request.php +++ b/thinkphp/library/think/Request.php @@ -809,9 +809,14 @@ class Request return $this->server('REQUEST_METHOD') ?: 'GET'; } elseif (!$this->method) { if (isset($_POST[$this->config['var_method']])) { - $this->method = strtoupper($_POST[$this->config['var_method']]); - $method = strtolower($this->method); - $this->{$method} = $_POST; + $method = strtolower($_POST[$this->config['var_method']]); + if (in_array($method, ['get', 'post', 'put', 'patch', 'delete'])) { + $this->method = strtoupper($method); + $this->{$method} = $_POST; + } else { + $this->method = 'POST'; + } + unset($_POST[$this->config['var_method']]); } elseif ($this->server('HTTP_X_HTTP_METHOD_OVERRIDE')) { $this->method = strtoupper($this->server('HTTP_X_HTTP_METHOD_OVERRIDE')); } else { @@ -1320,7 +1325,8 @@ class Request * @param array $data 数据源 * @return void */ - public function arrayReset(array &$data) { + public function arrayReset(array &$data) + { foreach ($data as &$value) { if (is_array($value)) { $this->arrayReset($value); diff --git a/thinkphp/library/think/Template.php b/thinkphp/library/think/Template.php index dc1acfa51..2855cbcb2 100644 --- a/thinkphp/library/think/Template.php +++ b/thinkphp/library/think/Template.php @@ -1311,7 +1311,7 @@ class Template public function __debugInfo() { $data = get_object_vars($this); - unset($data['app'], $data['storege']); + unset($data['app'], $data['storage']); return $data; } diff --git a/thinkphp/library/think/Validate.php b/thinkphp/library/think/Validate.php index 54c3a7370..26490a4ed 100644 --- a/thinkphp/library/think/Validate.php +++ b/thinkphp/library/think/Validate.php @@ -131,7 +131,7 @@ class Validate * 内置正则验证规则 * @var array */ - protected $regex = [ + protected $defaultRegex = [ 'alphaDash' => '/^[A-Za-z0-9\-\_]+$/', 'chs' => '/^[\x{4e00}-\x{9fa5}]+$/u', 'chsAlpha' => '/^[\x{4e00}-\x{9fa5}a-zA-Z]+$/u', @@ -178,6 +178,12 @@ class Validate */ protected $append = []; + /** + * 验证正则定义 + * @var array + */ + protected $regex = []; + /** * 架构函数 * @access public @@ -1360,6 +1366,8 @@ class Validate { if (isset($this->regex[$rule])) { $rule = $this->regex[$rule]; + } elseif (isset($this->defaultRegex[$rule])) { + $rule = $this->defaultRegex[$rule]; } if (0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) { diff --git a/thinkphp/library/think/db/Query.php b/thinkphp/library/think/db/Query.php index 2704c8df7..8acc4dfe7 100644 --- a/thinkphp/library/think/db/Query.php +++ b/thinkphp/library/think/db/Query.php @@ -834,9 +834,10 @@ class Query * @param mixed $join 关联的表名 * @param mixed $condition 条件 * @param string $type JOIN类型 + * @param array $bind 参数绑定 * @return $this */ - public function join($join, $condition = null, $type = 'INNER') + public function join($join, $condition = null, $type = 'INNER', $bind = []) { if (empty($condition)) { // 如果为组数，则循环调用join @@ -847,7 +848,9 @@ class Query } } else { $table = $this->getJoinTable($join); - + if ($bind) { + $this->bindParams($condition, $bind); + } $this->options['join'][] = [$table, strtoupper($type), $condition]; } @@ -859,9 +862,10 @@ class Query * @access public * @param mixed $join 关联的表名 * @param mixed $condition 条件 + * @param array $bind 参数绑定 * @return $this */ - public function leftJoin($join, $condition = null) + public function leftJoin($join, $condition = null, $bind = []) { return $this->join($join, $condition, 'LEFT'); } @@ -871,9 +875,10 @@ class Query * @access public * @param mixed $join 关联的表名 * @param mixed $condition 条件 + * @param array $bind 参数绑定 * @return $this */ - public function rightJoin($join, $condition = null) + public function rightJoin($join, $condition = null, $bind = []) { return $this->join($join, $condition, 'RIGHT'); } @@ -883,9 +888,10 @@ class Query * @access public * @param mixed $join 关联的表名 * @param mixed $condition 条件 + * @param array $bind 参数绑定 * @return $this */ - public function fullJoin($join, $condition = null) + public function fullJoin($join, $condition = null, $bind = []) { return $this->join($join, $condition, 'FULL'); } @@ -943,6 +949,10 @@ class Query */ public function union($union, $all = false) { + if (empty($union)) { + return $this; + } + $this->options['union']['type'] = $all ? 'UNION ALL' : 'UNION'; if (is_array($union)) { @@ -1520,7 +1530,7 @@ class Query return $this->whereRaw($field, is_array($op) ? $op : []); } elseif ($strict) { // 使用严格模式查询 - $where = [$field, $op, $condition]; + $where = [$field, $op, $condition, $logic]; } elseif (is_array($field)) { // 解析数组批量查询 return $this->parseArrayWhereItems($field, $logic); diff --git a/thinkphp/library/think/log/driver/File.php b/thinkphp/library/think/log/driver/File.php index 10f745d26..c506105fd 100644 --- a/thinkphp/library/think/log/driver/File.php +++ b/thinkphp/library/think/log/driver/File.php @@ -19,7 +19,7 @@ use think\App; class File { protected $config = [ - 'time_format' => ' c ', + 'time_format' => 'c', 'single' => false, 'file_size' => 2097152, 'path' => '', @@ -107,7 +107,13 @@ class File $info['timestamp'] = date($this->config['time_format']); foreach ($message as $type => $msg) { - $info[$type] = is_array($msg) ? implode("\r\n", $msg) : $msg; + $msg = is_array($msg) ? implode("\r\n", $msg) : $msg; + if (PHP_SAPI == 'cli') { + $info['msg'] = $msg; + $info['type'] = $type; + } else { + $info[$type] = $msg; + } } if (PHP_SAPI == 'cli') { @@ -140,13 +146,13 @@ class File } } + $cli = PHP_SAPI == 'cli' ? '_cli' : ''; + if ($this->config['single']) { $name = is_string($this->config['single']) ? $this->config['single'] : 'single'; - $destination = $this->config['path'] . $name . '.log'; + $destination = $this->config['path'] . $name . $cli . '.log'; } else { - $cli = PHP_SAPI == 'cli' ? '_cli' : ''; - if ($this->config['max_files']) { $filename = date('Ymd') . $cli . '.log'; } else { @@ -172,15 +178,13 @@ class File if ($this->config['single']) { $name = is_string($this->config['single']) ? $this->config['single'] : 'single'; - - $name .= '_' . $type; } elseif ($this->config['max_files']) { - $name = date('Ymd') . '_' . $type . $cli; + $name = date('Ymd'); } else { - $name = date('d') . '_' . $type . $cli; + $name = date('d'); } - return $path . DIRECTORY_SEPARATOR . $name . '.log'; + return $path . DIRECTORY_SEPARATOR . $name . '_' . $type . $cli . '.log'; } /** diff --git a/thinkphp/library/think/model/relation/BelongsToMany.php b/thinkphp/library/think/model/relation/BelongsToMany.php index 747482b6e..54df68b0c 100644 --- a/thinkphp/library/think/model/relation/BelongsToMany.php +++ b/thinkphp/library/think/model/relation/BelongsToMany.php @@ -561,6 +561,7 @@ class BelongsToMany extends Relation $pivot[$this->foreignKey] = $id; $this->pivot->replace() ->exists(false) + ->data([]) ->save($pivot); $result[] = $this->newPivot($pivot, true); } diff --git a/thinkphp/library/think/response/Download.php b/thinkphp/library/think/response/Download.php index d5fcb444c..5595f9ab4 100644 --- a/thinkphp/library/think/response/Download.php +++ b/thinkphp/library/think/response/Download.php @@ -20,7 +20,7 @@ class Download extends Response protected $name; protected $mimeType; protected $isContent = false; - protected $openinBrower = false; + protected $openinBrowser = false; /** * 处理数据 * @access protected @@ -53,7 +53,7 @@ class Download extends Response $this->header['Pragma'] = 'public'; $this->header['Content-Type'] = $mimeType ?: 'application/octet-stream'; $this->header['Cache-control'] = 'max-age=' . $this->expire; - $this->header['Content-Disposition'] = $this->openinBrower ? 'inline' : 'attachment; filename="' . $name . '"'; + $this->header['Content-Disposition'] = $this->openinBrowser ? 'inline' : 'attachment; filename="' . $name . '"'; $this->header['Content-Length'] = $size; $this->header['Content-Transfer-Encoding'] = 'binary'; $this->header['Expires'] = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT'; @@ -138,11 +138,11 @@ class Download extends Response /** * 设置是否在浏览器中显示文件 * @access public - * @param bool $openinBrower 是否在浏览器中显示文件 + * @param bool $openinBrowser 是否在浏览器中显示文件 * @return $this */ - public function openinBrower($openinBrower) { - $this->openinBrower = $openinBrower; + public function openinBrowser($openinBrowser) { + $this->openinBrowser = $openinBrowser; return $this; } } diff --git a/thinkphp/library/think/route/Rule.php b/thinkphp/library/think/route/Rule.php index fdfc29d1d..f841ada6e 100644 --- a/thinkphp/library/think/route/Rule.php +++ b/thinkphp/library/think/route/Rule.php @@ -1001,7 +1001,7 @@ abstract class Rule } } - $regex = str_replace($match, $replace, $rule); + $regex = str_replace(array_unique($match), array_unique($replace), $rule); $regex = str_replace([')?/', ')/', ')?-', ')-', '\\\\/'], [')\/', ')\/', ')\-', ')\-', '\/'], $regex); if (isset($hasSlash)) { diff --git a/vendor/autoload.php b/vendor/autoload.php index a285a94c3..e5f5e1c53 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38::getLoader(); +return ComposerAutoloaderInit3453515942e444a26be0d4b35ca72189::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 190a80636..88fa16270 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38 +class ComposerAutoloaderInit3453515942e444a26be0d4b35ca72189 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit3453515942e444a26be0d4b35ca72189', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit3453515942e444a26be0d4b35ca72189', '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\ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit3453515942e444a26be0d4b35ca72189::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit3453515942e444a26be0d4b35ca72189::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiredb024538c33c9c5891bc8d9e71a6cd38($fileIdentifier, $file); + composerRequire3453515942e444a26be0d4b35ca72189($fileIdentifier, $file); } return $loader; } } -function composerRequiredb024538c33c9c5891bc8d9e71a6cd38($fileIdentifier, $file) +function composerRequire3453515942e444a26be0d4b35ca72189($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 e3fcf6d88..a737d6d38 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38 +class ComposerStaticInit3453515942e444a26be0d4b35ca72189 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -321,9 +321,9 @@ class ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit3453515942e444a26be0d4b35ca72189::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit3453515942e444a26be0d4b35ca72189::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit3453515942e444a26be0d4b35ca72189::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 92b8daf98..ba12bce8d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -177,17 +177,17 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.20", - "version_normalized": "3.4.20.0", + "version": "v3.4.21", + "version_normalized": "3.4.21.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "2cf5aa084338c1f67166013aebe87e2026bbe953" + "reference": "8a10e36ffd04c0c551051594952304d34ecece71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2cf5aa084338c1f67166013aebe87e2026bbe953", - "reference": "2cf5aa084338c1f67166013aebe87e2026bbe953", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/8a10e36ffd04c0c551051594952304d34ecece71", + "reference": "8a10e36ffd04c0c551051594952304d34ecece71", "shasum": "", "mirrors": [ { @@ -199,7 +199,7 @@ "require": { "php": "^5.5.9|>=7.0.8" }, - "time": "2018-11-11T19:48:54+00:00", + "time": "2019-01-01T13:45:19+00:00", "type": "library", "extra": { "branch-alias": { @@ -239,17 +239,17 @@ }, { "name": "topthink/framework", - "version": "v5.1.32", - "version_normalized": "5.1.32.0", + "version": "v5.1.33", + "version_normalized": "5.1.33.0", "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "88a2ab625b35e047896718db320e08375cf021da" + "reference": "477e1cef91290a36398ecbcdffcec7268d80f0dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/88a2ab625b35e047896718db320e08375cf021da", - "reference": "88a2ab625b35e047896718db320e08375cf021da", + "url": "https://api.github.com/repos/top-think/framework/zipball/477e1cef91290a36398ecbcdffcec7268d80f0dd", + "reference": "477e1cef91290a36398ecbcdffcec7268d80f0dd", "shasum": "", "mirrors": [ { @@ -271,7 +271,7 @@ "sebastian/phpcpd": "2.*", "squizlabs/php_codesniffer": "2.*" }, - "time": "2018-12-23T13:42:11+00:00", + "time": "2019-01-16T06:10:52+00:00", "type": "think-framework", "installation-source": "dist", "notification-url": "https://packagist.org/downloads/", @@ -448,12 +448,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "9e117202873a3219b978eba6bac4c3c40b5cbc3c" + "reference": "def818b7df403c7a00a5070a722e531161f68835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/9e117202873a3219b978eba6bac4c3c40b5cbc3c", - "reference": "9e117202873a3219b978eba6bac4c3c40b5cbc3c", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/def818b7df403c7a00a5070a722e531161f68835", + "reference": "def818b7df403c7a00a5070a722e531161f68835", "shasum": "", "mirrors": [ { @@ -468,7 +468,7 @@ "ext-openssl": "*", "php": ">=5.4" }, - "time": "2018-12-19T07:58:04+00:00", + "time": "2019-01-12T11:40:04+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/symfony/options-resolver/LICENSE b/vendor/symfony/options-resolver/LICENSE index 21d7fb9e2..a677f4376 100644 --- a/vendor/symfony/options-resolver/LICENSE +++ b/vendor/symfony/options-resolver/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2018 Fabien Potencier +Copyright (c) 2004-2019 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/zoujingli/wechat-developer/AliPay/Bill.php b/vendor/zoujingli/wechat-developer/AliPay/Bill.php index 4717197fe..995e90632 100644 --- a/vendor/zoujingli/wechat-developer/AliPay/Bill.php +++ b/vendor/zoujingli/wechat-developer/AliPay/Bill.php @@ -38,6 +38,7 @@ class Bill extends BasicAliPay * @param array $options * @return mixed * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException */ public function apply($options) { diff --git a/vendor/zoujingli/wechat-developer/AliPay/Pos.php b/vendor/zoujingli/wechat-developer/AliPay/Pos.php index b1730829c..800104e13 100644 --- a/vendor/zoujingli/wechat-developer/AliPay/Pos.php +++ b/vendor/zoujingli/wechat-developer/AliPay/Pos.php @@ -39,6 +39,7 @@ class Pos extends BasicAliPay * @param array $options * @return mixed * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException */ public function apply($options) { diff --git a/vendor/zoujingli/wechat-developer/AliPay/Scan.php b/vendor/zoujingli/wechat-developer/AliPay/Scan.php index b86afc1bc..df9973c77 100644 --- a/vendor/zoujingli/wechat-developer/AliPay/Scan.php +++ b/vendor/zoujingli/wechat-developer/AliPay/Scan.php @@ -38,6 +38,7 @@ class Scan extends BasicAliPay * @param array $options * @return mixed * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException */ public function apply($options) { diff --git a/vendor/zoujingli/wechat-developer/AliPay/Transfer.php b/vendor/zoujingli/wechat-developer/AliPay/Transfer.php index 001eaca4e..bb745cf4b 100644 --- a/vendor/zoujingli/wechat-developer/AliPay/Transfer.php +++ b/vendor/zoujingli/wechat-developer/AliPay/Transfer.php @@ -39,6 +39,7 @@ class Transfer extends BasicAliPay * @param array $options * @return mixed * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException */ public function apply($options) { diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicAliPay.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicAliPay.php index cce79b9fd..ec2b6effc 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicAliPay.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicAliPay.php @@ -74,7 +74,7 @@ abstract class BasicAliPay 'charset' => empty($options['charset']) ? 'utf-8' : $options['charset'], 'format' => 'JSON', 'version' => '1.0', - 'sign_type' => 'RSA2', + 'sign_type' => empty($options['sign_type']) ? 'RSA2' : $options['sign_type'], 'timestamp' => date('Y-m-d H:i:s'), ]); if (isset($options['notify_url']) && $options['notify_url'] !== '') { @@ -162,8 +162,14 @@ abstract class BasicAliPay { $content = wordwrap($this->config->get('public_key'), 64, "\n", true); $res = "-----BEGIN PUBLIC KEY-----\n{$content}\n-----END PUBLIC KEY-----"; - if (openssl_verify(json_encode($data, 256), base64_decode($sign), $res, OPENSSL_ALGO_SHA256) !== 1) { - throw new InvalidResponseException('Data signature verification failed.'); + if ($this->options->get('sign_type') === 'RSA2') { + if (openssl_verify(json_encode($data, 256), base64_decode($sign), $res, OPENSSL_ALGO_SHA256) !== 1) { + throw new InvalidResponseException('Data signature verification failed.'); + } + } else { + if (openssl_verify(json_encode($data, 256), base64_decode($sign), $res, OPENSSL_ALGO_SHA1) !== 1) { + throw new InvalidResponseException('Data signature verification failed.'); + } } return $data; } @@ -176,7 +182,11 @@ abstract class BasicAliPay { $content = wordwrap($this->config->get('private_key'), 64, "\n", true); $string = "-----BEGIN RSA PRIVATE KEY-----\n{$content}\n-----END RSA PRIVATE KEY-----"; - openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA256); + if ($this->options->get('sign_type') === 'RSA2') { + openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA256); + } else { + openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA1); + } return base64_encode($sign); } @@ -228,7 +238,9 @@ abstract class BasicAliPay $data[$method]['code'], $data ); } - return $this->verify($data[$method], $data['sign']); + return $data[$method]; + // 去除返回结果签名检查 + // return $this->verify($data[$method], $data['sign']); } /** diff --git a/vendor/zoujingli/wechat-developer/WeChat/Script.php b/vendor/zoujingli/wechat-developer/WeChat/Script.php index 49d040cb9..145e51945 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Script.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Script.php @@ -87,7 +87,7 @@ class Script extends BasicWeChat "timestamp" => $data['timestamp'], "signature" => $this->getSignature($data, 'sha1'), 'jsApiList' => [ - 'updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareWeibo', 'onMenuShareQZone', + 'updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone', 'startRecord', 'stopRecord', 'onVoiceRecordEnd', 'playVoice', 'pauseVoice', 'stopVoice', 'onVoicePlayEnd', 'uploadVoice', 'downloadVoice', 'chooseImage', 'previewImage', 'uploadImage', 'downloadImage', 'translateVoice', 'getNetworkType', 'openLocation', 'getLocation', 'hideOptionMenu', 'showOptionMenu', 'hideMenuItems', 'showMenuItems', 'hideAllNonBaseMenuItem', 'showAllNonBaseMenuItem', diff --git a/vendor/zoujingli/wechat-developer/_test/alipay.php b/vendor/zoujingli/wechat-developer/_test/alipay.php index 468650725..25a7379d3 100644 --- a/vendor/zoujingli/wechat-developer/_test/alipay.php +++ b/vendor/zoujingli/wechat-developer/_test/alipay.php @@ -15,9 +15,11 @@ return [ // 沙箱模式 'debug' => true, + // 签名类型（RSA|RSA2） + 'sign_type' => "RSA2", // 应用ID 'appid' => '2016090900468879', - // 支付宝公钥(1行填写) + // 支付宝公钥(1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制) 'public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB', // 支付宝私钥(1行填写) 'private_key' => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3pbN7esinxgjE8uxXAsccgGNKIq+PR1LteNTFOy0fsete43ObQCrzd9DO0zaUeBUzpIOnxrKxez7QoZROZMYrinttFZ/V5rbObEM9E5AR5Tv/Fr4IBywoS8ZtN16Xb+fZmibfU91yq9O2RYSvscncU2qEYmmaTenM0QlUO80ZKqPsM5JkgCNdcYZTUeHclWeyER3dSImNtlSKiSBSSTHthb11fkudjzdiUXua0NKVWyYuAOoDMcpXbD6NJmYqEA/iZ/AxtQt08pv0Mow581GPB0Uop5+qA2hCV85DpagE94a067sKcRui0rtkJzHem9k7xVL+2RoFm1fv3RnUkMwhAgMBAAECggEAAetkddzxrfc+7jgPylUIGb8pyoOUTC4Vqs/BgZI9xYAJksNT2QKRsFvHPfItNt4Ocqy8h4tnIL3GCU43C564B4p6AcjhE85GiN/O0BudPOKlfuQQ9mqExqMMHuYeQfz0cmzPDTSGMwWiv9v4KBH2pyvkCCAzNF6uG+rvawb4/NNVuiI7C8Ku/wYsamtbgjMZVOFFdScYgIw1BgA99RUU/fWBLMnTQkoyowSRb9eSmEUHjt/WQt+/QgKAT2WmuX4RhaGy0qcQLbNaJNKXdJ+PVhQrSiasINNtqYMa8GsQuuKsk3X8TCg9K6/lowivt5ruhyWcP2sx93zY/LGzIHgHcQKBgQDoZlcs9RWxTdGDdtH8kk0J/r+QtMijNzWI0a+t+ZsWOyd3rw+uM/8O4JTNP4Y98TvvxhJXewITbfiuOIbW1mxh8bnO/fcz7+RXZKgPDeoTeNo717tZFZGBEyUdH9M9Inqvht7+hjVDIMCYBDomYebdk3Xqo4mDBjLRdVNGrhGmVQKBgQDKS/MgTMK8Ktfnu1KzwCbn/FfHTOrp1a1t1wWPv9AW0rJPYeaP6lOkgIoO/1odG9qDDhdB6njqM+mKY5Yr3N94PHamHbwJUCmbkqEunCWpGzgcQZ1Q254xk9D7UKq/XUqW2WDqDq80GQeNial+fBc46yelQzokwdA+JdIFKoyinQKBgQCBems9V/rTAtkk1nFdt6EGXZEbLS3PiXXhGXo4gqV+OEzf6H/i/YMwJb2hsK+5GQrcps0XQihA7PctEb9GOMa/tu5fva0ZmaDtc94SLR1p5d4okyQFGPgtIp594HpPSEN0Qb9BrUJFeRz0VP6U3dzDPGHo7V4yyqRLgIN6EIcy1QKBgAqdh6mHPaTAHspDMyjJiYEc5cJIj/8rPkmIQft0FkhMUB0IRyAALNlyAUyeK61hW8sKvz+vPR8VEEk5xpSQp41YpuU6pDZc5YILZLfca8F+8yfQbZ/jll6Foi694efezl4yE/rUQG9cbOAJfEJt4o4TEOaEK5XoMbRBKc8pl22lAoGARTq0qOr9SStihRAy9a+8wi2WEwL4QHcmOjH7iAuJxy5b5TRDSjlk6h+0dnTItiFlTXdfpO8KhWA8EoSJVBZ1kcACQDFgMIA+VM+yXydtzMotOn21W4stfZ4I6dHFiujMsnKpNYVpQh3oCrJf4SeXiQDdiSCodqb1HlKkEc6naHQ=',