Merge branch 'master' of http://www.scserverddns.top:13000/sc/ForwardingServerUI
This commit is contained in:
commit
c3f574d5cf
1 file changed
+6
-1
@@ -124,7 +124,11 @@ namespace ForwardingServerUI.Class
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Personm deserializedPerson = JsonSerializer.Deserialize<Personm>(DAT)!;
|
string trimmedDat = DAT.Trim();
|
||||||
|
if (!string.IsNullOrEmpty(trimmedDat) &&
|
||||||
|
(trimmedDat[0] == '{' || trimmedDat[0] == '['))
|
||||||
|
{
|
||||||
|
Personm deserializedPerson = JsonSerializer.Deserialize<Personm>(trimmedDat)!;
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
Application.Current.Dispatcher.Invoke(() =>
|
||||||
{
|
{
|
||||||
var mach = MainWindowViewModel._machineTable.Select("Enterprise='" + deserializedPerson.SERVEREnterprise +
|
var mach = MainWindowViewModel._machineTable.Select("Enterprise='" + deserializedPerson.SERVEREnterprise +
|
||||||
@@ -150,6 +154,7 @@ namespace ForwardingServerUI.Class
|
|||||||
deserializedPerson.SERVERMachineName, DateTime.Now.ToString(), deserializedPerson.MachineVer);
|
deserializedPerson.SERVERMachineName, DateTime.Now.ToString(), deserializedPerson.MachineVer);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
Console.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + " LINK ID " + client.Id + " IP " + client.IP + "]\nDATA =" + DAT);
|
Console.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + " LINK ID " + client.Id + " IP " + client.IP + "]\nDATA =" + DAT);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user