修正bug

src/Masuit.MyBlogs.Core/Common/CommonHelper.cs

@@ -111,8 +111,7 @@ namespace Masuit.MyBlogs.Core.Common
                 return false;
             }
 
-            return DenyIP.Contains(ip) ||
-                DenyIPRange.AsParallel().Any(kv => kv.Key.StartsWith(ip.Split('.')[0]) && ip.IpAddressInRange(kv.Key, kv.Value));
+            return DenyIP.Contains(ip) || DenyIPRange.AsParallel().Any(kv => kv.Key.StartsWith(ip.Split('.')[0]) && ip.IpAddressInRange(kv.Key, kv.Value));
         }
 
         /// <summary>

src/Masuit.MyBlogs.Core/Controllers/MergeController.cs

@@ -15,6 +15,7 @@ using Masuit.Tools.Strings;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using System;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
@@ -136,7 +137,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         /// <param name="reason"></param>
         /// <returns></returns>
         [HttpPost("reject/{id}")]
-        public async Task<ActionResult> Reject(int id, string reason)
+        public async Task<ActionResult> Reject(int id, [Required(ErrorMessage = "请填写拒绝理由")] string reason)
         {
             var merge = await PostMergeRequestService.GetByIdAsync(id) ?? throw new NotFoundException("待合并文章未找到");
             merge.MergeState = MergeStatus.Reject;

src/Masuit.MyBlogs.Core/Extensions/Hangfire/HangfireBackJob.cs

@@ -17,7 +17,6 @@ using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace Masuit.MyBlogs.Core.Extensions.Hangfire
 {
@@ -179,12 +178,11 @@ namespace Masuit.MyBlogs.Core.Extensions.Hangfire
         /// </summary>
         public void CheckLinks()
         {
-            var links = _linksService.GetQuery(l => !l.Except).AsParallel();
             var client = _httpClientFactory.CreateClient();
             client.DefaultRequestHeaders.UserAgent.Add(ProductInfoHeaderValue.Parse("MasuitBot-link/1.0"));
             client.DefaultRequestHeaders.Referrer = new Uri("https://masuit.com");
             client.Timeout = TimeSpan.FromSeconds(10);
-            Parallel.ForEach(links, link =>
+            _linksService.GetQuery(l => !l.Except).AsParallel().ForAll(link =>
             {
                 var prev = link.Status;
                 client.GetStringAsync(link.Url, new CancellationTokenSource(client.Timeout).Token).ContinueWith(t =>

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/merge.js

@@ -71,7 +71,7 @@
             });
           }
 		}).then(function(reason) {
-            $scope.request("/merge/reject/"+row.Id, null, function(data) {
+            $scope.request("/merge/reject/"+row.Id, {reason:reason}, function(data) {
 			    window.notie.alert({
 				    type: 1,
 				    text: data.Message,