bug修复

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

@@ -439,6 +439,20 @@ namespace Masuit.MyBlogs.Core.Controllers
             return View(post);
         }
 
+        /// <summary>
+        /// 文章合并
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="mid"></param>
+        /// <returns></returns>
+        [HttpGet("{id}/merge/{mid}")]
+        public ActionResult RepushMerge(int id, int mid)
+        {
+            var post = PostService.GetById(id) ?? throw new NotFoundException("文章未找到");
+            var merge = post.PostMergeRequests.FirstOrDefault(p => p.Id == mid && p.MergeState != MergeStatus.Merged) ?? throw new NotFoundException("待合并文章未找到");
+            return View(merge);
+        }
+
         /// <summary>
         /// 文章合并
         /// </summary>
@@ -498,21 +512,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                 BackgroundJob.Enqueue(() => CommonHelper.SendMail("博客文章修改请求：", content, CommonHelper.SystemSettings["ReceiveEmail"]));
             }
 
-            return ResultData(null, b, b ? "修改请求已提交！" : "操作失败！");
-        }
-
-        /// <summary>
-        /// 文章合并
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="mid"></param>
-        /// <returns></returns>
-        [HttpGet("{id}/merge/{mid}")]
-        public ActionResult RepushMerge(int id, int mid)
-        {
-            var post = PostService.GetById(id) ?? throw new NotFoundException("文章未找到");
-            var merge = post.PostMergeRequests.FirstOrDefault(p => p.Id == mid && p.MergeState != MergeStatus.Merged) ?? throw new NotFoundException("待合并文章未找到");
-            return View(merge);
+            return ResultData(null, b, b ? "您的修改请求已提交，已进入审核状态，感谢您的参与！" : "操作失败！");
         }
 
         #region 后端管理

src/Masuit.MyBlogs.Core/Models/DTO/CommentInputDto.cs

@@ -20,7 +20,7 @@ namespace Masuit.MyBlogs.Core.Models.DTO
         /// <summary>
         /// 昵称
         /// </summary>
-        [Required(ErrorMessage = "既然要评论，不留名怎么行呢！"), MaxLength(36, ErrorMessage = "别闹，你这名字太长了吧！"), MinLength(2, ErrorMessage = "昵称至少2个字！")]
+        [Required(ErrorMessage = "既然要评论，不留名怎么行呢！"), MaxLength(36, ErrorMessage = "昵称最多只能36个字符！"), MinLength(2, ErrorMessage = "昵称至少2个字！")]
         public string NickName { get; set; }
 
         /// <summary>

src/Masuit.MyBlogs.Core/Views/Post/Details_Admin.cshtml

@@ -1,12 +1,10 @@
 @using System.Web
 @using Masuit.MyBlogs.Core.Common
 @using Masuit.MyBlogs.Core.Models.DTO
-@using Masuit.MyBlogs.Core.Models.Entity
 @using Masuit.MyBlogs.Core.Models.Enum
 @using Masuit.MyBlogs.Core.Models.ViewModel
 @using Masuit.Tools.Core.Net
 @using Masuit.Tools.Systems
-@using Masuit.Tools.Win32
 @model Masuit.MyBlogs.Core.Models.Entity.Post
 @{
     ViewBag.Title = Model.Title;
@@ -314,8 +312,6 @@
             $("#article").highlight(keywords[i]);
         }
 		loading();
-		//SyntaxHighlighter.all();
-		//SyntaxHighlighter.defaults['toolbar'] = false;
 		$('#pageToolbar').Paging({ //异步加载评论
 			pagesize: 10,
 			count: @Model.Comment.Count(c =>c.ParentId==0&& c.Status==Status.Pended),

src/Masuit.MyBlogs.Core/wwwroot/Scripts/global/article.js

@@ -63,16 +63,12 @@
 		});
 	});
 	var user = JSON.parse(localStorage.getItem("user"));
-	var email = localStorage.getItem("email");
-	if (email) {
-		$("[name='Email']").val(email);
-		$("#email-token").submit();
-	}
 	if (user) {
-		$("[name='NickName']").val(user.NickName);
-		$("[name='Email']").val(user.Email);
+		$("[name='NickName']").val(user.NickName||$("[name='NickName']").val());
+		$("[name='Email']").val(user.Email||$("[name='Email']").val());
 		$("[name='QQorWechat']").val(user.QQorWechat);
 	}
+
 	bindReplyBtn();//绑定回复按钮事件
 	bindVote();//绑定文章投票按钮
 	getcomments();//获取评论
@@ -246,9 +242,9 @@ function bindReplyBtn() {
 		loadingDone();
 		var user = JSON.parse(localStorage.getItem("user"));
 		if (user) {
-			$("[name='NickName']").val(user.NickName);
-			$("[name='Email']").val(user.Email);
-			$("[name='QQorWechat']").val(user.QQorWechat);
+		    $("[name='NickName']").val(user.NickName||$("[name='NickName']").val());
+		    $("[name='Email']").val(user.Email||$("[name='Email']").val());
+		    $("[name='QQorWechat']").val(user.QQorWechat);
 		}
 		var href = $(this).attr("href");
 		var uid = href.substring(href.indexOf("uid") + 4);