去除排行榜

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

@@ -209,11 +209,11 @@ namespace Masuit.MyBlogs.Core.Controllers
                     break;
             }
             var hot6Post = postList.OrderByDescending(order).Skip(0).Take(5).Cacheable().ToList(); //热门文章
-            var topPostToday = PostService.LoadPageEntitiesFromL2Cache<int, SimplePostModel>(1, 10, out _, p => p.Status == Status.Pended, p => p.PostAccessRecord.Where(r => r.AccessTime > DateTime.Today).Sum(r => r.ClickCount), false).ToList();//文章今日排行
-            var week = DateTime.Today.AddDays(-7);
-            var topPostWeek = PostService.LoadPageEntitiesFromL2Cache<int, SimplePostModel>(1, 10, out _, p => p.Status == Status.Pended, p => p.PostAccessRecord.Where(r => r.AccessTime > week).Sum(r => r.ClickCount), false).ToList(); //文章周排行
-            var month = DateTime.Today.AddMonths(-1);
-            var topPostMonth = PostService.LoadPageEntitiesFromL2Cache<int, SimplePostModel>(1, 10, out _, p => p.Status == Status.Pended, p => p.PostAccessRecord.Where(r => r.AccessTime > month).Sum(r => r.ClickCount), false).ToList(); //文章月排行
+            //var topPostToday = PostService.LoadPageEntitiesFromL2Cache<int, SimplePostModel>(1, 10, out _, p => p.Status == Status.Pended, p => p.PostAccessRecord.Where(r => r.AccessTime > DateTime.Today).Sum(r => r.ClickCount), false).ToList();//文章今日排行
+            //var week = DateTime.Today.AddDays(-7);
+            //var topPostWeek = PostService.LoadPageEntitiesFromL2Cache<int, SimplePostModel>(1, 10, out _, p => p.Status == Status.Pended, p => p.PostAccessRecord.Where(r => r.AccessTime > week).Sum(r => r.ClickCount), false).ToList(); //文章周排行
+            //var month = DateTime.Today.AddMonths(-1);
+            //var topPostMonth = PostService.LoadPageEntitiesFromL2Cache<int, SimplePostModel>(1, 10, out _, p => p.Status == Status.Pended, p => p.PostAccessRecord.Where(r => r.AccessTime > month).Sum(r => r.ClickCount), false).ToList(); //文章月排行
             var tags = new List<string>(); //标签云
             var tagdic = new Dictionary<string, int>();
             var newdic = new Dictionary<string, int>(); //标签云最终结果
@@ -271,9 +271,9 @@ namespace Masuit.MyBlogs.Core.Controllers
                 Posts = posts,
                 Tags = newdic,
                 Top6Post = hot6Post,
-                TopPostByMonth = topPostMonth,
-                TopPostByWeek = topPostWeek,
-                TopPostByToday = topPostToday,
+                //TopPostByMonth = topPostMonth,
+                //TopPostByWeek = topPostWeek,
+                //TopPostByToday = topPostToday,
                 PostsQueryable = postList
             };
         }

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

@@ -1059,9 +1059,9 @@ namespace Masuit.MyBlogs.Core.Controllers
             var history = PostHistoryVersionService.GetById(id);
             if (history != null)
             {
-                var version = history.Post.Mapper<PostHistoryVersion>();
-                version.Id = 0;
-                PostHistoryVersionService.AddEntity(version);
+                //var version = history.Post.Mapper<PostHistoryVersion>();
+                //version.Id = 0;
+                //PostHistoryVersionService.AddEntity(version);
                 history.Post.Category = history.Category;
                 history.Post.CategoryId = history.CategoryId;
                 history.Post.Content = history.Content;
@@ -1080,6 +1080,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                 }
                 history.Post.ModifyDate = history.ModifyDate;
                 bool b = PostHistoryVersionService.UpdateEntitySaved(history);
+                PostHistoryVersionService.DeleteByIdSaved(id);
                 return ResultData(null, b, b ? "回滚成功" : "回滚失败");
             }
 

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

@@ -7,6 +7,5 @@ namespace Masuit.MyBlogs.Core.Extensions.Hangfire
         public string IP { get; set; }
         public string RequestUrl { get; set; }
         public DateTime Time { get; set; }
-        public string Address { get; set; }
     }
 }

src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.xml

@@ -6924,21 +6924,6 @@
             近期热搜
             </summary>
         </member>
