diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml
index 0a10638..870337e 100644
--- a/Host/Views/Product/ReBuyIndex.cshtml
+++ b/Host/Views/Product/ReBuyIndex.cshtml
@@ -385,19 +385,17 @@
@defaultProduct.Name
@foreach (var str in defaultProduct.ContentLine)
{
@str
- }
-
+ }
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient5Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient5Service.cs
index e359a3f..a557bd2 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient5Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient5Service.cs
@@ -11,11 +11,13 @@ using System.Diagnostics;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.IO;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Text;
using System.Security.Cryptography;
+
namespace Hncore.Pass.Vpn.Service
{
//先锋
@@ -277,9 +279,8 @@ namespace Hncore.Pass.Vpn.Service
///
public override async Task>> OnLine(string account)
{
- var retData = new List();
- var password = "FyEomeyZ7P8pK3QQ5RcjVw==";
+ var password = "FyEomeyZ7P8pK3QQ5RcjVw==";
var url = "http://webapi.shenlongip.com/searchvpn/links?username=admin1&password="+password+"&vpnAccount="+account;
@@ -290,33 +291,30 @@ namespace Hncore.Pass.Vpn.Service
JObject jo = (JObject)JsonConvert.DeserializeObject(content);
var status = jo["code"].ToString();
+ var retData = new List();
if (status =="0")
{
if(jo.ContainsKey("data")){
- foreach (var tr in jo["data"])
+ foreach (var tr in jo["data"][0][account]["clients"])
{
- JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson());
-
var trData = new OriginAccountOnlineModel
{
Account = account,
- ServerIP = jsondata["clients"]["outIp"].ToString(),
+ ServerIP = "",
LoginTime = "",
OnlineTime = "",
- LoginIP = jsondata["clients"]["userIp"].ToString(),
+ LoginIP = "",
UpStream = "",
DownStream = "",
- Id = account,
-
+ Id= account,
};
-
retData.Add(trData);
}
}
return new ApiResult>(retData);
} else {
- return new ApiResult>();
+ return new ApiResult>(retData);
}
}