Browse Source

一点小优化

懒得勤快 5 years ago
parent
commit
c80f2480aa

+ 1 - 1
src/Masuit.MyBlogs.Core/Common/ImagebedClient.cs

@@ -163,7 +163,7 @@ namespace Masuit.MyBlogs.Core.Common
             }
             }
 
 
             var objectName = DateTime.Now.ToString("yyyy/MM/dd/") + file;
             var objectName = DateTime.Now.ToString("yyyy/MM/dd/") + file;
-            for (int i = 0; i < 5; i++)
+            for (int i = 0; i < 3; i++)
             {
             {
                 try
                 try
                 {
                 {

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

@@ -505,7 +505,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                     .Replace("{{time}}", post.ModifyDate.ToString("yyyy-MM-dd HH:mm:ss"))
                     .Replace("{{time}}", post.ModifyDate.ToString("yyyy-MM-dd HH:mm:ss"))
                     .Replace("{{title}}", post.Title)
                     .Replace("{{title}}", post.Title)
                     .Replace("{{author}}", post.Author)
                     .Replace("{{author}}", post.Author)
-                    .Replace("{{content}}", post.Content.GetSummary())
+                    .Replace("{{content}}", post.Content.GetSummary(250, 50))
                     .Replace("{{cancel}}", Url.Action("Subscribe", "Subscribe", new
                     .Replace("{{cancel}}", Url.Action("Subscribe", "Subscribe", new
                     {
                     {
                         c.Email,
                         c.Email,
@@ -845,7 +845,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                     .Replace("{{link}}", link + "?email=" + c.Email)
                     .Replace("{{link}}", link + "?email=" + c.Email)
                     .Replace("{{time}}", p.ModifyDate.ToString("yyyy-MM-dd HH:mm:ss"))
                     .Replace("{{time}}", p.ModifyDate.ToString("yyyy-MM-dd HH:mm:ss"))
                     .Replace("{{title}}", post.Title).Replace("{{author}}", post.Author)
                     .Replace("{{title}}", post.Title).Replace("{{author}}", post.Author)
-                    .Replace("{{content}}", post.Content.GetSummary())
+                    .Replace("{{content}}", post.Content.GetSummary(250, 50))
                     .Replace("{{cancel}}", Url.Action("Subscribe", "Subscribe", new
                     .Replace("{{cancel}}", Url.Action("Subscribe", "Subscribe", new
                     {
                     {
                         c.Email,
                         c.Email,

+ 1 - 1
src/Masuit.MyBlogs.Core/Controllers/SubscribeController.cs

@@ -79,7 +79,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                     Name = p.Author,
                     Name = p.Author,
                     Email = p.Email
                     Email = p.Email
                 },
                 },
-                Body = p.Content.GetSummary(300, 10),
+                Body = p.Content.GetSummary(300, 50),
                 Categories = new List<string>
                 Categories = new List<string>
                 {
                 {
                     p.Category.Name
                     p.Category.Name

+ 2 - 0
src/Masuit.MyBlogs.Core/Infrastructure/DataContext.cs

@@ -25,11 +25,13 @@ namespace Masuit.MyBlogs.Core.Infrastructure
             modelBuilder.Entity<Category>().HasMany(e => e.Post).WithOne(e => e.Category).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Category>().HasMany(e => e.Post).WithOne(e => e.Category).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Category>().HasMany(e => e.PostHistoryVersion).WithOne(e => e.Category).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Category>().HasMany(e => e.PostHistoryVersion).WithOne(e => e.Category).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Category>().HasMany(e => e.Advertisements).WithOne(e => e.Category).IsRequired(false).HasForeignKey(a => a.CategoryId).OnDelete(DeleteBehavior.SetNull);
             modelBuilder.Entity<Category>().HasMany(e => e.Advertisements).WithOne(e => e.Category).IsRequired(false).HasForeignKey(a => a.CategoryId).OnDelete(DeleteBehavior.SetNull);
+
             modelBuilder.Entity<Post>().HasMany(e => e.Comment).WithOne(e => e.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Post>().HasMany(e => e.Comment).WithOne(e => e.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Post>().HasMany(e => e.PostHistoryVersion).WithOne(e => e.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Post>().HasMany(e => e.PostHistoryVersion).WithOne(e => e.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Post>().HasMany(e => e.Seminar).WithOne(s => s.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Post>().HasMany(e => e.Seminar).WithOne(s => s.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Post>().HasMany(e => e.PostMergeRequests).WithOne(s => s.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Post>().HasMany(e => e.PostMergeRequests).WithOne(s => s.Post).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<PostHistoryVersion>().HasMany(e => e.Seminar).WithOne(s => s.PostHistoryVersion);
             modelBuilder.Entity<PostHistoryVersion>().HasMany(e => e.Seminar).WithOne(s => s.PostHistoryVersion);
+
             modelBuilder.Entity<UserInfo>().HasMany(e => e.LoginRecord).WithOne(e => e.UserInfo).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<UserInfo>().HasMany(e => e.LoginRecord).WithOne(e => e.UserInfo).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<SeminarPost>().HasKey(s => new
             modelBuilder.Entity<SeminarPost>().HasKey(s => new
             {
             {

+ 4 - 4
src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -28,7 +28,7 @@
         <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="CacheManager.Microsoft.Extensions.Caching.Memory" Version="2.0.0-beta-1629" />
         <PackageReference Include="CacheManager.Microsoft.Extensions.Caching.Memory" Version="2.0.0-beta-1629" />
         <PackageReference Include="CacheManager.Serialization.Json" Version="2.0.0-beta-1629" />
         <PackageReference Include="CacheManager.Serialization.Json" Version="2.0.0-beta-1629" />
-        <PackageReference Include="CSRedisCore" Version="3.4.0" />
+        <PackageReference Include="CSRedisCore" Version="3.4.5" />
         <PackageReference Include="DocxToHtml" Version="1.0.4" />
         <PackageReference Include="DocxToHtml" Version="1.0.4" />
         <PackageReference Include="EFSecondLevelCache.Core" Version="2.9.1" />
         <PackageReference Include="EFSecondLevelCache.Core" Version="2.9.1" />
         <PackageReference Include="Hangfire" Version="1.7.9" />
         <PackageReference Include="Hangfire" Version="1.7.9" />
@@ -36,9 +36,9 @@
         <PackageReference Include="Hangfire.MemoryStorage" Version="1.6.3" />
         <PackageReference Include="Hangfire.MemoryStorage" Version="1.6.3" />
         <PackageReference Include="htmldiff.net-core" Version="1.3.6" />
         <PackageReference Include="htmldiff.net-core" Version="1.3.6" />
         <PackageReference Include="IP2Region" Version="1.2.0" />
         <PackageReference Include="IP2Region" Version="1.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
         <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
         <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
         <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.1.0" />
         <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.1.0" />
         <PackageReference Include="PanGu.HighLight" Version="1.0.0" />
         <PackageReference Include="PanGu.HighLight" Version="1.0.0" />

+ 4 - 2
src/Masuit.MyBlogs.Core/Models/Entity/Post.cs

@@ -101,23 +101,25 @@ namespace Masuit.MyBlogs.Core.Models.Entity
         /// <summary>
         /// <summary>
         /// 支持数
         /// 支持数
         /// </summary>
         /// </summary>
-        [DefaultValue(0)]
+        [DefaultValue(0), ConcurrencyCheck]
         public int VoteUpCount { get; set; }
         public int VoteUpCount { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// 反对数
         /// 反对数
         /// </summary>
         /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.Computed), DefaultValue(0)]
+        [DatabaseGenerated(DatabaseGeneratedOption.Computed), DefaultValue(0), ConcurrencyCheck]
         public int VoteDownCount { get; set; }
         public int VoteDownCount { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// 每日平均访问量
         /// 每日平均访问量
         /// </summary>
         /// </summary>
+        [ConcurrencyCheck]
         public double AverageViewCount { get; set; }
         public double AverageViewCount { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// 总访问量
         /// 总访问量
         /// </summary>
         /// </summary>
+        [ConcurrencyCheck]
         public int TotalViewCount { get; set; }
         public int TotalViewCount { get; set; }
 
 
         /// <summary>
         /// <summary>

+ 2 - 3
src/Masuit.MyBlogs.Core/Startup.cs

@@ -38,7 +38,6 @@ using System.IO;
 using System.Linq;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using Microsoft.Extensions.FileProviders;
 using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IWebHostEnvironment;
 using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IWebHostEnvironment;
 using SameSiteMode = Microsoft.AspNetCore.Http.SameSiteMode;
 using SameSiteMode = Microsoft.AspNetCore.Http.SameSiteMode;
 
 
@@ -161,7 +160,7 @@ namespace Masuit.MyBlogs.Core
             app.UseExceptionHandler("/ServiceUnavailable");
             app.UseExceptionHandler("/ServiceUnavailable");
             ServiceProvider = app.ApplicationServices;
             ServiceProvider = app.ApplicationServices;
 
 
-            //db.Database.Migrate();
+            db.Database.EnsureCreated();
             var dic = db.SystemSetting.ToDictionary(s => s.Name, s => s.Value); //初始化系统设置参数
             var dic = db.SystemSetting.ToDictionary(s => s.Name, s => s.Value); //初始化系统设置参数
             foreach (var (key, value) in dic)
             foreach (var (key, value) in dic)
             {
             {
@@ -173,7 +172,7 @@ namespace Masuit.MyBlogs.Core
             {
             {
                 app.UseHttpsRedirection().UseRewriter(new RewriteOptions().AddRedirectToNonWww()); // URL重写
                 app.UseHttpsRedirection().UseRewriter(new RewriteOptions().AddRedirectToNonWww()); // URL重写
             }
             }
-            
+
             app.UseDefaultFiles().UseStaticFiles(new StaticFileOptions //静态资源缓存策略
             app.UseDefaultFiles().UseStaticFiles(new StaticFileOptions //静态资源缓存策略
             {
             {
                 OnPrepareResponse = context =>
                 OnPrepareResponse = context =>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Shared/_ArticleListItem.cshtml

@@ -39,7 +39,7 @@
                     </span>
                     </span>
                 </div>
                 </div>
                 <p>
                 <p>
-                    @Html.Raw(Model.Content.GetSummary())
+                    @Html.Raw(Model.Content.GetSummary(150, 50))
                 </p>
                 </p>
             </div>
             </div>
         </div>
         </div>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Shared/_ArticleListItem_Admin.cshtml

@@ -41,7 +41,7 @@
                     </span>
                     </span>
                 </div>
                 </div>
                 <p>
                 <p>
-                    @Html.Raw(Model.Content.GetSummary())
+                    @Html.Raw(Model.Content.GetSummary(150, 50))
                 </p>
                 </p>
             </div>
             </div>
         </div>
         </div>