sc
/
SunlightAggregationManager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

master
Administrator 2 months ago
parent
9b010a4998 4e6ad0a7dc
commit
480d705255
3 changed files with 31 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      UserClass/AsyncHttpServer.cs
  2. 7
      UserClass/AsyncTcpClient.cs
  3. 15
      UserClass/AsyncTcpServer.cs

31
UserClass/AsyncHttpServer.cs
View File

@ -60,21 +60,22 @@ namespace SunlightAggregationManager.UserClass
if (_dat != "99") if (_dat != "99")
{ {
//行为 //行为
Dictionary<string, object> myDict = new Dictionary<string, object>(); Dictionary<string, object> myDict = new Dictionary<string, object>();
myDict.Add("LinkID", client.Id); myDict.Add("LinkID", client.Id);
myDict.Add("LastLoginIP", deserializedPerson?.IP ?? client.IP); myDict.Add("LastLoginIP", deserializedPerson?.IP ?? client.IP);
myDict.Add("LastActionTime", DateTime.Now); myDict.Add("LastActionTime", DateTime.Now);
myDict.Add("Note", deserializedPerson?.Dat ?? "unknown"); myDict.Add("Note", deserializedPerson?.Dat ?? "unknown");
MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" + deserializedPerson?.User + "'", myDict); MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" + deserializedPerson?.User + "'", myDict);
Console.WriteLine("[Log on]User[" + deserializedPerson?.User + "]Note[" + (deserializedPerson?.Dat ?? "unknown") + "]"); Console.WriteLine("[Log on]User[" + deserializedPerson?.User + "]Note[" + (deserializedPerson?.Dat ?? "unknown") + "]");
var dt = await Command(deserializedPerson!); deserializedPerson!.Dat = await Command(deserializedPerson!);
var jsdat = JsonSerializer.Serialize(deserializedPerson);
e.Context.Response.Headers.Add("SUNLIGHT", "SUNLIGHT");
e.Context.Response.SetStatus(200, "success"); e.Context.Response.Headers.Add("SUNLIGHT", "SUNLIGHT");
e.Context.Response.SetContent(Encoding.UTF8.GetBytes(dt.ToCharArray())); e.Context.Response.SetStatus(200, "success");
await e.Context.Response.AnswerAsync(); e.Context.Response.SetContent(jsdat);
await e.Context.Response.AnswerAsync();
} }
else else
{//停用账号关闭连接 {//停用账号关闭连接

7
UserClass/AsyncTcpClient.cs
View File

@ -44,13 +44,15 @@ namespace SunlightAggregationManager.UserClass
} }
//发送本机信息到转发服务器 //发送本机信息到转发服务器
Dictionary<string, object> myDict = new Dictionary<string, object>(); Dictionary<string, object> myDict = new Dictionary<string, object>();
myDict.Add("Enterprise", MainWindowViewModel.Enterprise); myDict.Add("SERVEREnterprise", MainWindowViewModel.Enterprise);
myDict.Add("MachineName", MainWindowViewModel.MachineName); myDict.Add("SERVERMachineName", MainWindowViewModel.MachineName);
myDict.Add("SERVERNAME", MainWindowViewModel.SERVERNAME); myDict.Add("SERVERNAME", MainWindowViewModel.SERVERNAME);
myDict.Add("SERVERUSER", MainWindowViewModel.SERVERUSER); myDict.Add("SERVERUSER", MainWindowViewModel.SERVERUSER);
myDict.Add("SERRVERPASWORD", MainWindowViewModel.SERRVERPASWORD); myDict.Add("SERRVERPASWORD", MainWindowViewModel.SERRVERPASWORD);
myDict.Add("MachineVer", MainWindowViewModel.MachineVer); myDict.Add("MachineVer", MainWindowViewModel.MachineVer);
TcpTransmit(myDict); TcpTransmit(myDict);
Console.WriteLine("Sunlight_Server_Connected");
return EasyTask.CompletedTask; return EasyTask.CompletedTask;
};//成功连接到服务器 };//成功连接到服务器
tcpClient.Closing = (client, e) => { return EasyTask.CompletedTask; };//即将从服务器断开连接。此处仅主动断开才有效。 tcpClient.Closing = (client, e) => { return EasyTask.CompletedTask; };//即将从服务器断开连接。此处仅主动断开才有效。
@ -62,6 +64,7 @@ namespace SunlightAggregationManager.UserClass
targetRow["Status"] = "Disconnect"; targetRow["Status"] = "Disconnect";
targetRow.EndEdit(); targetRow.EndEdit();
} }
Console.WriteLine("Sunlight_Server_Disconnect");
return EasyTask.CompletedTask; };//从服务器断开连接，当连接不成功时不会触发。 return EasyTask.CompletedTask; };//从服务器断开连接，当连接不成功时不会触发。
#region Tcp客户端使用Received异步委托接收数据 #region Tcp客户端使用Received异步委托接收数据
tcpClient.Received = (client, e) => tcpClient.Received = (client, e) =>

