diff --git a/EX/SunlightAggregationManager.db b/EX/SunlightAggregationManager.db new file mode 100644 index 0000000..8343562 Binary files /dev/null and b/EX/SunlightAggregationManager.db differ diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 81d64ec..33faa8e 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/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>'" + - s_ + "' and Time<'" + e_ + "'", null)?.Tables[0] ?? new DataTable(); + "select * from Notification WHERE Groups='" + groups + "' and Id>'" + + s_ + "'", null)?.Tables[0] ?? new DataTable(); if(resultTable.Rows.Count==0) resultTable.Rows.Add(); //格式化返回信息 diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 6bd8623..a6c4dfc 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/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();