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

UserClass/AsyncTcpClient.cs

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