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

UserClass/AsyncTcpClient.cs

@@ -264,8 +264,8 @@ namespace SunlightAggregationManager.UserClass
                         "Groups", "User='" + person?.User + "'");
 
                    DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("" +
-                        "select * from Notification WHERE Groups='" + groups + "' and Time>'" +
+                        "select * from Notification WHERE Groups='" + groups + "' and Id>'" +
-                        s_ + "' and Time<'" + e_ + "'", null)?.Tables[0] ?? new DataTable();
+                        s_ + "'", null)?.Tables[0] ?? new DataTable();
                    if(resultTable.Rows.Count==0) resultTable.Rows.Add();
 
                     //格式化返回信息

ViewModel/MainWindowViewModel.cs

@@ -67,7 +67,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");
+            SERVERIP = Configini.IniReadvalue("SERVER", "SERVERIP") + ":7795";
             SERVERNAME = Configini.IniReadvalue("SERVER", "SERVERNAME");
             SERVERUSER = Configini.IniReadvalue("SERVER", "SERVERUSER");
             SERRVERPASWORD = Configini.IniReadvalue("SERVER", "SERRVERPASWORD");
@@ -150,7 +150,7 @@ namespace SunlightAggregationManager.ViewModel
             Console.WriteLine(MachineIP);
             //连接sunlight服务器
             Service.Rows.Add(3, "RUN", "Sunlight_Server_Link");
-            AsyncTcpClient.Configuration(SERVERIP+":7795", SERVERNAME, SERVERUSER, SERRVERPASWORD);
+            AsyncTcpClient.Configuration(SERVERIP, SERVERNAME, SERVERUSER, SERRVERPASWORD);
 
             Service.EndInit();