-        <member name="P:Masuit.MyBlogs.Core.Models.ViewModel.IndexPageViewModel.TopPostByWeek">
-            <summary>
-            文章周排行
-            </summary>
-        </member>
-        <member name="P:Masuit.MyBlogs.Core.Models.ViewModel.IndexPageViewModel.TopPostByMonth">
-            <summary>
-            文章月排行
-            </summary>
-        </member>
-        <member name="P:Masuit.MyBlogs.Core.Models.ViewModel.IndexPageViewModel.TopPostByToday">
-            <summary>
-            文章年度排行
-            </summary>
-        </member>
         <member name="P:Masuit.MyBlogs.Core.Models.ViewModel.IndexPageViewModel.Top6Post">
             <summary>
             热门文章

src/Masuit.MyBlogs.Core/Models/ViewModel/IndexPageViewModel.cs

@@ -40,20 +40,20 @@ namespace Masuit.MyBlogs.Core.Models.ViewModel
         /// </summary>
         public List<KeywordsRankOutputDto> HotSearch { get; set; }
 
-        /// <summary>
-        /// 文章周排行
-        /// </summary>
-        public List<SimplePostModel> TopPostByWeek { get; set; }
+        ///// <summary>
+        ///// 文章周排行
+        ///// </summary>
+        //public List<SimplePostModel> TopPostByWeek { get; set; }
 
-        /// <summary>
-        /// 文章月排行
-        /// </summary>
-        public List<SimplePostModel> TopPostByMonth { get; set; }
+        ///// <summary>
+        ///// 文章月排行
+        ///// </summary>
+        //public List<SimplePostModel> TopPostByMonth { get; set; }
 
-        /// <summary>
-        /// 文章年度排行
-        /// </summary>
-        public List<SimplePostModel> TopPostByToday { get; set; }
+        ///// <summary>
+        ///// 文章年度排行
+        ///// </summary>
+        //public List<SimplePostModel> TopPostByToday { get; set; }
 
         /// <summary>
         /// 热门文章

src/Masuit.MyBlogs.Core/Views/Shared/_Aside.cshtml

@@ -1,6 +1,5 @@
 @using Common
 @using Masuit.MyBlogs.Core.Models.DTO
-@using Masuit.MyBlogs.Core.Models.Enum
 @using Masuit.Tools.Html
 @using Masuit.Tools.Win32
 @model Masuit.MyBlogs.Core.Models.ViewModel.IndexPageViewModel
@@ -74,59 +73,56 @@
         </article>
     </section>
 
-    <section class="wow border animated fadeIn">
-        <div class="tabs">
-            <div class="tabs-header">
-                <div class="border-bot"></div>
-                <ul>
-                    <li class="active">
-                        <a href="#tab-1" tab-id="1" ripple="ripple" ripple-color="#FFF">今日排行</a>
-                    </li>
-                    <li>
-                        <a href="#tab-2" tab-id="2" ripple="ripple" ripple-color="#FFF">本周排行</a>
-                    </li>
-                    <li>
-                        <a class="hidden-md" href="#tab-3" tab-id="3" ripple="ripple" ripple-color="#FFF">月排行</a>
-                    </li>
-                </ul>
-                <!-- <nav class="tabs-nav">
-                    <i id="prev" ripple="ripple" ripple-color="#FFF" class="material-icons">&#xE314;</i><i id="next" ripple="ripple" ripple-color="#FFF" class="material-icons">&#xE315;</i>
-                </nav> -->
-            </div>
-            <div class="tabs-content" style="font-size: 14px">
-                <div tab-id="1" class="tab active">
-                    <ul class="list-group text-center">
-                        @foreach (var post in Model.TopPostByToday)
-                        {
-                            <li class="list-group-item">
-                                @Html.ActionLink(post.Title, "Details", "Post", new { id = post.Id }, null)
-                            </li>
-                        }
-                    </ul>
-                </div>
-                <div tab-id="2" class="tab">
-                    <ul class="list-group text-center">
-                        @foreach (var post in Model.TopPostByWeek)
-                        {
-                            <li class="list-group-item">
-                                @Html.ActionLink(post.Title, "Details", "Post", new { id = post.Id }, null)
-                            </li>
-                        }
+    @*<section class="wow border animated fadeIn">
+            <div class="tabs">
+                <div class="tabs-header">
+                    <div class="border-bot"></div>
+                    <ul>
+                        <li class="active">
+                            <a href="#tab-1" tab-id="1" ripple="ripple" ripple-color="#FFF">今日排行</a>
+                        </li>
+                        <li>
+                            <a href="#tab-2" tab-id="2" ripple="ripple" ripple-color="#FFF">本周排行</a>
+                        </li>
+                        <li>
+                            <a class="hidden-md" href="#tab-3" tab-id="3" ripple="ripple" ripple-color="#FFF">月排行</a>
+                        </li>
                     </ul>
                 </div>
