diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03793787a..f8e8f9551 100644
--- 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/src/Plugin/Unipay/AddPayloadSignaturePlugin.php b/src/Plugin/Unipay/Open/AddPayloadSignaturePlugin.php
similarity index 97%
rename from src/Plugin/Unipay/AddPayloadSignaturePlugin.php
rename to src/Plugin/Unipay/Open/AddPayloadSignaturePlugin.php
index efd425278..a8eeb0172 100644
--- a/src/Plugin/Unipay/AddPayloadSignaturePlugin.php
+++ b/src/Plugin/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 b/src/Plugin/Unipay/Open/CallbackPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/CallbackPlugin.php
rename to src/Plugin/Unipay/Open/CallbackPlugin.php
index 7403f08ac..c9a735761 100644
--- a/src/Plugin/Unipay/CallbackPlugin.php
+++ b/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 b/src/Plugin/Unipay/Open/Pay/H5/PayPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/H5/PayPlugin.php
rename to src/Plugin/Unipay/Open/Pay/H5/PayPlugin.php
index cd1242a4f..510a23d74 100644
--- a/src/Plugin/Unipay/Pay/H5/PayPlugin.php
+++ b/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/src/Plugin/Unipay/Pay/QrCode/CancelPlugin.php b/src/Plugin/Unipay/Open/Pay/QrCode/CancelPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/CancelPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/CancelPlugin.php
index a7c65cb74..5983df476 100644
--- a/src/Plugin/Unipay/Pay/QrCode/CancelPlugin.php
+++ b/src/Plugin/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 b/src/Plugin/Unipay/Open/Pay/QrCode/PosPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/PosPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/PosPlugin.php
index e887b819c..0944a182d 100644
--- a/src/Plugin/Unipay/Pay/QrCode/PosPlugin.php
+++ b/src/Plugin/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/src/Plugin/Unipay/Pay/QrCode/PosPreAuthPlugin.php b/src/Plugin/Unipay/Open/Pay/QrCode/PosPreAuthPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/PosPreAuthPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/PosPreAuthPlugin.php
index 2bb922b4d..5f6b5bb90 100644
--- a/src/Plugin/Unipay/Pay/QrCode/PosPreAuthPlugin.php
+++ b/src/Plugin/Unipay/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 b/src/Plugin/Unipay/Open/Pay/QrCode/QueryPlugin.php
similarity index 96%
rename from src/Plugin/Unipay/Pay/QrCode/QueryPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/QueryPlugin.php
index e870ecdf0..b8a6692a7 100644
--- a/src/Plugin/Unipay/Pay/QrCode/QueryPlugin.php
+++ b/src/Plugin/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/src/Plugin/Unipay/Pay/QrCode/RefundPlugin.php b/src/Plugin/Unipay/Open/Pay/QrCode/RefundPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/RefundPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/RefundPlugin.php
index 29786662b..83e94f1d7 100644
--- a/src/Plugin/Unipay/Pay/QrCode/RefundPlugin.php
+++ b/src/Plugin/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/src/Plugin/Unipay/Pay/QrCode/ScanFeePlugin.php b/src/Plugin/Unipay/Open/Pay/QrCode/ScanFeePlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/ScanFeePlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/ScanFeePlugin.php
index e15c93a51..f6089e314 100644
--- a/src/Plugin/Unipay/Pay/QrCode/ScanFeePlugin.php
+++ b/src/Plugin/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 b/src/Plugin/Unipay/Open/Pay/QrCode/ScanPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/ScanPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/ScanPlugin.php
index bf4eb7a22..99970866d 100644
--- a/src/Plugin/Unipay/Pay/QrCode/ScanPlugin.php
+++ b/src/Plugin/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/src/Plugin/Unipay/Pay/QrCode/ScanPreAuthPlugin.php b/src/Plugin/Unipay/Open/Pay/QrCode/ScanPreAuthPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/ScanPreAuthPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/ScanPreAuthPlugin.php
index fce92d971..afd9363c5 100644
--- a/src/Plugin/Unipay/Pay/QrCode/ScanPreAuthPlugin.php
+++ b/src/Plugin/Unipay/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/src/Plugin/Unipay/Pay/QrCode/ScanPreOrderPlugin.php b/src/Plugin/Unipay/Open/Pay/QrCode/ScanPreOrderPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/QrCode/ScanPreOrderPlugin.php
rename to src/Plugin/Unipay/Open/Pay/QrCode/ScanPreOrderPlugin.php
index 5bcb646f3..4c4c9425f 100644
--- a/src/Plugin/Unipay/Pay/QrCode/ScanPreOrderPlugin.php
+++ b/src/Plugin/Unipay/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 b/src/Plugin/Unipay/Open/Pay/Web/CancelPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/Web/CancelPlugin.php
rename to src/Plugin/Unipay/Open/Pay/Web/CancelPlugin.php
index 076f82b11..5accf3051 100644
--- a/src/Plugin/Unipay/Pay/Web/CancelPlugin.php
+++ b/src/Plugin/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 b/src/Plugin/Unipay/Open/Pay/Web/PayPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/Web/PayPlugin.php
rename to src/Plugin/Unipay/Open/Pay/Web/PayPlugin.php
index 7dbfeecaa..58ac16165 100644
--- a/src/Plugin/Unipay/Pay/Web/PayPlugin.php
+++ b/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 b/src/Plugin/Unipay/Open/Pay/Web/QueryPlugin.php
similarity index 96%
rename from src/Plugin/Unipay/Pay/Web/QueryPlugin.php
rename to src/Plugin/Unipay/Open/Pay/Web/QueryPlugin.php
index 7a1f3a9a8..e13e4df05 100644
--- a/src/Plugin/Unipay/Pay/Web/QueryPlugin.php
+++ b/src/Plugin/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 b/src/Plugin/Unipay/Open/Pay/Web/RefundPlugin.php
similarity index 97%
rename from src/Plugin/Unipay/Pay/Web/RefundPlugin.php
rename to src/Plugin/Unipay/Open/Pay/Web/RefundPlugin.php
index 83958e081..8e8a41ffa 100644
--- a/src/Plugin/Unipay/Pay/Web/RefundPlugin.php
+++ b/src/Plugin/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 b/src/Plugin/Unipay/Open/ResponseHtmlPlugin.php
similarity index 96%
rename from src/Plugin/Unipay/ResponseHtmlPlugin.php
rename to src/Plugin/Unipay/Open/ResponseHtmlPlugin.php
index d8c99e24e..6e46e30fc 100644
--- a/src/Plugin/Unipay/ResponseHtmlPlugin.php
+++ b/src/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 b/src/Plugin/Unipay/Open/StartPlugin.php
similarity index 98%
rename from src/Plugin/Unipay/StartPlugin.php
rename to src/Plugin/Unipay/Open/StartPlugin.php
index 98a17556c..6702dd1ca 100644
--- a/src/Plugin/Unipay/StartPlugin.php
+++ b/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 b/src/Plugin/Unipay/Open/VerifySignaturePlugin.php
similarity index 97%
rename from src/Plugin/Unipay/VerifySignaturePlugin.php
rename to src/Plugin/Unipay/Open/VerifySignaturePlugin.php
index 6e1ad83ad..780cbee6c 100644
--- a/src/Plugin/Unipay/VerifySignaturePlugin.php
+++ b/src/Plugin/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
index aa0883627..fe4d8812c 100644
--- 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
index eb3ee40e7..53e09cda1 100644
--- 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
index e10e6bf38..968824dbb 100644
--- 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
index ea5153157..6cd265438 100644
--- 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
index 0d0afe194..e18e0b99c 100644
--- 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
index 0e4440ec3..ad170aaec 100644
--- 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
index 3a08cd0c1..8dc5d38fa 100644
--- 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
index fbf598f6c..88aecf5b2 100644
--- 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/tests/Plugin/Unipay/AddPayloadSignaturePluginTest.php b/tests/Plugin/Unipay/Open/AddPayloadSignaturePluginTest.php
similarity index 95%
rename from tests/Plugin/Unipay/AddPayloadSignaturePluginTest.php
rename to tests/Plugin/Unipay/Open/AddPayloadSignaturePluginTest.php
index 625ffd316..124b13546 100644
--- a/tests/Plugin/Unipay/AddPayloadSignaturePluginTest.php
+++ b/tests/Plugin/Unipay/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 b/tests/Plugin/Unipay/Open/CallbackPluginTest.php
similarity index 98%
rename from tests/Plugin/Unipay/CallbackPluginTest.php
rename to tests/Plugin/Unipay/Open/CallbackPluginTest.php
index e9f974268..a4c5dc410 100644
--- a/tests/Plugin/Unipay/CallbackPluginTest.php
+++ b/tests/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/tests/Plugin/Unipay/Pay/Web/PayPluginTest.php b/tests/Plugin/Unipay/Open/Pay/H5/PayPluginTest.php
similarity index 95%
rename from tests/Plugin/Unipay/Pay/Web/PayPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/H5/PayPluginTest.php
index 62293c010..ebe339983 100644
--- a/tests/Plugin/Unipay/Pay/Web/PayPluginTest.php
+++ b/tests/Plugin/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',
diff --git a/tests/Plugin/Unipay/Pay/QrCode/CancelPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/CancelPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/CancelPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/CancelPluginTest.php
index 6285eccdc..a77510d0f 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/CancelPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/CancelPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\CancelPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\CancelPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/PosPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/PosPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/PosPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/PosPluginTest.php
index bf0963a55..d65785e7f 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/PosPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/PosPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\PosPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\PosPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/PosPreAuthPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/PosPreAuthPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/PosPreAuthPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/PosPreAuthPluginTest.php
index 1e1c40fd2..4d2c325e1 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/PosPreAuthPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/PosPreAuthPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\PosPreAuthPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\PosPreAuthPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/QueryPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/QueryPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/QueryPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/QueryPluginTest.php
index 339d85cb9..afca9bc30 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/QueryPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/QueryPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\QueryPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\QueryPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/RefundPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/RefundPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/RefundPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/RefundPluginTest.php
index 04fcdd6ad..bc07a3495 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/RefundPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/RefundPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\RefundPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\RefundPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/ScanFeePluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanFeePluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/ScanFeePluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/ScanFeePluginTest.php
index 63cf780b7..39729a4ef 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/ScanFeePluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanFeePluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanFeePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanFeePlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/ScanPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/ScanPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/ScanPluginTest.php
index 2ffcd52b7..816f87f46 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/ScanPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/ScanPreAuthPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanPreAuthPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/ScanPreAuthPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/ScanPreAuthPluginTest.php
index 5be6c522a..f1ebe2d10 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/ScanPreAuthPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanPreAuthPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanPreAuthPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanPreAuthPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/QrCode/ScanPreOrderPluginTest.php b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanPreOrderPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/QrCode/ScanPreOrderPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/QrCode/ScanPreOrderPluginTest.php
index 8e0ffa66a..2560a3396 100644
--- a/tests/Plugin/Unipay/Pay/QrCode/ScanPreOrderPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/QrCode/ScanPreOrderPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\QrCode;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\QrCode;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\QrCode\ScanPreOrderPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\QrCode\ScanPreOrderPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/Web/CancelPluginTest.php b/tests/Plugin/Unipay/Open/Pay/Web/CancelPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/Web/CancelPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/Web/CancelPluginTest.php
index 1db8ac5db..e0be0dc68 100644
--- a/tests/Plugin/Unipay/Pay/Web/CancelPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/Web/CancelPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\Web;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\CancelPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\CancelPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/H5/PayPluginTest.php b/tests/Plugin/Unipay/Open/Pay/Web/PayPluginTest.php
similarity index 95%
rename from tests/Plugin/Unipay/Pay/H5/PayPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/Web/PayPluginTest.php
index 74b7f9976..71c6402f1 100644
--- a/tests/Plugin/Unipay/Pay/H5/PayPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/Web/PayPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\H5;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\Web;
 
 use Yansongda\Pay\Direction\ResponseDirection;
