From bb426fcba9f4dccc0d1aab3d731596ef7d93a6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Sat, 6 Mar 2021 14:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=AD=90=E6=98=9F=E6=98=9F=E8=BF=85?= =?UTF-8?q?=E8=81=94=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/AgentClient10Service.cs | 36 +++++++++-------- .../Service/AgentClient11Service.cs | 36 +++++++++-------- .../Service/AgentClient12Service.cs | 39 +++++++++++-------- 3 files changed, 60 insertions(+), 51 deletions(-) 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); }