-                <div tab-id="3" class="tab">
-                    <ul class="list-group text-center">
-                        @foreach (var post in Model.TopPostByMonth)
-                        {
-                            <li class="list-group-item">
-                                @Html.ActionLink(post.Title, "Details", "Post", new { id = post.Id }, null)
-                            </li>
-                        }
-                    </ul>
+                <div class="tabs-content" style="font-size: 14px">
+                    <div tab-id="1" class="tab active">
+                        <ul class="list-group text-center">
+                            @foreach (var post in Model.TopPostByToday)
+                            {
+                                <li class="list-group-item">
+                                    @Html.ActionLink(post.Title, "Details", "Post", new { id = post.Id }, null)
+                                </li>
+                            }
+                        </ul>
+                    </div>
+                    <div tab-id="2" class="tab">
+                        <ul class="list-group text-center">
+                            @foreach (var post in Model.TopPostByWeek)
+                            {
+                                <li class="list-group-item">
+                                    @Html.ActionLink(post.Title, "Details", "Post", new { id = post.Id }, null)
+                                </li>
+                            }
+                        </ul>
+                    </div>
+                    <div tab-id="3" class="tab">
+                        <ul class="list-group text-center">
+                            @foreach (var post in Model.TopPostByMonth)
+                            {
+                                <li class="list-group-item">
+                                    @Html.ActionLink(post.Title, "Details", "Post", new { id = post.Id }, null)
+                                </li>
+                            }
+                        </ul>
+                    </div>
                 </div>
             </div>
-        </div>
-    </section>
+        </section>*@
 
     <section class="wow animated fadeIn">
         <div class="leaderboard-box">
@@ -170,62 +166,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             </symbol>
             </svg>
         </div>
@@ -278,38 +218,6 @@
         </article>
     </section>
 
-    @*<section class="wow animated fadeIn">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <span class="glyphicon glyphicon-list-alt"></span><b> 最新评论</b>
-                </div>
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <ul class="demo1" style="min-height: 240px;">
-                                @if (Model.Comments.Any())
-                                {
-                                    foreach (CommentOutputDto comment in Model.Comments)
-                                    {
-                                        <li class="news-item">
-                                            <span class="text-@colors[new Random().StrictNext(100) % colors.Length]">
-                                                @comment.NickName
-                                            </span>
-                                            说：<a href="@Url.Action("Details","Post", new {id = comment.PostId, cid = comment.Id})#comment" class="tippy-scale" title="查看详情">@comment.Content.RemoveHtmlTag(35)...</a>
-                                        </li>
-                                    }
-                                }
-                                else
-                                {
-                                    <li class="news-item">没有评论...</li>
-                                }
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>*@
-
     <section class="wow animated fadeIn">
         <article class="panel panel-primary">
             <div class="panel-heading">

src/Masuit.MyBlogs.Core/Views/Shared/_Layout.cshtml

@@ -44,7 +44,7 @@
     <link href="~/Content/microtip.min.css" rel="stylesheet" />
     <link href="~/Assets/breadcrumb/style.css" rel="stylesheet" />
     <link href="~/Assets/nav/css/style.css" rel="stylesheet" />
-    <link href="~/Assets/tab/styles.css" rel="stylesheet" />
+    @*<link href="~/Assets/tab/styles.css" rel="stylesheet" />*@
     <link href="~/Assets/tippy/tippy.css" rel="stylesheet" />
 
     <script src="https://cdn.staticfile.org/bluebird/3.5.3/bluebird.min.js"></script>
@@ -69,8 +69,8 @@
     <script src="~/Scripts/global/scripts.js"></script>
     <script src="~/Assets/tippy/tippy.js"></script>
     <script src="~/Assets/newsbox/jquery.bootstrap.newsbox.js"></script>
-    <script src="~/Assets/tab/stopExecutionOnTimeout.js"></script>
-    <script src="~/Assets/tab/init.js"></script>
+    @*<script src="~/Assets/tab/stopExecutionOnTimeout.js"></script>
+        <script src="~/Assets/tab/init.js"></script>*@
     <script src="~/Assets/tagcloud/js/tagcloud.js"></script>
     <script src="~/Assets/scrolltop/js/scrolltop.js"></script>
     <script src="~/Assets/nav/js/main.js"></script>

src/Masuit.MyBlogs.Core/wwwroot/ng-views/views/system/firewall.html

@@ -67,9 +67,6 @@
             <td filter="{RequestUrl: 'text'}" sortable="'RequestUrl'" title="'请求URL'">
                 <a ng-href="{{row.RequestUrl}}" target="_blank">{{row.RequestUrl}}</a>
             </td>
-            <td filter="{Address: 'text'}" sortable="'Address'" title="'地理位置'">
-                {{row.Address}}
-            </td>
             <td sortable="'Time'" title="'拦截时间'">
                 {{row.Time|date:'yyyy-MM-dd HH:mm:ss'}}
             </td>