-use Yansongda\Pay\Plugin\Unipay\Pay\H5\PayPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\PayPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
@@ -40,8 +40,8 @@ public function testNormalParams()
             'signature' => '',
             'bizType' => '2',
             'accessType' => '1',
-            'currencyCode' => '156',
             'merId' => '777290058167151',
+            'currencyCode' => '156',
             'channelType' => '5',
             'signMethod' => '01',
             'txnType' => '3',
@@ -68,8 +68,8 @@ public function testNormal()
             'signature' => '',
             'bizType' => '000201',
             'accessType' => '0',
-            'currencyCode' => '156',
             'merId' => '777290058167151',
+            'currencyCode' => '156',
             'channelType' => '07',
             'signMethod' => '01',
             'txnType' => '01',
diff --git a/tests/Plugin/Unipay/Pay/Web/QueryPluginTest.php b/tests/Plugin/Unipay/Open/Pay/Web/QueryPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/Web/QueryPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/Web/QueryPluginTest.php
index 064f5ebd1..b5bad1c50 100644
--- a/tests/Plugin/Unipay/Pay/Web/QueryPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/Web/QueryPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\Web;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\QueryPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\QueryPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/Pay/Web/RefundPluginTest.php b/tests/Plugin/Unipay/Open/Pay/Web/RefundPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/Pay/Web/RefundPluginTest.php
rename to tests/Plugin/Unipay/Open/Pay/Web/RefundPluginTest.php
index 5aa543692..6e91e2240 100644
--- a/tests/Plugin/Unipay/Pay/Web/RefundPluginTest.php
+++ b/tests/Plugin/Unipay/Open/Pay/Web/RefundPluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay\Pay\Web;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open\Pay\Web;
 
 use Yansongda\Pay\Packer\QueryPacker;
