From 3e28d521544dc397afc9c4948dcdc4eedad1c4a4 Mon Sep 17 00:00:00 2001
From: suntao <andysjt@gmail.com>
Date: Mon, 23 Nov 2020 17:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.config                       |  4 ++--
 Hander/MapRecordRankingHander.cs |  8 ++++++--
 Model/MapRouteAndUserQueryVM.cs  | 14 +++++++-------
 Unility/WebService.cs            |  3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/App.config b/App.config
index c121d2d..0e9cc1c 100644
--- a/App.config
+++ b/App.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <appSettings>
-    <add key="Host" value="https://wx.powerfun.com.cn/"/>
-    <add key="Top" value="100"/>
+    <add key="Host" value="http://192.168.0.97:5082/"/>
+    <add key="Top" value="10"/>
     <add key="ShowVirtualUser" value="true"/>
     <add key="Ip" value="192.168.0.97"/>
     <add key="Port" value="11000"/>
diff --git a/Hander/MapRecordRankingHander.cs b/Hander/MapRecordRankingHander.cs
index cd71495..09ed34e 100644
--- a/Hander/MapRecordRankingHander.cs
+++ b/Hander/MapRecordRankingHander.cs
@@ -29,7 +29,7 @@ namespace OnlineUserPool.Hander
             mapRecordRankings = new List<MapRecordRanking>();
             for (int i = 0; i < pageCount; i++)
             {
-                mapRecordRankings.AddRange(WebService.GetRecordFileFromServer(records.Skip(i* pageSize).Take(pageSize).Select(n => n.RankingId).ToList()));
+                mapRecordRankings.AddRange(WebService.GetRecordFileFromServer(records.Skip(i* pageSize).Take(pageSize).Select(n => n.Id).ToList()));
             }
         }
 
@@ -40,6 +40,10 @@ namespace OnlineUserPool.Hander
         public List<MsgModel> GetVirtualUserData()
         {
             List<MsgModel> msgModels = new List<MsgModel>();
+            if(ConfigHelp.ShowVirtualUser  == false)
+            {
+                return msgModels;
+            }
             if (mapRecordRankings != null)
             {
                 for (int i = 0; i < mapRecordRankings.Count; i++)
@@ -106,7 +110,7 @@ namespace OnlineUserPool.Hander
                         //var str = "参数：" + (ConfigHelp.Top - virutalEndCount) + "," + string.Join(",",routeIds) + "\r\n";
                         //str += "服务端返回：" + Newtonsoft.Json.JsonConvert.SerializeObject(randomUser) +"\r\n";
                         //Log.Information(str);
-                        var addRankings = WebService.GetRecordFileFromServer(randomUser.Select(n => n.RankingId).ToList());
+                        var addRankings = WebService.GetRecordFileFromServer(randomUser.Select(n => n.Id).ToList());
                         mapRecordRankings.AddRange(addRankings);
                     }
                 }
diff --git a/Model/MapRouteAndUserQueryVM.cs b/Model/MapRouteAndUserQueryVM.cs
index 60a815e..8cd9d98 100644
--- a/Model/MapRouteAndUserQueryVM.cs
+++ b/Model/MapRouteAndUserQueryVM.cs
@@ -6,21 +6,21 @@ namespace OnlineUserPool.Model
 {
     public class MapRouteAndUserQueryVM
     {
-        public long RowNumber { get; set; }
+        //public long RowNumber { get; set; }
 
         public int RouteId { get; set; }
 
-        public int UserId { get; set; }
+        //public int UserId { get; set; }
 
-        public string DirPath { get; set; }
+        //public string DirPath { get; set; }
 
-        public string NickName { get; set; }
+        //public string NickName { get; set; }
 
-        public string WxHeadImg { get; set; }
+        //public string WxHeadImg { get; set; }
 
-        public int? FTP { get; set; }
+        //public int? FTP { get; set; }
 
-        public string RankingId { get; set; }
+        public long Id { get; set; }
 
         public string ContinueMark { get; set; }
     }
diff --git a/Unility/WebService.cs b/Unility/WebService.cs
index 5195095..1278d6b 100644
--- a/Unility/WebService.cs
+++ b/Unility/WebService.cs
@@ -16,6 +16,7 @@ namespace OnlineUserPool.Unility
         static BaseApi()
         {
             httpClient = new System.Net.Http.HttpClient();
+            httpClient.DefaultRequestHeaders.UserAgent.Add(new System.Net.Http.Headers.ProductInfoHeaderValue("OnlineUserPool", "1.0.0"));
         }
 
         protected static async Task<T> PostAsync<T>(string url, object data)
@@ -47,7 +48,7 @@ namespace OnlineUserPool.Unility
         /// 从服务端获取记录信息
         /// </summary>
         /// <returns></returns>
-        public static List<MapRecordRanking> GetRecordFileFromServer(List<string> id)
+        public static List<MapRecordRanking> GetRecordFileFromServer(List<long> id)
         {
             if (!id.Any())
             {