瀏覽代碼

一些bug修复

懒得勤快 6 年之前
父節點
當前提交
24e79f5af7

+ 0 - 29
src/Masuit.MyBlogs.Core/Controllers/AdminController.cs

@@ -1,12 +1,8 @@
 using Masuit.MyBlogs.Core.Extensions;
 using Masuit.MyBlogs.Core.Infrastructure.Services.Interface;
 using Masuit.MyBlogs.Core.Models.ViewModel;
-using Masuit.Tools.Logging;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
 using Newtonsoft.Json;
-using System;
-using System.Diagnostics;
 using System.Text;
 
 namespace Masuit.MyBlogs.Core.Controllers
@@ -60,30 +56,5 @@ namespace Masuit.MyBlogs.Core.Controllers
                 MissingMemberHandling = MissingMemberHandling.Ignore
             }), "application/json", Encoding.UTF8);
         }
-
-        /// <summary>
-        /// 性能计数器
-        /// </summary>
-        private Stopwatch Stopwatch { get; set; } = new Stopwatch();
-
-        /// <summary>在调用操作方法前调用。</summary>
-        /// <param name="filterContext">有关当前请求和操作的信息。</param>
-        public override void OnActionExecuting(ActionExecutingContext filterContext)
-        {
-            Stopwatch.Start();
-            base.OnActionExecuting(filterContext);
-        }
-
-        /// <summary>在调用操作方法后调用。</summary>
-        /// <param name="filterContext">有关当前请求和操作的信息。</param>
-        public override void OnActionExecuted(ActionExecutedContext filterContext)
-        {
-            base.OnActionExecuted(filterContext);
-            if (Stopwatch.Elapsed > TimeSpan.FromSeconds(5))
-            {
-                var req = filterContext.HttpContext.Request;
-                LogManager.Info($"执行请求{req.Host}耗时{Stopwatch.ElapsedMilliseconds}ms,客户端用户代理:{req.Headers["User-Agent"]},客户端IP:{filterContext.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}");
-            }
-        }
     }
 }

+ 0 - 14
src/Masuit.MyBlogs.Core/Controllers/BaseController.cs

@@ -4,7 +4,6 @@ using Masuit.MyBlogs.Core.Models.DTO;
 using Masuit.MyBlogs.Core.Models.Enum;
 using Masuit.MyBlogs.Core.Models.ViewModel;
 using Masuit.Tools.Core.Net;
-using Masuit.Tools.Logging;
 using Masuit.Tools.NoSQL;
 using Masuit.Tools.Security;
 using Microsoft.AspNetCore.Http;
@@ -13,7 +12,6 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Text;
@@ -96,16 +94,10 @@ namespace Masuit.MyBlogs.Core.Controllers
             }), "application/json", Encoding.UTF8);
         }
 
-        /// <summary>
-        /// 性能计数器
-        /// </summary>
-        private Stopwatch Stopwatch { get; set; } = new Stopwatch();
-
         /// <summary>在调用操作方法前调用。</summary>
         /// <param name="filterContext">有关当前请求和操作的信息。</param>
         public override void OnActionExecuting(ActionExecutingContext filterContext)
         {
-            Stopwatch.Start();
             base.OnActionExecuting(filterContext);
             if (filterContext.HttpContext.Request.Method.Equals("GET", StringComparison.InvariantCultureIgnoreCase)) //get方式的多半是页面
             {
@@ -171,12 +163,6 @@ namespace Masuit.MyBlogs.Core.Controllers
             ViewBag.Footer = model;
 
             #endregion
-
-            if (Stopwatch.Elapsed > TimeSpan.FromSeconds(5))
-            {
-                var req = filterContext.HttpContext.Request;
-                LogManager.Info($"执行请求{req.Host}耗时{Stopwatch.ElapsedMilliseconds}ms,客户端用户代理:{req.Headers["User-Agent"]},客户端IP:{filterContext.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}");
-            }
         }
     }
 }

+ 4 - 2
src/Masuit.MyBlogs.Core/Controllers/PostController.cs

@@ -219,7 +219,8 @@ namespace Masuit.MyBlogs.Core.Controllers
             {
                 HttpContext.Session.Set("post-vote" + id, id);
                 ++post.VoteDownCount;
-                bool b = PostService.UpdateEntitySaved(post);
+                PostService.UpdateEntity(post);
+                var b = PostService.SaveChanges() > 0;
                 return ResultData(null, b, b ? "投票成功!" : "投票失败!");
             }
 
@@ -243,7 +244,8 @@ namespace Masuit.MyBlogs.Core.Controllers
             {
                 HttpContext.Session.Set("post-vote" + id, id);
                 ++post.VoteUpCount;
-                bool b = PostService.UpdateEntitySaved(post);
+                PostService.UpdateEntity(post);
+                var b = PostService.SaveChanges() > 0;
                 return ResultData(null, b, b ? "投票成功!" : "投票失败!");
             }
 

+ 6 - 6
src/Masuit.MyBlogs.Core/Extensions/FirewallMiddleware.cs

@@ -42,6 +42,12 @@ namespace Masuit.MyBlogs.Core.Extensions
                 return;
             }
 
+            if (context.Request.IsRobot())
+            {
+                //await _next.Invoke(context);
+                return;
+            }
+
             if (context.Request.Path.ToString().Contains(new[] { "error", "serviceunavailable" }))
             {
                 await _next.Invoke(context);
@@ -61,12 +67,6 @@ namespace Masuit.MyBlogs.Core.Extensions
                 return;
             }
 
-            if (context.Request.IsRobot())
-            {
-                await _next.Invoke(context);
-                return;
-            }
-
             var times = _redisHelper.StringIncrement("Frequency:" + context.Connection.Id);
             _redisHelper.Expire("Frequency:" + context.Connection.Id, TimeSpan.FromMinutes(1));
             if (times > 300)

+ 0 - 6
src/Masuit.MyBlogs.Core/Views/Misc/About.cshtml

@@ -65,12 +65,6 @@
                     <td>毕业院校:</td>
                     <td>四川省资阳中学</td>
                 </tr>
-                <tr>
-                    <td>目前就职于:</td>
-                    <td>
-                        <a href="http://www.supwin.com">广州实盈投资</a>
-                    </td>
-                </tr>
                 <tr>
                     <td>人生格言:</td>
                     <td>