change(internal): 调整银联插件文件夹结构 (#923)

yansongda · Jan 6, 2024 · 3e097ba · 3e097ba
1 parent 4857dc9
commit 3e097ba
Show file tree

Hide file tree

Showing 55 changed files with 140 additions and 139 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - change(internal): 将 `call()` 方法重命名为 `shortcut()`(#914)
 - change(internal): `mergeCommonPlugins` 不再作为 `AbstractProvider` 的方法(#918)
 - change(internal): `AbstractProvider` 默认使用 `HttpClientFactoryInterface` 创建 http client(#921)
+- change(internal): 调整 银联 插件文件夹结构(#923)
 
 ## v3.5.3
 

diff --git a/...ugin/Unipay/AddPayloadSignaturePlugin.php → ...Unipay/Open/AddPayloadSignaturePlugin.php b/...ugin/Unipay/AddPayloadSignaturePlugin.php → ...Unipay/Open/AddPayloadSignaturePlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay;
+namespace Yansongda\Pay\Plugin\Unipay\Open;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/CallbackPlugin.php → src/Plugin/Unipay/Open/CallbackPlugin.php b/src/Plugin/Unipay/CallbackPlugin.php → src/Plugin/Unipay/Open/CallbackPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay;
+namespace Yansongda\Pay\Plugin\Unipay\Open;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/H5/PayPlugin.php → src/Plugin/Unipay/Open/Pay/H5/PayPlugin.php b/src/Plugin/Unipay/Pay/H5/PayPlugin.php → src/Plugin/Unipay/Open/Pay/H5/PayPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\H5;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\H5;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/...Plugin/Unipay/Pay/QrCode/CancelPlugin.php → ...n/Unipay/Open/Pay/QrCode/CancelPlugin.php b/...Plugin/Unipay/Pay/QrCode/CancelPlugin.php → ...n/Unipay/Open/Pay/QrCode/CancelPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/QrCode/PosPlugin.php → ...ugin/Unipay/Open/Pay/QrCode/PosPlugin.php b/src/Plugin/Unipay/Pay/QrCode/PosPlugin.php → ...ugin/Unipay/Open/Pay/QrCode/PosPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/...in/Unipay/Pay/QrCode/PosPreAuthPlugin.php → ...ipay/Open/Pay/QrCode/PosPreAuthPlugin.php b/...in/Unipay/Pay/QrCode/PosPreAuthPlugin.php → ...ipay/Open/Pay/QrCode/PosPreAuthPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/QrCode/QueryPlugin.php → ...in/Unipay/Open/Pay/QrCode/QueryPlugin.php b/src/Plugin/Unipay/Pay/QrCode/QueryPlugin.php → ...in/Unipay/Open/Pay/QrCode/QueryPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/...Plugin/Unipay/Pay/QrCode/RefundPlugin.php → ...n/Unipay/Open/Pay/QrCode/RefundPlugin.php b/...Plugin/Unipay/Pay/QrCode/RefundPlugin.php → ...n/Unipay/Open/Pay/QrCode/RefundPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/...lugin/Unipay/Pay/QrCode/ScanFeePlugin.php → .../Unipay/Open/Pay/QrCode/ScanFeePlugin.php b/...lugin/Unipay/Pay/QrCode/ScanFeePlugin.php → .../Unipay/Open/Pay/QrCode/ScanFeePlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/QrCode/ScanPlugin.php → ...gin/Unipay/Open/Pay/QrCode/ScanPlugin.php b/src/Plugin/Unipay/Pay/QrCode/ScanPlugin.php → ...gin/Unipay/Open/Pay/QrCode/ScanPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/...n/Unipay/Pay/QrCode/ScanPreAuthPlugin.php → ...pay/Open/Pay/QrCode/ScanPreAuthPlugin.php b/...n/Unipay/Pay/QrCode/ScanPreAuthPlugin.php → ...pay/Open/Pay/QrCode/ScanPreAuthPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/.../Unipay/Pay/QrCode/ScanPreOrderPlugin.php → ...ay/Open/Pay/QrCode/ScanPreOrderPlugin.php b/.../Unipay/Pay/QrCode/ScanPreOrderPlugin.php → ...ay/Open/Pay/QrCode/ScanPreOrderPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/Web/CancelPlugin.php → ...ugin/Unipay/Open/Pay/Web/CancelPlugin.php b/src/Plugin/Unipay/Pay/Web/CancelPlugin.php → ...ugin/Unipay/Open/Pay/Web/CancelPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\Web;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/Web/PayPlugin.php → src/Plugin/Unipay/Open/Pay/Web/PayPlugin.php b/src/Plugin/Unipay/Pay/Web/PayPlugin.php → src/Plugin/Unipay/Open/Pay/Web/PayPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\Web;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/Web/QueryPlugin.php → ...lugin/Unipay/Open/Pay/Web/QueryPlugin.php b/src/Plugin/Unipay/Pay/Web/QueryPlugin.php → ...lugin/Unipay/Open/Pay/Web/QueryPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\Web;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/Pay/Web/RefundPlugin.php → ...ugin/Unipay/Open/Pay/Web/RefundPlugin.php b/src/Plugin/Unipay/Pay/Web/RefundPlugin.php → ...ugin/Unipay/Open/Pay/Web/RefundPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Plugin\Unipay\Open\Pay\Web;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Plugin/Unipay/ResponseHtmlPlugin.php → ...Plugin/Unipay/Open/ResponseHtmlPlugin.php b/src/Plugin/Unipay/ResponseHtmlPlugin.php → ...Plugin/Unipay/Open/ResponseHtmlPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay;
+namespace Yansongda\Pay\Plugin\Unipay\Open;
 
 use Closure;
 use GuzzleHttp\Psr7\Response;

diff --git a/src/Plugin/Unipay/StartPlugin.php → src/Plugin/Unipay/Open/StartPlugin.php b/src/Plugin/Unipay/StartPlugin.php → src/Plugin/Unipay/Open/StartPlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay;
+namespace Yansongda\Pay\Plugin\Unipay\Open;
 
 use Closure;
 use Yansongda\Pay\Contract\ConfigInterface;

diff --git a/src/Plugin/Unipay/VerifySignaturePlugin.php → ...gin/Unipay/Open/VerifySignaturePlugin.php b/src/Plugin/Unipay/VerifySignaturePlugin.php → ...gin/Unipay/Open/VerifySignaturePlugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Unipay;
+namespace Yansongda\Pay\Plugin\Unipay\Open;
 
 use Closure;
 use Yansongda\Pay\Contract\PluginInterface;

diff --git a/src/Provider/Unipay.php b/src/Provider/Unipay.php
@@ -17,11 +17,11 @@
 use Yansongda\Pay\Pay;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\CallbackPlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\CallbackPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Supports\Collection;
 use Yansongda\Supports\Str;

diff --git a/src/Shortcut/Unipay/CancelShortcut.php b/src/Shortcut/Unipay/CancelShortcut.php
@@ -9,16 +9,16 @@
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\CancelPlugin as QrCodeCancelPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\CancelPlugin as webCancelPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\CancelPlugin as QrCodeCancelPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\CancelPlugin as webCancelPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\AddPayloadSignaturePlugin as QraAddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\Pos\CancelPlugin as QraPosCancelQueryPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\StartPlugin as QraStartPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\VerifySignaturePlugin as QraVerifySignaturePlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
 use Yansongda\Supports\Str;
 
 class CancelShortcut implements ShortcutInterface

diff --git a/src/Shortcut/Unipay/H5Shortcut.php b/src/Shortcut/Unipay/H5Shortcut.php
@@ -7,11 +7,11 @@
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\H5\PayPlugin;
-use Yansongda\Pay\Plugin\Unipay\ResponseHtmlPlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\H5\PayPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\ResponseHtmlPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
 
 class H5Shortcut implements ShortcutInterface
 {

diff --git a/src/Shortcut/Unipay/PosShortcut.php b/src/Shortcut/Unipay/PosShortcut.php
@@ -9,16 +9,16 @@
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\PosPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\PosPreAuthPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\PosPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\PosPreAuthPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\AddPayloadSignaturePlugin as QraAddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\Pos\PayPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\StartPlugin as QraStartPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\VerifySignaturePlugin as QraVerifySignaturePlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
 use Yansongda\Supports\Str;
 
 class PosShortcut implements ShortcutInterface

diff --git a/src/Shortcut/Unipay/QueryShortcut.php b/src/Shortcut/Unipay/QueryShortcut.php
@@ -9,17 +9,17 @@
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\QueryPlugin as QrCodeQueryPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\QueryPlugin as WebQueryPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\QueryPlugin as QrCodeQueryPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\QueryPlugin as WebQueryPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\AddPayloadSignaturePlugin as QraAddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\Pos\QueryPlugin as QraPosQueryPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\Pos\QueryRefundPlugin as QraPosQueryRefundPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\StartPlugin as QraStartPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\VerifySignaturePlugin as QraVerifySignaturePlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
 use Yansongda\Supports\Str;
 
 class QueryShortcut implements ShortcutInterface

diff --git a/src/Shortcut/Unipay/RefundShortcut.php b/src/Shortcut/Unipay/RefundShortcut.php
@@ -9,16 +9,16 @@
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\RefundPlugin as QrCodeRefundPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\RefundPlugin as OnlineGatewayRefundPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\RefundPlugin as QrCodeRefundPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\RefundPlugin as OnlineGatewayRefundPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\AddPayloadSignaturePlugin as QraAddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\Pos\RefundPlugin as QraPosRefundPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\StartPlugin as QraStartPlugin;
 use Yansongda\Pay\Plugin\Unipay\Qra\VerifySignaturePlugin as QraVerifySignaturePlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
 use Yansongda\Supports\Str;
 
 class RefundShortcut implements ShortcutInterface

diff --git a/src/Shortcut/Unipay/ScanShortcut.php b/src/Shortcut/Unipay/ScanShortcut.php
@@ -9,14 +9,14 @@
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanFeePlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanPreAuthPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanPreOrderPlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanFeePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanPreAuthPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanPreOrderPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Supports\Str;
 
 class ScanShortcut implements ShortcutInterface

diff --git a/src/Shortcut/Unipay/WebShortcut.php b/src/Shortcut/Unipay/WebShortcut.php
@@ -7,11 +7,11 @@
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Unipay\AddPayloadBodyPlugin;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
 use Yansongda\Pay\Plugin\Unipay\AddRadarPlugin;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\PayPlugin;
-use Yansongda\Pay\Plugin\Unipay\ResponseHtmlPlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\PayPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\ResponseHtmlPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
 
 class WebShortcut implements ShortcutInterface
 {

diff --git a/.../Unipay/AddPayloadSignaturePluginTest.php → ...ay/Open/AddPayloadSignaturePluginTest.php b/.../Unipay/AddPayloadSignaturePluginTest.php → ...ay/Open/AddPayloadSignaturePluginTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
-use Yansongda\Pay\Plugin\Unipay\AddPayloadSignaturePlugin;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 use Yansongda\Supports\Collection;

diff --git a/tests/Plugin/Unipay/CallbackPluginTest.php → ...Plugin/Unipay/Open/CallbackPluginTest.php b/tests/Plugin/Unipay/CallbackPluginTest.php → ...Plugin/Unipay/Open/CallbackPluginTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open;
 
-use Yansongda\Pay\Plugin\Unipay\CallbackPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\CallbackPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 

diff --git a/...s/Plugin/Unipay/Pay/Web/PayPluginTest.php → ...ugin/Unipay/Open/Pay/H5/PayPluginTest.php b/...s/Plugin/Unipay/Pay/Web/PayPluginTest.php → ...ugin/Unipay/Open/Pay/H5/PayPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\H5;
 
 use Yansongda\Pay\Direction\ResponseDirection;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\PayPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\H5\PayPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
@@ -40,8 +40,8 @@ public function testNormalParams()
             'signature' => '',
             'bizType' => '2',
             'accessType' => '1',
-            'merId' => '777290058167151',
             'currencyCode' => '156',
+            'merId' => '777290058167151',
             'channelType' => '5',
             'signMethod' => '01',
             'txnType' => '3',
@@ -68,8 +68,8 @@ public function testNormal()
             'signature' => '',
             'bizType' => '000201',
             'accessType' => '0',
-            'merId' => '777290058167151',
             'currencyCode' => '156',
+            'merId' => '777290058167151',
             'channelType' => '07',
             'signMethod' => '01',
             'txnType' => '01',