mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-10 10:27:21 +08:00
parent 5e73e0c256
commit 0b9d39e021
9 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -48,7 +48,7 @@
"next/var-dumper": "^0.1.0", "next/var-dumper": "^0.1.0",
"w7corp/easywechat": "^6.8", "w7corp/easywechat": "^6.8",
"hyperf/pimple": "~2.2.0", "hyperf/pimple": "~2.2.0",
"yansongda/pay": "~3.7.2" "yansongda/pay": "~3.7.3"
}, },
"suggest": { "suggest": {
"ext-event": "For better performance. " "ext-event": "For better performance. "

22
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "54ec10329f088dfe05e624f080cc0e60", "content-hash": "b985d5bd8942750003fe2a54df074341",
"packages": [ "packages": [
{ {
"name": "aliyuncs/oss-sdk-php", "name": "aliyuncs/oss-sdk-php",
@ -6240,16 +6240,16 @@
}, },
{ {
"name": "webman/console", "name": "webman/console",
"version": "v1.3.7", "version": "v1.3.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/webman-php/console.git", "url": "https://github.com/webman-php/console.git",
"reference": "598dce52e54839e3ea6f483ef97b10c96bbec341" "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webman-php/console/zipball/598dce52e54839e3ea6f483ef97b10c96bbec341", "url": "https://api.github.com/repos/webman-php/console/zipball/9e866344882601cbdefe76b44e6b61532c7fb98e",
"reference": "598dce52e54839e3ea6f483ef97b10c96bbec341", "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6289,7 +6289,7 @@
"source": "https://github.com/webman-php/console", "source": "https://github.com/webman-php/console",
"wiki": "http://www.workerman.net/doc/webman" "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", "name": "webman/log",
@ -6615,16 +6615,16 @@
}, },
{ {
"name": "yansongda/pay", "name": "yansongda/pay",
"version": "v3.7.2", "version": "v3.7.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/yansongda/pay.git", "url": "https://github.com/yansongda/pay.git",
"reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028" "reference": "747806ee09caa53702b87d6a805c84f072898e1a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/yansongda/pay/zipball/722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", "url": "https://api.github.com/repos/yansongda/pay/zipball/747806ee09caa53702b87d6a805c84f072898e1a",
"reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", "reference": "747806ee09caa53702b87d6a805c84f072898e1a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6683,7 +6683,7 @@
"issues": "https://github.com/yansongda/pay/issues", "issues": "https://github.com/yansongda/pay/issues",
"source": "https://github.com/yansongda/pay" "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", "name": "yansongda/supports",

2
vendor/composer/autoload_psr4.php vendored
View File

@ -74,7 +74,7 @@ return array(
'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'), 'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
'Laravel\\SerializableClosure\\' => array($vendorDir . '/laravel/serializable-closure/src'), 'Laravel\\SerializableClosure\\' => array($vendorDir . '/laravel/serializable-closure/src'),
'Invoker\\' => array($vendorDir . '/php-di/invoker/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\\Redis\\' => array($vendorDir . '/illuminate/redis'),
'Illuminate\\Contracts\\' => array($vendorDir . '/illuminate/contracts'), 'Illuminate\\Contracts\\' => array($vendorDir . '/illuminate/contracts'),
'Hyperf\\Pimple\\' => array($vendorDir . '/hyperf/pimple/src'), 'Hyperf\\Pimple\\' => array($vendorDir . '/hyperf/pimple/src'),

4
vendor/composer/autoload_static.php vendored
View File

@ -490,9 +490,9 @@ class ComposerStaticInit738295d764b0a7e25449d6502fca73ac
), ),
'Illuminate\\Support\\' => 'Illuminate\\Support\\' =>
array ( array (
0 => __DIR__ . '/..' . '/illuminate/macroable', 0 => __DIR__ . '/..' . '/illuminate/collections',
1 => __DIR__ . '/..' . '/illuminate/conditionable', 1 => __DIR__ . '/..' . '/illuminate/conditionable',
2 => __DIR__ . '/..' . '/illuminate/collections', 2 => __DIR__ . '/..' . '/illuminate/macroable',
3 => __DIR__ . '/..' . '/illuminate/support', 3 => __DIR__ . '/..' . '/illuminate/support',
), ),
'Illuminate\\Redis\\' => 'Illuminate\\Redis\\' =>

24
vendor/composer/installed.json vendored
View File

@ -6852,17 +6852,17 @@
}, },
{ {
"name": "webman/console", "name": "webman/console",
"version": "v1.3.7", "version": "v1.3.8",
"version_normalized": "1.3.7.0", "version_normalized": "1.3.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/webman-php/console.git", "url": "https://github.com/webman-php/console.git",
"reference": "598dce52e54839e3ea6f483ef97b10c96bbec341" "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webman-php/console/zipball/598dce52e54839e3ea6f483ef97b10c96bbec341", "url": "https://api.github.com/repos/webman-php/console/zipball/9e866344882601cbdefe76b44e6b61532c7fb98e",
"reference": "598dce52e54839e3ea6f483ef97b10c96bbec341", "reference": "9e866344882601cbdefe76b44e6b61532c7fb98e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6872,7 +6872,7 @@
"require-dev": { "require-dev": {
"workerman/webman": "^1.0" "workerman/webman": "^1.0"
}, },
"time": "2024-05-07T08:58:27+00:00", "time": "2024-05-08T03:31:43+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -7278,17 +7278,17 @@
}, },
{ {
"name": "yansongda/pay", "name": "yansongda/pay",
"version": "v3.7.2", "version": "v3.7.3",
"version_normalized": "3.7.2.0", "version_normalized": "3.7.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/yansongda/pay.git", "url": "https://github.com/yansongda/pay.git",
"reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028" "reference": "747806ee09caa53702b87d6a805c84f072898e1a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/yansongda/pay/zipball/722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", "url": "https://api.github.com/repos/yansongda/pay/zipball/747806ee09caa53702b87d6a805c84f072898e1a",
"reference": "722ffdcd5c9f6dae81ff12f840651b1e5a5b3028", "reference": "747806ee09caa53702b87d6a805c84f072898e1a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7317,7 +7317,7 @@
"symfony/psr-http-message-bridge": "^2.1", "symfony/psr-http-message-bridge": "^2.1",
"symfony/var-dumper": "^5.1" "symfony/var-dumper": "^5.1"
}, },
"time": "2024-04-28T14:03:16+00:00", "time": "2024-05-08T15:13:04+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

24
vendor/composer/installed.php vendored
View File

@ -1,9 +1,9 @@
<?php return array( <?php return array(
'root' => array( 'root' => array(
'name' => 'workerman/webman', 'name' => 'workerman/webman',
'pretty_version' => 'dev-master', 'pretty_version' => '1.0.0+no-version-set',
'version' => 'dev-master', 'version' => '1.0.0.0',
'reference' => '9a0e3b05783f87ac3e9cf894b2c73fad7bb282bc', 'reference' => null,
'type' => 'project', 'type' => 'project',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
@ -912,9 +912,9 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'webman/console' => array( 'webman/console' => array(
'pretty_version' => 'v1.3.7', 'pretty_version' => 'v1.3.8',
'version' => '1.3.7.0', 'version' => '1.3.8.0',
'reference' => '598dce52e54839e3ea6f483ef97b10c96bbec341', 'reference' => '9e866344882601cbdefe76b44e6b61532c7fb98e',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../webman/console', 'install_path' => __DIR__ . '/../webman/console',
'aliases' => array(), 'aliases' => array(),
@ -948,9 +948,9 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'workerman/webman' => array( 'workerman/webman' => array(
'pretty_version' => 'dev-master', 'pretty_version' => '1.0.0+no-version-set',
'version' => 'dev-master', 'version' => '1.0.0.0',
'reference' => '9a0e3b05783f87ac3e9cf894b2c73fad7bb282bc', 'reference' => null,
'type' => 'project', 'type' => 'project',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
@ -984,9 +984,9 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'yansongda/pay' => array( 'yansongda/pay' => array(
'pretty_version' => 'v3.7.2', 'pretty_version' => 'v3.7.3',
'version' => '3.7.2.0', 'version' => '3.7.3.0',
'reference' => '722ffdcd5c9f6dae81ff12f840651b1e5a5b3028', 'reference' => '747806ee09caa53702b87d6a805c84f072898e1a',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../yansongda/pay', 'install_path' => __DIR__ . '/../yansongda/pay',
'aliases' => array(), 'aliases' => array(),

2
vendor/webman/console/src/Commands/AppPluginCreateCommand.php vendored
View File

@ -312,7 +312,7 @@ class Install
return; return;
} }
\$installSql = file_get_contents(\$installSqlFile); \$installSql = file_get_contents(\$installSqlFile);
preg_match_all('/CREATE TABLE `(.+?)` \(/si', \$installSql, \$matches); preg_match_all('/CREATE TABLE `(.+?)`/si', \$installSql, \$matches);
\$dropSql = ''; \$dropSql = '';
foreach (\$matches[1] as \$table) { foreach (\$matches[1] as \$table) {
\$dropSql .= "DROP TABLE IF EXISTS `\$table`;\\n"; \$dropSql .= "DROP TABLE IF EXISTS `\$table`;\\n";

6
vendor/yansongda/pay/CHANGELOG.md vendored
View File

@ -1,3 +1,9 @@
## v3.7.3
### fixed
- fix: 修复商家转账参数缺失的问题(#977)
## v3.7.2 ## v3.7.2
### added ### added

3
vendor/yansongda/pay/src/Plugin/Wechat/V3/Marketing/Transfer/CreatePlugin.php vendored
View File

@ -90,10 +90,11 @@ class CreatePlugin implements PluginInterface
*/ */
protected function encryptSensitiveData(array $params, array $config, Collection $payload): array 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); $data['_serial_no'] = get_wechat_serial_no($params);
$publicKey = get_wechat_public_key($config, $data['_serial_no']); $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'])) { if (!empty($list['user_name'])) {
$data['transfer_detail_list'][$key]['user_name'] = encrypt_wechat_contents($list['user_name'], $publicKey); $data['transfer_detail_list'][$key]['user_name'] = encrypt_wechat_contents($list['user_name'], $publicKey);
} }