文章版本bug修复

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

@@ -1,5 +1,6 @@
 using Masuit.LuceneEFCore.SearchEngine.Interfaces;
 using Masuit.MyBlogs.Core.Common;
+using Masuit.MyBlogs.Core.Extensions.Firewall;
 using Masuit.MyBlogs.Core.Infrastructure;
 using Masuit.MyBlogs.Core.Infrastructure.Services.Interface;
 using Masuit.MyBlogs.Core.Models.DTO;
@@ -16,7 +17,6 @@ using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using Masuit.MyBlogs.Core.Extensions.Firewall;
 
 namespace Masuit.MyBlogs.Core.Extensions.Hangfire
 {
@@ -209,17 +209,10 @@ namespace Masuit.MyBlogs.Core.Extensions.Hangfire
         public void UpdateLinkWeight(string referer)
         {
             var uri = new Uri(referer);
-            var query = _linksService.GetQuery(l => l.Url.Contains(uri.Host));
-            if (query.Any())
+            _linksService.GetQuery(l => l.Url.Contains(uri.Host)).UpdateFromQuery(link => new Links()
             {
-                var list = query.ToList();
-                foreach (var link in list)
-                {
-                    link.Weight += 1;
-                }
-
-                _linksService.SaveChanges();
-            }
+                Weight = link.Weight + 1
+            });
         }
 
         /// <summary>

src/Masuit.MyBlogs.Core/Infrastructure/Services/AdvertisementService.cs

@@ -105,13 +105,13 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services
             }
             return CacheManager.GetOrAdd($"{count}{type}{cid}", _ =>
             {
-                var list = GetQuery(@where).AsEnumerable().Select(a => new WeightedItem<Advertisement>(a, (int)a.Price)).WeightedItems(count);
-                foreach (var item in list)
+                var list = GetQuery(where).AsEnumerable().Select(a => new WeightedItem<Advertisement>(a, (int)a.Price)).WeightedItems(count);
+                var ids = list.Select(a => a.Id).ToArray();
+                GetQuery(a => ids.Contains(a.Id)).UpdateFromQuery(a => new Advertisement()
                 {
-                    item.DisplayCount += 1;
-                }
+                    DisplayCount = a.DisplayCount + 1
+                });
 
-                SaveChanges();
                 return list;
             });
         }

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

@@ -20,9 +20,14 @@
     <link href="~/Assets/UEditor/third-party/SyntaxHighlighter/styles/shCore.min.css" rel="stylesheet" />
     <link href="~/Assets/share/share.css" rel="stylesheet" />
     <link href="~/Assets/highlight/css/highlight.css" rel="stylesheet" />
-    <script src="~/Assets/share/jquery.qrcode.min.js" async defer></script>
-    <script src="~/Assets/share/jquery.share.min.js" async defer></script>
-    <script src="~/Assets/highlight/js/highlight.js" async defer></script>
+    <script src="/Assets/share/jquery.qrcode.min.js"></script>
+    <script src="/Assets/share/jquery.share.min.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/shCore.min.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/bundle.min.js"></script>
+    <script src="/Assets/jquery.tocify/jquery.tocify.js"></script>
+    <script src="/Scripts/global/article.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
 </environment>
 <environment names="Stage,Production">
     @await Styles.RenderAsync("/bundles/article.css")
@@ -156,13 +161,13 @@
                                 <span class="text-red">[推广]</span>
                             </h3>
 
-                            <div class="row padding-bot10">
+                            <div class="row">
                                 @{
                                     string imgSrc = ad.ThumbImgUrl;
                                     if (!string.IsNullOrEmpty(imgSrc))
                                     {
-                                        <div class="col-md-3">
-                                            <img class="img-thumbnail img-responsive thumb" data-original="@imgSrc" alt="@ad.Title" title="@ad.Title ">
+                                        <div class="col-md-3 paddingright-clear">
+                                            <img class="img-thumbnail img-responsive" src="@imgSrc" alt="@ad.Title" title="@ad.Title ">
                                         </div>
                                     }
                                 }

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

