From 58f7436358436071c7ed9b1802e12228c8a60b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Tue, 23 Apr 2024 15:46:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E9=94=8B=E5=9C=A8=E7=BA=BF=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views/Product/ReBuyIndex.cshtml          | 14 ++++++-------
 .../Service/AgentClient5Service.cs            | 20 +++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

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 @@
     <div class="container bg_taocan">
         <div class="row" style="background:url(/img/products.png) no-repeat;   background-size:100% 100%;">
             <div class="col-lg-4" style="height:200px;padding-top:30px;padding-left:50px;">
-                <p class="productName">@defaultProduct.Name</p>               
-            </div>
+                <p class="productName">@defaultProduct.Name</p>   
+                <a asp-action="index" asp-controller="product">
+                    <button type="button" class="btn btn-warning">购买通道</button>
+                </a>            
+            </div>      
             <div class="col-lg-8" style="height:200px;padding-top:30px;">
                 <p>@defaultProduct.Name</p>
                 @foreach (var str in defaultProduct.ContentLine)
                 {
                     <p style="font-size: 14px;margin:0;">@str</p>
-                }           
-            <div class="row" style="text-align: right;   position: absolute; left: -100px; bottom: 30px;">
-                <a asp-action="index" asp-controller="product">
-                    <button type="button" class="btn btn-warning">购买通道</button>
-                </a>
-            </div>
+                }     
             </div>
         </div>
     </div> 
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
         /// <returns></returns>
         public override async Task<ApiResult<List<OriginAccountOnlineModel>>> OnLine(string account)
         {
-            var retData = new List<OriginAccountOnlineModel>();
 
-           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<OriginAccountOnlineModel>();
 
             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<List<OriginAccountOnlineModel>>(retData);
             } else {
-                return new ApiResult<List<OriginAccountOnlineModel>>();
+                return new ApiResult<List<OriginAccountOnlineModel>>(retData);
             }
 
         }