diff --git a/composer.json b/composer.json index ab2baf5..bb1c52b 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "next/var-dumper": "^0.1.0", "w7corp/easywechat": "^6.8", "hyperf/pimple": "~2.2.0", - "yansongda/pay": "~3.7.2" + "yansongda/pay": "~3.7.3" }, "suggest": { "ext-event": "For better performance. " diff --git a/composer.lock b/composer.lock index a02dfc4..9b5e309 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "54ec10329f088dfe05e624f080cc0e60", + "content-hash": "b985d5bd8942750003fe2a54df074341", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -6240,16 +6240,16 @@ }, { "name": "webman/console", - "version": "v1.3.7", + "version": "v1.3.8", "source": { "type": "git", "url": "https://github.com/webman-php/console.git", - "reference": "598dce52e54839e3ea6f483ef97b10c96bbec341" + "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webman-php/console/zipball/598dce52e54839e3ea6f483ef97b10c96bbec341", - "reference": "598dce52e54839e3ea6f483ef97b10c96bbec341", + "url": "https://api.github.com/repos/webman-php/console/zipball/9e866344882601cbdefe76b44e6b61532c7fb98e", + "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e", "shasum": "" }, "require": { @@ -6289,7 +6289,7 @@ "source": "https://github.com/webman-php/console", "wiki": "http://www.workerman.net/doc/webman" }, - "time": "2024-05-07T08:58:27+00:00" + "time": "2024-05-08T03:31:43+00:00" }, { "name": "webman/log", @@ -6615,16 +6615,16 @@ }, { "name": "yansongda/pay", - "version": "v3.7.2", + "version": "v3.7.3", "source": { "type": "git", "url": "https://github.com/yansongda/pay.git", - "reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028" + "reference": "747806ee09caa53702b87d6a805c84f072898e1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yansongda/pay/zipball/722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", - "reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", + "url": "https://api.github.com/repos/yansongda/pay/zipball/747806ee09caa53702b87d6a805c84f072898e1a", + "reference": "747806ee09caa53702b87d6a805c84f072898e1a", "shasum": "" }, "require": { @@ -6683,7 +6683,7 @@ "issues": "https://github.com/yansongda/pay/issues", "source": "https://github.com/yansongda/pay" }, - "time": "2024-04-28T14:03:16+00:00" + "time": "2024-05-08T15:13:04+00:00" }, { "name": "yansongda/supports", diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index dbfebbf..6dd8fe6 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -74,7 +74,7 @@ return array( 'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'), 'Laravel\\SerializableClosure\\' => array($vendorDir . '/laravel/serializable-closure/src'), 'Invoker\\' => array($vendorDir . '/php-di/invoker/src'), - 'Illuminate\\Support\\' => array($vendorDir . '/illuminate/macroable', $vendorDir . '/illuminate/conditionable', $vendorDir . '/illuminate/collections', $vendorDir . '/illuminate/support'), + 'Illuminate\\Support\\' => array($vendorDir . '/illuminate/collections', $vendorDir . '/illuminate/conditionable', $vendorDir . '/illuminate/macroable', $vendorDir . '/illuminate/support'), 'Illuminate\\Redis\\' => array($vendorDir . '/illuminate/redis'), 'Illuminate\\Contracts\\' => array($vendorDir . '/illuminate/contracts'), 'Hyperf\\Pimple\\' => array($vendorDir . '/hyperf/pimple/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index a5dc345..ac7ce43 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -490,9 +490,9 @@ class ComposerStaticInit738295d764b0a7e25449d6502fca73ac ), 'Illuminate\\Support\\' => array ( - 0 => __DIR__ . '/..' . '/illuminate/macroable', + 0 => __DIR__ . '/..' . '/illuminate/collections', 1 => __DIR__ . '/..' . '/illuminate/conditionable', - 2 => __DIR__ . '/..' . '/illuminate/collections', + 2 => __DIR__ . '/..' . '/illuminate/macroable', 3 => __DIR__ . '/..' . '/illuminate/support', ), 'Illuminate\\Redis\\' => diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ada02c7..6918f36 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -6852,17 +6852,17 @@ }, { "name": "webman/console", - "version": "v1.3.7", - "version_normalized": "1.3.7.0", + "version": "v1.3.8", + "version_normalized": "1.3.8.0", "source": { "type": "git", "url": "https://github.com/webman-php/console.git", - "reference": "598dce52e54839e3ea6f483ef97b10c96bbec341" + "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webman-php/console/zipball/598dce52e54839e3ea6f483ef97b10c96bbec341", - "reference": "598dce52e54839e3ea6f483ef97b10c96bbec341", + "url": "https://api.github.com/repos/webman-php/console/zipball/9e866344882601cbdefe76b44e6b61532c7fb98e", + "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e", "shasum": "" }, "require": { @@ -6872,7 +6872,7 @@ "require-dev": { "workerman/webman": "^1.0" }, - "time": "2024-05-07T08:58:27+00:00", + "time": "2024-05-08T03:31:43+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -7278,17 +7278,17 @@ }, { "name": "yansongda/pay", - "version": "v3.7.2", - "version_normalized": "3.7.2.0", + "version": "v3.7.3", + "version_normalized": "3.7.3.0", "source": { "type": "git", "url": "https://github.com/yansongda/pay.git", - "reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028" + "reference": "747806ee09caa53702b87d6a805c84f072898e1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yansongda/pay/zipball/722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", - "reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", + "url": "https://api.github.com/repos/yansongda/pay/zipball/747806ee09caa53702b87d6a805c84f072898e1a", + "reference": "747806ee09caa53702b87d6a805c84f072898e1a", "shasum": "" }, "require": { @@ -7317,7 +7317,7 @@ "symfony/psr-http-message-bridge": "^2.1", "symfony/var-dumper": "^5.1" }, - "time": "2024-04-28T14:03:16+00:00", + "time": "2024-05-08T15:13:04+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index fb8753a..43d4142 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'workerman/webman', - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'reference' => '9a0e3b05783f87ac3e9cf894b2c73fad7bb282bc', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -912,9 +912,9 @@ 'dev_requirement' => false, ), 'webman/console' => array( - 'pretty_version' => 'v1.3.7', - 'version' => '1.3.7.0', - 'reference' => '598dce52e54839e3ea6f483ef97b10c96bbec341', + 'pretty_version' => 'v1.3.8', + 'version' => '1.3.8.0', + 'reference' => '9e866344882601cbdefe76b44e6b61532c7fb98e', 'type' => 'library', 'install_path' => __DIR__ . '/../webman/console', 'aliases' => array(), @@ -948,9 +948,9 @@ 'dev_requirement' => false, ), 'workerman/webman' => array( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'reference' => '9a0e3b05783f87ac3e9cf894b2c73fad7bb282bc', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -984,9 +984,9 @@ 'dev_requirement' => false, ), 'yansongda/pay' => array( - 'pretty_version' => 'v3.7.2', - 'version' => '3.7.2.0', - 'reference' => '722ffdcd5c9f6dae81ff12f840651b1e5a5b3028', + 'pretty_version' => 'v3.7.3', + 'version' => '3.7.3.0', + 'reference' => '747806ee09caa53702b87d6a805c84f072898e1a', 'type' => 'library', 'install_path' => __DIR__ . '/../yansongda/pay', 'aliases' => array(), diff --git a/vendor/webman/console/src/Commands/AppPluginCreateCommand.php b/vendor/webman/console/src/Commands/AppPluginCreateCommand.php index 3a4ade7..d1b2508 100644 --- a/vendor/webman/console/src/Commands/AppPluginCreateCommand.php +++ b/vendor/webman/console/src/Commands/AppPluginCreateCommand.php @@ -312,7 +312,7 @@ class Install return; } \$installSql = file_get_contents(\$installSqlFile); - preg_match_all('/CREATE TABLE `(.+?)` \(/si', \$installSql, \$matches); + preg_match_all('/CREATE TABLE `(.+?)`/si', \$installSql, \$matches); \$dropSql = ''; foreach (\$matches[1] as \$table) { \$dropSql .= "DROP TABLE IF EXISTS `\$table`;\\n"; diff --git a/vendor/yansongda/pay/CHANGELOG.md b/vendor/yansongda/pay/CHANGELOG.md index 3d72088..460ff17 100644 --- a/vendor/yansongda/pay/CHANGELOG.md +++ b/vendor/yansongda/pay/CHANGELOG.md @@ -1,3 +1,9 @@ +## v3.7.3 + +### fixed + +- fix: 修复商家转账参数缺失的问题(#977) + ## v3.7.2 ### added diff --git a/vendor/yansongda/pay/src/Plugin/Wechat/V3/Marketing/Transfer/CreatePlugin.php b/vendor/yansongda/pay/src/Plugin/Wechat/V3/Marketing/Transfer/CreatePlugin.php index af21365..655df14 100644 --- a/vendor/yansongda/pay/src/Plugin/Wechat/V3/Marketing/Transfer/CreatePlugin.php +++ b/vendor/yansongda/pay/src/Plugin/Wechat/V3/Marketing/Transfer/CreatePlugin.php @@ -90,10 +90,11 @@ class CreatePlugin implements PluginInterface */ protected function encryptSensitiveData(array $params, array $config, Collection $payload): array { + $data['transfer_detail_list'] = $payload->get('transfer_detail_list', []); $data['_serial_no'] = get_wechat_serial_no($params); $publicKey = get_wechat_public_key($config, $data['_serial_no']); - foreach ($payload->get('transfer_detail_list', []) as $key => $list) { + foreach ($data['transfer_detail_list'] as $key => $list) { if (!empty($list['user_name'])) { $data['transfer_detail_list'][$key]['user_name'] = encrypt_wechat_contents($list['user_name'], $publicKey); }