@@ -22,9 +22,14 @@
     <link href="~/Assets/UEditor/third-party/SyntaxHighlighter/styles/shCore.min.css" rel="stylesheet" />
     <link href="~/Assets/share/share.css" rel="stylesheet" />
     <link href="~/Assets/highlight/css/highlight.css" rel="stylesheet" />
-    <script src="~/Assets/share/jquery.qrcode.min.js" async defer></script>
-    <script src="~/Assets/share/jquery.share.min.js" async defer></script>
-    <script src="~/Assets/highlight/js/highlight.js" async defer></script>
+    <script src="/Assets/share/jquery.qrcode.min.js"></script>
+    <script src="/Assets/share/jquery.share.min.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/shCore.min.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/bundle.min.js"></script>
+    <script src="/Assets/jquery.tocify/jquery.tocify.js"></script>
+    <script src="/Scripts/global/article.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
 </environment>
 <environment names="Stage,Production">
     @await Styles.RenderAsync("/bundles/article.css")
@@ -148,13 +153,13 @@
                                 <span class="text-red">[推广]</span>
                             </h3>
 
-                            <div class="row padding-bot10">
+                            <div class="row">
                                 @{
                                     string imgSrc = ad.ThumbImgUrl;
                                     if (!string.IsNullOrEmpty(imgSrc))
                                     {
-                                        <div class="col-md-3">
-                                            <img class="img-thumbnail img-responsive thumb" data-original="@imgSrc" alt="@ad.Title" title="@ad.Title ">
+                                        <div class="col-md-3 paddingright-clear">
+                                            <img class="img-thumbnail img-responsive" src="@imgSrc" alt="@ad.Title" title="@ad.Title ">
                                         </div>
                                     }
                                 }

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

@@ -15,9 +15,14 @@
     <link href="~/Assets/UEditor/third-party/SyntaxHighlighter/styles/shCore.min.css" rel="stylesheet" />
     <link href="~/Assets/share/share.css" rel="stylesheet" />
     <link href="~/Assets/highlight/css/highlight.css" rel="stylesheet" />
-    <script src="~/Assets/share/jquery.qrcode.min.js"></script>
-    <script src="~/Assets/share/jquery.share.min.js"></script>
-    <script src="~/Assets/highlight/js/highlight.js"></script>
+    <script src="/Assets/share/jquery.qrcode.min.js"></script>
+    <script src="/Assets/share/jquery.share.min.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/shCore.min.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/bundle.min.js"></script>
+    <script src="/Assets/jquery.tocify/jquery.tocify.js"></script>
+    <script src="/Scripts/global/article.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
 </environment>
 <environment names="Stage,Production">
     @await Styles.RenderAsync("/bundles/article.css")

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

@@ -15,9 +15,14 @@
     <link href="~/Assets/UEditor/third-party/SyntaxHighlighter/styles/shCore.min.css" rel="stylesheet" />
     <link href="~/Assets/share/share.css" rel="stylesheet" />
     <link href="~/Assets/highlight/css/highlight.css" rel="stylesheet" />
-    <script src="~/Assets/share/jquery.qrcode.min.js"></script>
-    <script src="~/Assets/share/jquery.share.min.js"></script>
-    <script src="~/Assets/highlight/js/highlight.js"></script>
+    <script src="/Assets/share/jquery.qrcode.min.js"></script>
+    <script src="/Assets/share/jquery.share.min.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/shCore.min.js"></script>
+    <script src="/Assets/UEditor/third-party/SyntaxHighlighter/scripts/bundle.min.js"></script>
+    <script src="/Assets/jquery.tocify/jquery.tocify.js"></script>
+    <script src="/Scripts/global/article.js"></script>
+    <script src="/Assets/highlight/js/highlight.js"></script>
 </environment>
 <environment names="Stage,Production">
     @await Styles.RenderAsync("/bundles/article.css")