文章发布草稿增强

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

@@ -254,7 +254,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         /// <returns></returns>
         public ActionResult<List<JObject>> SendBox()
         {
-            return RedisHelper.Keys("Email:*").SelectMany(key => RedisHelper.SMembers(key).Select(JObject.Parse)).Reverse().ToList();
+            return RedisHelper.Keys("Email:*").SelectMany(key => RedisHelper.SMembers(key).Select(JObject.Parse)).OrderByDescending(o => o["time"]).ToList();
         }
 
         #region 网站防火墙

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

@@ -7,6 +7,7 @@ using Masuit.Tools.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using System;
 using System.Net.Http;
 using System.Threading.Tasks;
 using TimeZoneConverter;

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

@@ -16,6 +16,7 @@
         <li><a asp-controller="Home" asp-action="Index">首页</a></li>
         <li class="current"><em>@ViewBag.Title</em></li>
     </ol>
+    <p class="text-red size20">投稿须知：投稿前请先站内搜索同类文章进行编辑修改操作，本页的重复投稿将不会接受，作直接删除处理！</p>
     <hr />
     <form class="form-group" id="article-form" method="post" onsubmit="return false">
         @*文章表单*@
@@ -23,6 +24,11 @@
         <div class="input-group">
             <span class="input-group-addon size18"><label for="article">文章标题：</label></span>
             <input type="text" id="article" class="form-control input-lg" name="Title" required placeholder="请输入文章标题">
+            <span class="input-group-btn">
+                <button type="button" id="search" class="btn btn-info btn-lg">
+                    检索同类资源
+                </button>
+            </span>
         </div>
         <!-- 加载编辑器的容器 -->
         <div class="form-group overlay animated bounceInDown">

src/Masuit.MyBlogs.Core/appsettings.json

@@ -12,7 +12,8 @@
         "CertPath": "App_Data/cert/server.pfx", // https证书
         "CertPassword": "cEHlnUGu" // 证书密码
     },
-    "EmailDomainWhiteList": "masuit.com,ldqk.org,qq.com,163.com,gmail.com,outlook.com",
+    "EmailDomainWhiteList": "masuit.com,ldqk.org,\\d{6,}@qq.com,\\w{6,}@163.com,\\w{6,}@gmail.com,\\w{6,}@outlook.com",
+    "EmailDomainBlockList": "\\w{1,5}@qq.com,\\w{1,5}@163.com,\\w{1,5}@gmail.com,\\w{1,5}@outlook.com",
     "UseRewriter": "NonWww", //NonWww:重定向到不带www的域名，WWW：重定向到带www的域名
     "ConnString": "Server=127.0.0.1;Port=3306;Database=MyBlogs;Uid=root;Pwd=;Charset=utf8mb4",
     //"ConnString": "Data Source=.;Initial Catalog=MyBlogs;Integrated Security=True",

src/Masuit.MyBlogs.Core/wwwroot/Scripts/publish/publish.js

@@ -27,7 +27,6 @@
 	});
 	$('.ui.dropdown.category').dropdown("set selected" , 1);
 
-    //异步提交表单开始
     $("#submit").on("click", function (e) {
         e.preventDefault();
         loading();
@@ -88,7 +87,6 @@
             }
         });
     });
-    //异步提交表单结束
     
     $("#getcode").on("click", function (e) {
         e.preventDefault();
@@ -123,6 +121,11 @@
             }
         });
     });
+
+    $("#search").on("click", function (e) {
+        e.preventDefault();
+        window.open("/s/"+$("#article").val());
+    });
 	
 	//检查草稿
 	if (localStorage.getItem("write-post-draft")) {
@@ -136,7 +139,11 @@
 				$("#article").val(post.Title);
 				ue.setContent(post.Content);
 				$('.ui.dropdown.category').dropdown('set selected', [post.CategoryId]);
-				$('.ui.dropdown.tags').dropdown('set selected', post.Label.split(","));
+                if (post.Label) {
+                    $('.ui.dropdown.tags').dropdown('set selected', post.Label.split(","));
+                }
+                $("[name='Author']").val(post.Author);
+                $("[name='Email']").val(post.Email);
                 window.interval = setInterval(function () {
 		            localStorage.setItem("write-post-draft",JSON.stringify($("#article-form").serializeObject()));
 	            },5000);

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

@@ -393,9 +393,15 @@ myApp.controller("writeblog", ["$scope", "$http", "$timeout", function ($scope,
                 $scope.$apply();
                 $timeout(function () {
                     $('.ui.dropdown.category').dropdown('set selected', [$scope.post.CategoryId]);
-                    $('.ui.dropdown.tags').dropdown('set selected', $scope.post.Label.split(','));
-                    $('.ui.dropdown.keyword').dropdown('set selected', $scope.post.Keyword.split(','));
-                    $('.ui.dropdown.seminar').dropdown('set selected', $scope.post.Seminars.split(','));
+                    if ($scope.post.Label) {
+                        $('.ui.dropdown.tags').dropdown('set selected', $scope.post.Label.split(','));
+                    }
+                    if ($scope.post.Keyword) {
+						$('.ui.dropdown.keyword').dropdown('set selected', $scope.post.Keyword.split(','));
+                    }
+                    if ($scope.post.Seminars) {
+                        $('.ui.dropdown.seminar').dropdown('set selected', $scope.post.Seminars.split(','));
+                    }
                 }, 10);
                 window.interval = setInterval(function () {
 		            localStorage.setItem("write-post-draft",JSON.stringify($scope.post));
@@ -536,7 +542,7 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 		});
 	}
 
-	//异步提交表单开始
+	//发布
 	$scope.submit = function (post) {
 		Object.keys(post).forEach(key => post[key] == undefined||post[key] == null ? delete post[key] : '');
 		
@@ -602,7 +608,6 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 			}
 		});
 	}
-	//异步提交表单结束
 	
 	//检查草稿
     if (localStorage.getItem("post-draft-" + $scope.id)) {
@@ -616,9 +621,15 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
                 $scope.$apply();
                 $timeout(function () {
                     $('.ui.dropdown.category').dropdown('set selected', [$scope.post.CategoryId]);
-                    $('.ui.dropdown.tags').dropdown('set selected', $scope.post.Label.split(','));
-                    $('.ui.dropdown.keyword').dropdown('set selected', $scope.post.Keyword.split(','));
-                    $('.ui.dropdown.seminar').dropdown('set selected', $scope.post.Seminars.split(','));
+					if ($scope.post.Label) {
+                        $('.ui.dropdown.tags').dropdown('set selected', $scope.post.Label.split(','));
+                    }
+                    if ($scope.post.Keyword) {
+						$('.ui.dropdown.keyword').dropdown('set selected', $scope.post.Keyword.split(','));
+                    }
+                    if ($scope.post.Seminars) {
+                        $('.ui.dropdown.seminar').dropdown('set selected', $scope.post.Seminars.split(','));
+                    }
                 }, 10);
                 window.interval = setInterval(function () {
 			        localStorage.setItem("post-draft-"+$scope.id,JSON.stringify($scope.post));