From a0640c1c108761859f7d2d5f09b7e12ba2e1843f Mon Sep 17 00:00:00 2001
From: tone <3341154833@qq.com>
Date: Sat, 12 Oct 2024 22:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20RequestData=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/GetTest.ts                      | 8 ++++----
 src/lib/API/API.ts                      | 5 ++++-
 src/lib/APIMiddleware/MountIP.ts        | 9 +--------
 src/lib/APIMiddleware/MountUserAgent.ts | 9 +--------
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/api/GetTest.ts b/src/api/GetTest.ts
index 0898b2c..b894533 100644
--- a/src/api/GetTest.ts
+++ b/src/api/GetTest.ts
@@ -1,6 +1,6 @@
 import { API, RequestData } from "@lib/API/API";
-import MountIP, { MountIPRequestData } from "@lib/APIMiddleware/MountIP";
-import MountUserAgent, { MountUserAgentRequestDate } from "@lib/APIMiddleware/MountUserAgent";
+import MountIP from "@lib/APIMiddleware/MountIP";
+import MountUserAgent from "@lib/APIMiddleware/MountUserAgent";
 import Unbind from "@lib/APIMiddleware/Unbind";
 import ServerStdResponse from "@lib/ServerResponse/ServerStdResponse";
 import { Response } from "express";
@@ -10,8 +10,8 @@ class GetTest extends API {
         super('GET', '/test', MountIP, MountUserAgent, Unbind);
     }
 
-    public async onRequset(data: MountIPRequestData & MountUserAgentRequestDate, res: Response): Promise<void> {
-        this.logger.info(`request ip: ${data._ip}  useragent: ${data._userAgent}`)
+    public async onRequset(data: RequestData, res: Response): Promise<void> {
+        this.logger.info(`request ip: ${data._ip!}  useragent: ${data._userAgent!}`)
         res.json(ServerStdResponse.OK);
     }
 }
diff --git a/src/lib/API/API.ts b/src/lib/API/API.ts
index c56acbd..9b81f7a 100644
--- a/src/lib/API/API.ts
+++ b/src/lib/API/API.ts
@@ -6,7 +6,10 @@ interface MiddlewareFunction {
 }
 
 interface RequestData {
-    [key: string]: any
+    [key: string]: any;
+    _ip?: string;
+    _userAgent?: string;
+
 }
 
 abstract class API {
diff --git a/src/lib/APIMiddleware/MountIP.ts b/src/lib/APIMiddleware/MountIP.ts
index e4beb1d..d04ddd6 100644
--- a/src/lib/APIMiddleware/MountIP.ts
+++ b/src/lib/APIMiddleware/MountIP.ts
@@ -18,11 +18,4 @@ let MountIP = (req: Request, res: Response, next: NextFunction) => {
     next();
 }
 
-export default MountIP;
-
-
-interface MountIPRequestData extends RequestData {
-    _ip: string;
-} 
-
-export type { MountIPRequestData };
\ No newline at end of file
+export default MountIP;
\ No newline at end of file
diff --git a/src/lib/APIMiddleware/MountUserAgent.ts b/src/lib/APIMiddleware/MountUserAgent.ts
index 0b37747..09e63cf 100644
--- a/src/lib/APIMiddleware/MountUserAgent.ts
+++ b/src/lib/APIMiddleware/MountUserAgent.ts
@@ -10,11 +10,4 @@ let MountUserAgent = (req: Request, res: Response, next: NextFunction) => {
     next();
 }
 
-export default MountUserAgent;
-
-
-interface MountUserAgentRequestDate extends RequestData {
-    _userAgent: string,
-}
-
-export type { MountUserAgentRequestDate };
\ No newline at end of file
+export default MountUserAgent;
\ No newline at end of file