15
UserClass/AsyncTcpServer.cs
View File

@ -5,10 +5,12 @@ using System.Data;
using System.Security.Cryptography.Pkcs; using System.Security.Cryptography.Pkcs;
using System.Text; using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Windows;
using System.Windows.Markup; using System.Windows.Markup;
using System.Xml.Linq; using System.Xml.Linq;
using TouchSocket.Core; using TouchSocket.Core;
using TouchSocket.Sockets; using TouchSocket.Sockets;
using static SunlightAggregationManager.UserClass.AsyncTcpServer;
namespace SunlightAggregationManager.UserClass namespace SunlightAggregationManager.UserClass
{ {
@ -67,7 +69,7 @@ namespace SunlightAggregationManager.UserClass
MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" + deserializedPerson?.User + "'", myDict); MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" + deserializedPerson?.User + "'", myDict);
Console.WriteLine("[Log on]User[" + deserializedPerson?.User + "]Note[" + (deserializedPerson?.Dat ?? "unknown") + "]"); Console.WriteLine("[Log on]User[" + deserializedPerson?.User + "]Note[" + (deserializedPerson?.Dat ?? "unknown") + "]");
Command(deserializedPerson?.Dat ?? "NOT", client.Id); Command(deserializedPerson?.Dat ?? "NOT", client.Id, deserializedPerson!);
} }
else else
{//首次登录记录 {//首次登录记录
@ -94,8 +96,9 @@ namespace SunlightAggregationManager.UserClass
login.Add("UserId", dat?.Field<object>("UserID") ?? ""); login.Add("UserId", dat?.Field<object>("UserID") ?? "");
login.Add("UserName", dat?.Field<object>("Name") ?? ""); login.Add("UserName", dat?.Field<object>("Name") ?? "");
var d = JsonSerializer.Serialize(login); deserializedPerson!.Dat = JsonSerializer.Serialize(login);
client.SendAsync(d); var jsdat = JsonSerializer.Serialize(deserializedPerson);
client.SendAsync(jsdat);
} }
} }
else else
@ -164,7 +167,7 @@ namespace SunlightAggregationManager.UserClass
Console.WriteLine("TCP SERVER:START"); Console.WriteLine("TCP SERVER:START");
} }
public static async void Command(string dat,string id)// public static async void Command(string dat,string id , Person person)//
{ {
string Command="", ret =""; string Command="", ret ="";
@ -215,7 +218,9 @@ namespace SunlightAggregationManager.UserClass
ret = JsonSerializer.Serialize(data_); ret = JsonSerializer.Serialize(data_);
} }
await service.SendAsync(id, ret); person.Dat=ret.ToString();
var jsdat = JsonSerializer.Serialize(person);
await service.SendAsync(id, jsdat);
} }
public static List<Dictionary<string, object?>>? ToList(DataTable table)//datatable转list public static List<Dictionary<string, object?>>? ToList(DataTable table)//datatable转list

Write Preview
Loading…
Cancel
Save