Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal
This commit is contained in:
commit
2334555c7b
13 files changed
+206
-41
No files matched your search
+2
-1
@@ -34,6 +34,7 @@ namespace SunlightAggregationTerminal.Models
|
||||
App.GlobalData.Department = dat.Field<string>("Department") ?? "";
|
||||
App.GlobalData.Groups = dat.Field<string>("Groups") ?? "";
|
||||
App.GlobalData.ServerID = dat.Field<string>("ServerID") ?? "";
|
||||
App.GlobalData.ServerHTTP = dat.Field<string>("ServerHTTP") ?? "";
|
||||
App.GlobalData.ProxyID = dat.Field<string>("ProxyID") ?? "";
|
||||
App.GlobalData.LogNo = Convert.ToBoolean(dat.Field<object>("LogNo"));
|
||||
App.GlobalData.LocalAreaNetworkMode = Convert.ToBoolean(dat.Field<object>("LocalAreaNetworkMode"));
|
||||
@@ -83,7 +84,7 @@ namespace SunlightAggregationTerminal.Models
|
||||
else
|
||||
{
|
||||
//http
|
||||
HttpServer.Configuration(App.GlobalData.ServerID,
|
||||
HttpServer.Configuration(App.GlobalData.ServerHTTP,
|
||||
App.GlobalData.User, App.GlobalData.UserPassword,
|
||||
GetAppUniqueId());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user