fix: 修复各模块获取服务端消息时，未能获取最新请求导致解密异常的问题。(#88)

hpyer · Jul 26, 2024 · 4c26a74 · 4c26a74
1 parent 225c205
commit 4c26a74
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/Core/Http/ServerRequest.ts b/src/Core/Http/ServerRequest.ts
@@ -32,6 +32,7 @@ class ServerRequest implements ServerRequestInterface
     .withQueryParams(parse(url, true).query || {});
 
     if (body) {
+      this.parsedBody = {};
       this.withBody(body);
     }
   }

diff --git a/src/OfficialAccount/Server.ts b/src/OfficialAccount/Server.ts
@@ -30,7 +30,7 @@ class Server extends ServerInterface
     let message = await this.getRequestMessage(this.request);
 
     if (this.encryptor && query['msg_signature']) {
-      this.prepend(this.decryptRequestMessage(query));
+      this.prepend(this.decryptRequestMessage());
     }
 
     let response = await this.handle(new Response(200, {}, 'success'), message);
@@ -78,8 +78,9 @@ class Server extends ServerInterface
     return Message.createFromRequest(request || this.request);
   }
 
-  protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message> {
+  protected decryptRequestMessage(): ServerHandlerClosure<Message> {
     return async (message: Message, next: ServerHandlerClosure<Message>) => {
+      let query = this.request.getQueryParams();
       message = await this.decryptMessage(
         message,
         this.encryptor,

diff --git a/src/OpenPlatform/Server.ts b/src/OpenPlatform/Server.ts
@@ -32,7 +32,7 @@ class Server extends ServerInterface
     let message = await this.getRequestMessage(this.request);
 
     if (this.encryptor && query['msg_signature']) {
-      this.prepend(this.decryptRequestMessage(query));
+      this.prepend(this.decryptRequestMessage());
     }
 
     let response = await this.handle(new Response(200, {}, 'success'), message);
@@ -115,8 +115,9 @@ class Server extends ServerInterface
     })
   }
 
-  protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message> {
+  protected decryptRequestMessage(): ServerHandlerClosure<Message> {
     return async (message: Message, next: ServerHandlerClosure<Message>) => {
+      let query = this.request.getQueryParams();
       message = await this.decryptMessage(
         message,
         this.encryptor,

diff --git a/src/OpenWork/Server.ts b/src/OpenWork/Server.ts
@@ -38,7 +38,7 @@ class Server extends ServerInterface
     let message = await this.getRequestMessage(this.request);
 
     if (this.encryptor && query['msg_signature']) {
-      this.prepend(this.decryptRequestMessage(query));
+      this.prepend(this.decryptRequestMessage());
     }
 
     let response = await this.handle(new Response(200, {}, 'success'), message);
@@ -210,8 +210,9 @@ class Server extends ServerInterface
     return Message.createFromRequest(request ?? this.request);
   }
 
-  protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message> {
+  protected decryptRequestMessage(): ServerHandlerClosure<Message> {
     return async (message: Message, next: ServerHandlerClosure<Message>) => {
+      let query = this.request.getQueryParams();
       message = await this.decryptMessage(
         message,
         this.encryptor,

diff --git a/src/Work/Server.ts b/src/Work/Server.ts
@@ -35,7 +35,7 @@ class Server extends ServerInterface
     let message = await this.getRequestMessage(this.request);
 
     if (this.encryptor && query['msg_signature']) {
-      this.prepend(this.decryptRequestMessage(query));
+      this.prepend(this.decryptRequestMessage());
     }
 
     let response = await this.handle(new Response(200, {}, 'SUCCESS'), message);
@@ -185,8 +185,9 @@ class Server extends ServerInterface
     };
   }
 
-  protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure {
+  protected decryptRequestMessage(): ServerHandlerClosure {
     return async (message: Message, next: ServerHandlerClosure) => {
+      let query = this.request.getQueryParams();
       message = await this.decryptMessage(
         message,
         this.encryptor,