From d7609de7f6ad530ac98a94ccb84476a018feab7f Mon Sep 17 00:00:00 2001
From: milimoe <110188673+milimoe@users.noreply.github.com>
Date: Wed, 17 May 2023 11:07:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0DataRequest=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=20(#22)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add DataRequest Result Table

* Delete Unused ConcurrentQueue
---
 Api/Transmittal/DataRequest.cs | 16 ++++------------
 Library/Constant/TypeEnum.cs   |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Api/Transmittal/DataRequest.cs b/Api/Transmittal/DataRequest.cs
index 7fb4e84..86c5f22 100644
--- a/Api/Transmittal/DataRequest.cs
+++ b/Api/Transmittal/DataRequest.cs
@@ -8,7 +8,6 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
 {
     public class DataRequest
     {
-        private static readonly ConcurrentQueue<Request> Queue = new();
         private readonly Request Worker;
 
         public DataRequest(Socket Socket, DataRequestType RequestType)
@@ -23,11 +22,7 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
 
         public async Task SendRequest()
         {
-            Queue.AddAsync(Worker);
-            if (await Worker.SendRequest() == RequestResult.Success)
-            {
-                Queue.Delete();
-            }
+            await Worker.SendRequest();
         }
 
         public object? this[string key] => Worker.ResultData[key];
@@ -45,11 +40,12 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
         private class Request : BaseModel
         {
             public Hashtable RequestData { get; } = new();
-            public Hashtable ResultData { get; } = new();
+            public Hashtable ResultData => _Result;
 
             private bool JobFinish = false;
             private readonly Socket? Socket;
             private readonly DataRequestType RequestType;
+            private Hashtable _Result = new();
 
             public async Task<RequestResult> SendRequest()
             {
@@ -88,11 +84,7 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
                     if (type == RequestType)
                     {
                         Dispose();
-                        switch (RequestType)
-                        {
-                            default:
-                                break;
-                        }
+                        _Result = SocketObject.GetParam<Hashtable>(1) ?? new();
                         JobFinish = true;
                     }
                 }
diff --git a/Library/Constant/TypeEnum.cs b/Library/Constant/TypeEnum.cs
index 45f460d..65b63af 100644
--- a/Library/Constant/TypeEnum.cs
+++ b/Library/Constant/TypeEnum.cs
@@ -78,7 +78,7 @@
 
     public enum DataRequestType
     {
-
+        UnKnown
     }
 
     public enum SocketRuntimeType