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

UserClass/AsyncHttpServer.cs

@@ -136,7 +136,7 @@ namespace SunlightAggregationManager.UserClass
                 DataRow? _user = MainWindowViewModel.Selet_Row(MainWindowViewModel._userData, "User='" +
                              deserializedPerson?.User + "' and Password ='" + deserializedPerson?.Password + "'");
 
-                data_.Add("Enterprise", _user?.Field<object>("Enterprise") ?? "");
+                data_.Add("Enterprise",MainWindowViewModel.Enterprise);
                 data_.Add("Department", _user?.Field<object>("Department") ?? "");
                 data_.Add("Groups", _user?.Field<object>("Groups") ?? "");
                 data_.Add("UserId", _user?.Field<object>("UserID") ?? "");

UserClass/AsyncTcpClient.cs

@@ -92,10 +92,11 @@ namespace SunlightAggregationManager.UserClass
 
                 try
                 {
-                    Person? deserializedPerson = JsonSerializer.Deserialize<Person>(mes);
+                    Person? deserializedPerson = JsonSerializer.Deserialize<Person>(mes);                   
+                    string password= AES.AesDecrypt(deserializedPerson?.Terminal!, deserializedPerson?.Password!);
 
                     var _user = MainWindowViewModel.Selet_Memory(MainWindowViewModel._userData, "State", "User='" +
-                        deserializedPerson?.User + "' and Password ='" + deserializedPerson?.Password + "'");
+                        deserializedPerson?.User + "' and Password ='" + password + "'");
                     if (_user != null)
                     {
                         string _dat = _user?.ToString() ?? "0";
@@ -186,14 +187,14 @@ namespace SunlightAggregationManager.UserClass
                 string Command = "", ret = "";
 
                 Dictionary<string, object> data_ = new Dictionary<string, object>();
-                var deserialized = JsonSerializer.Deserialize<Dictionary<string, object>>(dat)!;
+                var deserialized = JsonSerializer.Deserialize<Dictionary<string, object>>( AES.AesDecrypt(person.Terminal, dat))!;
                 if (deserialized.TryGetValue("Command", out var val) && val != null) Command = val.ToString()!;
                 if (Command == "Log")//回复请求的信息
                 {
                     DataRow? _user = MainWindowViewModel.Selet_Row(MainWindowViewModel._userData, "User='" +
-                                 person?.User + "' and Password ='" + person?.Password + "'");
+                                 person?.User + "'");
 
-                    data_.Add("Enterprise", _user?.Field<object>("Enterprise") ?? "");
+                    data_.Add("Enterprise", MainWindowViewModel.Enterprise);
                     data_.Add("Department", _user?.Field<object>("Department") ?? "");
                     data_.Add("Groups", _user?.Field<object>("Groups") ?? "");
                     data_.Add("UserId", _user?.Field<object>("UserID") ?? "");
@@ -257,7 +258,7 @@ namespace SunlightAggregationManager.UserClass
                 }
                 if (Command == "Notification")//回复Notification请求的信息
                 {
-                    string s_ = deserialized.GetValue("StartTime").ToString()!;
+                    string s_; try { s_ = deserialized.GetValue("StartTime").ToString()!; } catch(Exception) { s_ = "0"; }
                     string e_ = deserialized.GetValue("EndTime").ToString()!;
 
                     var groups = MainWindowViewModel.Selet_Memory(MainWindowViewModel._userData,
@@ -374,8 +375,8 @@ namespace SunlightAggregationManager.UserClass
                     //格式化返回信息
                     ret = JsonSerializer.Serialize(data_);
                 }
-
+                //加密回传
-                person!.Dat = ret.ToString();
+                person!.Dat =AES.AesEncipher( person.Terminal, ret);
                 var jsdat = JsonSerializer.Serialize(person);
                 await tcpClient.SendAsync(jsdat);
             }

ViewModel/MainWindowViewModel.cs

@@ -68,7 +68,7 @@ namespace SunlightAggregationManager.ViewModel
             TCP_E = Configini.IniReadvalue("NETWORK", "TCP");
             HTTP_E = Configini.IniReadvalue("NETWORK", "HTTP");
             TLS_E = Configini.IniReadvalue("NETWORK", "TLS");
-            SERVERIP = Configini.IniReadvalue("SERVER", "SERVERIP") + ":7795";
+            SERVERIP = Configini.IniReadvalue("SERVER", "SERVERIP");
             SERVERNAME = Configini.IniReadvalue("SERVER", "SERVERNAME");
             SERVERUSER = Configini.IniReadvalue("SERVER", "SERVERUSER");
             SERRVERPASWORD = Configini.IniReadvalue("SERVER", "SERRVERPASWORD");
@@ -151,7 +151,7 @@ namespace SunlightAggregationManager.ViewModel
             Console.WriteLine(MachineIP);
             //连接sunlight服务器
             Service.Rows.Add(3, "RUN", "Sunlight_Server_Link");
-            AsyncTcpClient.Configuration(SERVERIP, SERVERNAME, SERVERUSER, SERRVERPASWORD);
+            AsyncTcpClient.Configuration(SERVERIP + ":7795", SERVERNAME, SERVERUSER, SERRVERPASWORD);
 
             Service.EndInit();