-use Yansongda\Pay\Plugin\Unipay\Pay\Web\RefundPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\Pay\Web\RefundPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Plugin/Unipay/ResponseHtmlPluginTest.php b/tests/Plugin/Unipay/Open/ResponseHtmlPluginTest.php
similarity index 93%
rename from tests/Plugin/Unipay/ResponseHtmlPluginTest.php
rename to tests/Plugin/Unipay/Open/ResponseHtmlPluginTest.php
index 6e8111210..c3d90f5be 100644
--- a/tests/Plugin/Unipay/ResponseHtmlPluginTest.php
+++ b/tests/Plugin/Unipay/Open/ResponseHtmlPluginTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open;
 
 use GuzzleHttp\Psr7\Request;
 use Psr\Http\Message\ResponseInterface;
-use Yansongda\Pay\Plugin\Unipay\ResponseHtmlPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\ResponseHtmlPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 use Yansongda\Supports\Collection;
diff --git a/tests/Plugin/Unipay/StartPluginTest.php b/tests/Plugin/Unipay/Open/StartPluginTest.php
similarity index 94%
rename from tests/Plugin/Unipay/StartPluginTest.php
rename to tests/Plugin/Unipay/Open/StartPluginTest.php
index 051b1cd81..ab5731970 100644
--- a/tests/Plugin/Unipay/StartPluginTest.php
+++ b/tests/Plugin/Unipay/Open/StartPluginTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open;
 
 use Yansongda\Pay\Contract\ConfigInterface;
 use Yansongda\Pay\Pay;
