add post parse, update to 0.6.6

botuniverse · Jul 28, 2023 · 38c24c9 · 38c24c9
1 parent 05ab0da
commit 38c24c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/OneBot/Driver/Swoole/TopEventListener.php b/src/OneBot/Driver/Swoole/TopEventListener.php
@@ -96,6 +96,7 @@ public function onRequest(array $config, Request $request, Response $response)
         $req = $req->withQueryParams($request->get ?? [])
             ->withCookieParams($request->cookie ?? []);
         $uploaded = [];
+        // 上传的文件
         if (!empty($request->files)) {
             foreach ($request->files as $key => $value) {
                 $upload = new UploadedFile([
@@ -108,6 +109,10 @@ public function onRequest(array $config, Request $request, Response $response)
                 $req = $req->withUploadedFiles($uploaded);
             }
         }
+        // post 包体
+        if (!empty($request->post)) {
+            $req = $req->withParsedBody($request->post);
+        }
         $event = new HttpRequestEvent($req);
         try {
             $event->setSocketConfig($config);

diff --git a/src/OneBot/Driver/Workerman/TopEventListener.php b/src/OneBot/Driver/Workerman/TopEventListener.php
@@ -166,6 +166,7 @@ public function onHttpRequest(array $config, TcpConnection $connection, Request
         );
         $req = $req->withQueryParams($request->get() ?? [])
             ->withCookieParams($request->cookie() ?? []);
+        // 解析文件
         if (!empty($request->file())) {
             $uploaded = [];
             foreach ($request->file() as $key => $value) {
@@ -179,6 +180,10 @@ public function onHttpRequest(array $config, TcpConnection $connection, Request
                 $req = $req->withUploadedFiles($uploaded);
             }
         }
+        // 解析 post
+        if (!empty($request->post())) {
+            $req = $req->withParsedBody($request->post());
+        }
         $event = new HttpRequestEvent($req);
         $event->setSocketConfig($config);
         $send_callable = function (ResponseInterface $psr_response) use ($connection) {

diff --git a/src/OneBot/global_defines.php b/src/OneBot/global_defines.php
@@ -13,7 +13,7 @@
 use ZM\Logger\ConsoleLogger;
 
 const ONEBOT_VERSION = '12';
-const ONEBOT_LIBOB_VERSION = '0.6.5';
+const ONEBOT_LIBOB_VERSION = '0.6.6';
 
 const ONEBOT_JSON = 1;
 const ONEBOT_MSGPACK = 2;