diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs index f1857c2..8aa78a9 100644 --- a/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs +++ b/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs @@ -367,24 +367,26 @@ namespace Hncore.Pass.Vpn.Service var retData = new List(); if (status =="0") { - foreach (var tr in jo["data"]) - { - JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson()); - - var trData = new OriginAccountOnlineModel + if(jo.ContainsKey("data")){ + foreach (var tr in jo["data"]) { - Account = account, - ServerIP = jsondata["serverip"].ToString(), - LoginTime = jsondata["starttime"].ToString(), - OnlineTime = "", - LoginIP = jsondata["framedip"].ToString(), - UpStream = "", - DownStream = "", - Id= "{account:\""+account+"\",radacctid:\""+jsondata["radacctid"].ToString()+"\"}", - - }; - - retData.Add(trData); + JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson()); + + var trData = new OriginAccountOnlineModel + { + Account = account, + ServerIP = jsondata["serverip"].ToString(), + LoginTime = jsondata["starttime"].ToString(), + OnlineTime = "", + LoginIP = jsondata["framedip"].ToString(), + UpStream = "", + DownStream = "", + Id= "{account:\""+account+"\",radacctid:\""+jsondata["radacctid"].ToString()+"\"}", + + }; + + retData.Add(trData); + } } return new ApiResult>(retData); } diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs index ae29454..a5cd2e1 100644 --- a/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs +++ b/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs @@ -361,24 +361,26 @@ namespace Hncore.Pass.Vpn.Service var retData = new List(); if (status =="0") { - foreach (var tr in jo["data"]) - { - JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson()); - - var trData = new OriginAccountOnlineModel + if(jo.ContainsKey("data")){ + foreach (var tr in jo["data"]) { - Account = account, - ServerIP = jsondata["serverip"].ToString(), - LoginTime = jsondata["starttime"].ToString(), - OnlineTime = "", - LoginIP = jsondata["framedip"].ToString(), - UpStream = "", - DownStream = "", - Id= "{account:\""+account+"\",radacctid:\""+jsondata["radacctid"].ToString()+"\"}", - - }; - - retData.Add(trData); + JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson()); + + var trData = new OriginAccountOnlineModel + { + Account = account, + ServerIP = jsondata["serverip"].ToString(), + LoginTime = jsondata["starttime"].ToString(), + OnlineTime = "", + LoginIP = jsondata["framedip"].ToString(), + UpStream = "", + DownStream = "", + Id= "{account:\""+account+"\",radacctid:\""+jsondata["radacctid"].ToString()+"\"}", + + }; + + retData.Add(trData); + } } return new ApiResult>(retData); } diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs index f06fffa..8ef4432 100644 --- a/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs +++ b/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs @@ -363,28 +363,33 @@ namespace Hncore.Pass.Vpn.Service var resp = await client.GetAsync(url); var content = await resp.Content.ReadAsStringAsync(); JObject jo = (JObject)JsonConvert.DeserializeObject(content); + Console.WriteLine("========================================================================================="); + Console.WriteLine(content); + Console.WriteLine("========================================================================================="); var status = jo["errcode"].ToString(); var retData = new List(); if (status =="0") { - foreach (var tr in jo["data"]) - { - JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson()); - - var trData = new OriginAccountOnlineModel + if(jo.ContainsKey("data")){ + foreach (var tr in jo["data"]) { - Account = account, - ServerIP = jsondata["serverip"].ToString(), - LoginTime = jsondata["starttime"].ToString(), - OnlineTime = "", - LoginIP = jsondata["framedip"].ToString(), - UpStream = "", - DownStream = "", - Id= "{account:\""+account+"\",radacctid:\""+jsondata["radacctid"].ToString()+"\"}", - - }; - - retData.Add(trData); + JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson()); + + var trData = new OriginAccountOnlineModel + { + Account = account, + ServerIP = jsondata["serverip"].ToString(), + LoginTime = jsondata["starttime"].ToString(), + OnlineTime = "", + LoginIP = jsondata["framedip"].ToString(), + UpStream = "", + DownStream = "", + Id= "{account:\""+account+"\",radacctid:\""+jsondata["radacctid"].ToString()+"\"}", + + }; + + retData.Add(trData); + } } return new ApiResult>(retData); }