-use Yansongda\Pay\Plugin\Unipay\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 use function Yansongda\Pay\get_unipay_config;
diff --git a/tests/Plugin/Unipay/VerifySignaturePluginTest.php b/tests/Plugin/Unipay/Open/VerifySignaturePluginTest.php
similarity index 97%
rename from tests/Plugin/Unipay/VerifySignaturePluginTest.php
rename to tests/Plugin/Unipay/Open/VerifySignaturePluginTest.php
index 2d1c09ab4..ec63e5ed9 100644
--- a/tests/Plugin/Unipay/VerifySignaturePluginTest.php
+++ b/tests/Plugin/Unipay/Open/VerifySignaturePluginTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Unipay;
+namespace Yansongda\Pay\Tests\Plugin\Unipay\Open;
 
 use Yansongda\Pay\Direction\NoHttpRequestDirection;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 use Yansongda\Supports\Collection;
diff --git a/tests/Provider/UnipayTest.php b/tests/Provider/UnipayTest.php
index ef336aef6..fc9c10c96 100644
--- a/tests/Provider/UnipayTest.php
+++ b/tests/Provider/UnipayTest.php
@@ -13,10 +13,10 @@
 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\StartPlugin;
-use Yansongda\Pay\Plugin\Unipay\VerifySignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\AddPayloadSignaturePlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\StartPlugin;
+use Yansongda\Pay\Plugin\Unipay\Open\VerifySignaturePlugin;
 use Yansongda\Pay\Tests\Stubs\Plugin\FooPluginStub;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Shortcut/Unipay/CancelShortcutTest.php b/tests/Shortcut/Unipay/CancelShortcutTest.php
