懒得勤快 3 years ago
parent
commit
7a2f60f2d7

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

@@ -1015,12 +1015,11 @@ namespace Masuit.MyBlogs.Core.Controllers
                 Title = p.Title,
                 ViewCount = (int)p.AverageViewCount
             }).Cacheable().ToListAsync();
-            var h24 = DateTime.Today.AddDays(-1);
             var trending = await postsQuery.Select(p => new PostModelBase()
             {
                 Id = p.Id,
                 Title = p.Title,
-                ViewCount = p.PostVisitRecordStats.Where(t => t.Date >= h24).Sum(e => e.Count)
+                ViewCount = p.PostVisitRecordStats.Where(t => t.Date >= DateTime.Today).Sum(e => e.Count)
             }).OrderByDescending(p => p.ViewCount).Take(10).Cacheable().ToListAsync();
             return ResultData(new
             {

+ 4 - 3
src/Masuit.MyBlogs.Core/Extensions/Hangfire/HangfireBackJob.cs

@@ -115,9 +115,10 @@ namespace Masuit.MyBlogs.Core.Extensions.Hangfire
         /// <param name="url"></param>
         public void RecordPostVisit(int pid, string ip, string refer, string url)
         {
-            var time = DateTime.Now.AddMonths(-3);
-            _recordService.GetQuery(b => b.Time < time).DeleteFromQuery();
-            _recordStatsService.GetQuery(b => b.Date < time).DeleteFromQuery();
+            var lastQuarter = DateTime.Now.AddMonths(-3);
+            var lastYear = DateTime.Now.AddYears(-1);
+            _recordService.GetQuery(b => b.Time < lastQuarter).DeleteFromQuery();
+            _recordStatsService.GetQuery(b => b.Date < lastYear).DeleteFromQuery();
             var post = _postService.GetById(pid);
             if (post == null)
             {

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

@@ -46,7 +46,7 @@
         <PackageReference Include="CLRStats" Version="1.0.0" />
         <PackageReference Include="CSRedisCore" Version="3.6.8" />
         <PackageReference Include="EFCoreSecondLevelCacheInterceptor" Version="3.2.4" />
-        <PackageReference Include="Hangfire" Version="1.7.27" />
+        <PackageReference Include="Hangfire" Version="1.7.28" />
         <PackageReference Include="Hangfire.MemoryStorage" Version="1.7.0" />
         <PackageReference Include="htmldiff.net-core" Version="1.3.6" />
         <PackageReference Include="IP2Region" Version="1.2.0" />
@@ -63,7 +63,7 @@
         <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
         <PackageReference Include="PanGu.HighLight" Version="1.0.0" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
-        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.14" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.15" />
         <PackageReference Include="TimeZoneConverter" Version="3.5.0" />
         <PackageReference Include="WilderMinds.RssSyndication" Version="1.7.0" />
         <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.13.4" />

+ 1 - 1
src/Masuit.MyBlogs.Core/Startup.cs

@@ -79,7 +79,7 @@ namespace Masuit.MyBlogs.Core
             services.AddEFSecondLevelCache(options => options.UseCustomCacheProvider<MyEFCacheManagerCoreProvider>(CacheExpirationMode.Absolute, TimeSpan.FromMinutes(5)).DisableLogging(true));
             services.AddDbContext<DataContext>((serviceProvider, opt) =>
             {
-                opt.UseMySql(AppConfig.ConnString, ServerVersion.AutoDetect(AppConfig.ConnString), builder => builder.EnableRetryOnFailure(5)).AddInterceptors(serviceProvider.GetRequiredService<SecondLevelCacheInterceptor>()).EnableSensitiveDataLogging();
+                opt.UseMySql(AppConfig.ConnString, ServerVersion.AutoDetect(AppConfig.ConnString), builder => builder.EnableRetryOnFailure(10)).AddInterceptors(serviceProvider.GetRequiredService<SecondLevelCacheInterceptor>()).EnableSensitiveDataLogging();
             }); //配置数据库
             services.ConfigureOptions();
             services.AddHttpsRedirection(options =>