zx 6 years ago
parent
commit
9847ba431b

+ 6 - 2
FCS.Common/Helper/CommonHelper.cs

@@ -300,8 +300,12 @@ namespace FCS.Common
             Stopwatch sw = new Stopwatch();
             sw.Start();
             var ip = model.IP.IsEmpty() ? GetIp() : model.IP;
-            var httpItem = Mapper<HttpItem>(model);
-            httpItem.WebProxy = new WebProxy(ip);
+            var httpItem = new HttpItem();
+            lock (locker)
+            {
+                httpItem=Mapper<HttpItem>(model);
+                httpItem.WebProxy = new WebProxy(ip);
+            }
             var html = new HttpHelper().GetHtml(httpItem);
             //对文本的检查
             while ((model.IsCheckEmpty && html.Html.IsEmpty())

+ 6 - 1
FCS.Crawler/Content/Jobs/FootJobs/ZCLotteryGrouping/GroupingJob.cs

@@ -129,7 +129,12 @@ namespace FCS.Crawler.ZCLotteryGrouping
                     }
                 }));
             });
-            Task.WaitAll(taskList.ToArray());
+
+            while (true)
+            {
+                if (CommonHelper.ThreadsFinsh())
+                    break;
+            }
             var data = new List<F_Grouping>();
             var groupList = services.Query<F_Grouping>(" AND Season LIKE '{0}%' ".FormatMe(DateTime.Now.Year));//数据库的数据