Merge branch 'master' of http://192.168.0.12:13000/sc/ForwardingServer

AsyncHttpServer.cs

@@ -10,6 +10,7 @@ using TouchSocket.Core;
 using TouchSocket.Http;
 using TouchSocket.Http.WebSockets;
 using TouchSocket.Sockets;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 
 namespace ForwardingServer
@@ -69,7 +70,6 @@ namespace ForwardingServer
                             // using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
 
                             await AsyncTcpServer.service.SendAsync(s_, bodyString);
-                            LogGing.LogGingDATA(bodyString);
 
                             DATA.Person deserializedPerson = JsonSerializer.Deserialize<DATA.Person>(bodyString)!;
 
@@ -111,8 +111,6 @@ namespace ForwardingServer
                     e.Context.Response.SetStatus(200, "success");
                     e.Context.Response.SetContent(Encoding.UTF8.GetBytes(dat.ToCharArray()));
                     await e.Context.Response.AnswerAsync();
-
-                    LogGing.LogGingDATA(dat);
                 }
                 catch (TimeoutException)
                 {

AsyncTcpServer.cs

@@ -67,20 +67,19 @@ namespace ForwardingServer
                                         drEmployee.EndEdit();
                                         drEmployee.AcceptChanges();
                                     }
-
-                                    LogGing.LogGingDATA("[LINK ID " + client.Id + " IP " + client.IP + "]\nDATA =" + DAT);
                                 }
 
                             }
                         }
                         else
                         {
-                            Personm deserializedPerson = JsonSerializer.Deserialize<Personm>(DAT)!;
+                            if (IsValidJson(DAT))
-                            DATA.MachineTable.Rows.Add(client.Id, client.IP, 30, "/" + deserializedPerson.SERVEREnterprise,
+                            {
-                                deserializedPerson.SERVERMachineName, deserializedPerson.MachineVer);
+                                Personm deserializedPerson = JsonSerializer.Deserialize<Personm>(DAT)!;
-                            Console.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-DD HH:mm:ss:fff") + " [LINK ID " + client.Id + " IP " + client.IP + "]\nDATA =" + DAT);
+                                DATA.MachineTable.Rows.Add(client.Id, client.IP, 30, "/" + deserializedPerson.SERVEREnterprise,
-                            LogGing.LogGingDATA("[LINK ID " + client.Id + " IP " + client.IP + "]\nDATA =" + DAT);
+                                    deserializedPerson.SERVERMachineName, deserializedPerson.MachineVer);
-
+                                Console.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-DD HH:mm:ss:fff") + " [LINK ID " + client.Id + " IP " + client.IP + "]\nDATA =" + DAT);
+                            }
                         }
                     }
                 }
@@ -110,7 +109,17 @@ namespace ForwardingServer
             await service.StartAsync();//启动
 
             Console.WriteLine("TcpServer:Run");
-        }  
+        }
-      
+
+        // 辅助方法检查JSON格式
+        private static bool IsValidJson(string jsonString)
+        {
+            if (string.IsNullOrEmpty(jsonString))
+                return false;
+
+            jsonString = jsonString.Trim();
+            return (jsonString.StartsWith("{") && jsonString.EndsWith("}")) ||
+                   (jsonString.StartsWith("[") && jsonString.EndsWith("]"));
+        }
     }      
 }