index 439c4818e..9c92e27ad 100644
--- a/tests/Shortcut/Unipay/CancelShortcutTest.php
+++ b/tests/Shortcut/Unipay/CancelShortcutTest.php
@@ -8,16 +8,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 OnlineGatewayCancelPlugin;
+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 OnlineGatewayCancelPlugin;
+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\Pay\Shortcut\Unipay\CancelShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Shortcut/Unipay/H5ShortcutTest.php b/tests/Shortcut/Unipay/H5ShortcutTest.php
index 0590d312c..e0ebfce89 100644
--- a/tests/Shortcut/Unipay/H5ShortcutTest.php
+++ b/tests/Shortcut/Unipay/H5ShortcutTest.php
@@ -6,11 +6,11 @@
 
 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;
 use Yansongda\Pay\Shortcut\Unipay\H5Shortcut;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Shortcut/Unipay/PosShortcutTest.php b/tests/Shortcut/Unipay/PosShortcutTest.php
index fd8bca4c6..a6bc40932 100644
--- a/tests/Shortcut/Unipay/PosShortcutTest.php
+++ b/tests/Shortcut/Unipay/PosShortcutTest.php
@@ -8,16 +8,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\Pay\Shortcut\Unipay\PosShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Shortcut/Unipay/QueryShortcutTest.php b/tests/Shortcut/Unipay/QueryShortcutTest.php
index f56562c3a..946ef9bd4 100644
--- a/tests/Shortcut/Unipay/QueryShortcutTest.php
+++ b/tests/Shortcut/Unipay/QueryShortcutTest.php
@@ -8,17 +8,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 OnlineGatewayQueryPlugin;
+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 OnlineGatewayQueryPlugin;
+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\Pay\Shortcut\Unipay\QueryShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Shortcut/Unipay/RefundShortcutTest.php b/tests/Shortcut/Unipay/RefundShortcutTest.php
index 4a6600cdc..42f53f873 100644
--- a/tests/Shortcut/Unipay/RefundShortcutTest.php
+++ b/tests/Shortcut/Unipay/RefundShortcutTest.php
@@ -7,16 +7,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\Pay\Shortcut\Unipay\RefundShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Shortcut/Unipay/ScanShortcutTest.php b/tests/Shortcut/Unipay/ScanShortcutTest.php
index 748df2cc5..2cd778142 100644
--- a/tests/Shortcut/Unipay/ScanShortcutTest.php
+++ b/tests/Shortcut/Unipay/ScanShortcutTest.php
@@ -8,14 +8,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\Pay\Shortcut\Unipay\ScanShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
diff --git a/tests/Shortcut/Unipay/WebShortcutTest.php b/tests/Shortcut/Unipay/WebShortcutTest.php
index e96e017f3..7344b3de8 100644
--- a/tests/Shortcut/Unipay/WebShortcutTest.php
+++ b/tests/Shortcut/Unipay/WebShortcutTest.php
@@ -6,11 +6,11 @@
 
 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;
 use Yansongda\Pay\Shortcut\Unipay\WebShortcut;
 use Yansongda\Pay\Tests\TestCase;