Browse Source

修正bug

懒得勤快 6 years ago
parent
commit
ab71e96975

+ 1 - 10
src/Masuit.MyBlogs.Core/Controllers/HomeController.cs

@@ -65,7 +65,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [ResponseCache(Duration = 600, VaryByQueryKeys = new[] { "orderBy" }, VaryByHeader = HeaderNames.Cookie)]
         public ActionResult Index(OrderBy orderBy = OrderBy.ModifyDate)
         {
-            //ViewBag.Total = 0;
+            ViewBag.Total = PostService.Count(p => p.Status == Status.Pended);
             UserInfoOutputDto user = HttpContext.Session.Get<UserInfoOutputDto>(SessionKey.UserInfo) ?? new UserInfoOutputDto();
             var banners = BannerService.GetAllFromL2CacheNoTracking(b => Guid.NewGuid()).ToList();
             List<FastShare> fastShares = FastShareService.GetAllFromL2CacheNoTracking(s => s.Sort).ToList();
@@ -189,7 +189,6 @@ namespace Masuit.MyBlogs.Core.Controllers
         private IndexPageViewModel GetIndexPageViewModel(int page, int size, OrderBy orderBy, UserInfoOutputDto user)
         {
             IQueryable<PostOutputDto> postList = PostService.LoadEntities<PostOutputDto>(p => (p.Status == Status.Pended || user.IsAdmin)); //准备文章的查询
-            ViewBag.Total = postList.Count();
             var notices = NoticeService.LoadPageEntitiesFromL2Cache<DateTime, NoticeOutputDto>(1, 5, out int _, n => (n.Status == Status.Display || user.IsAdmin), n => n.ModifyDate, false).ToList(); //加载前5条公告
             var cats = CategoryService.LoadEntitiesFromL2Cache<string, CategoryOutputDto>(c => c.Status == Status.Available, c => c.Name).ToList(); //加载分类目录
             var start = DateTime.Today.AddDays(-7);
@@ -209,11 +208,6 @@ 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 tags = new List<string>(); //标签云
             var tagdic = new Dictionary<string, int>();
             var newdic = new Dictionary<string, int>(); //标签云最终结果
@@ -271,9 +265,6 @@ namespace Masuit.MyBlogs.Core.Controllers
                 Posts = posts,
                 Tags = newdic,
                 Top6Post = hot6Post,
-                //TopPostByMonth = topPostMonth,
-                //TopPostByWeek = topPostWeek,
-                //TopPostByToday = topPostToday,
                 PostsQueryable = postList
             };
         }

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

@@ -55,7 +55,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                 var ip = HttpContext.Connection.RemoteIpAddress.MapToIPv4().ToString();
 #if DEBUG
                 Random r = new Random();
-                ip = $"{r.StrictNext(210)}.{r.StrictNext(255)}.{r.StrictNext(255)}.{r.StrictNext(255)}";
+                ip = $"{r.Next(210)}.{r.Next(255)}.{r.Next(255)}.{r.Next(255)}";
 #endif
                 PhysicsAddress address = await ip.GetPhysicsAddressInfo();
                 return View(address);
@@ -84,7 +84,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                 var ip = HttpContext.Connection.RemoteIpAddress.MapToIPv4().ToString();
 #if DEBUG
                 Random r = new Random();
-                ip = $"{r.StrictNext(210)}.{r.StrictNext(255)}.{r.StrictNext(255)}.{r.StrictNext(255)}";
+                ip = $"{r.Next(210)}.{r.Next(255)}.{r.Next(255)}.{r.Next(255)}";
 #endif
                 PhysicsAddress address = await ip.GetPhysicsAddressInfo();
                 if (address?.Status == 0)

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

@@ -62,7 +62,7 @@
 
   <ItemGroup>
     <PackageReference Include="Aspose.Words" Version="18.11.0" />
-    <PackageReference Include="Autofac" Version="4.9.1" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
     <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Caching.Memory" Version="1.2.0" />
@@ -70,7 +70,7 @@
     <PackageReference Include="CSRedisCore" Version="3.0.46" />
     <PackageReference Include="Dapper" Version="1.60.1" />
     <PackageReference Include="EFSecondLevelCache.Core" Version="1.7.1" />
-    <PackageReference Include="Hangfire" Version="1.6.23" />
+    <PackageReference Include="Hangfire" Version="1.6.24" />
     <PackageReference Include="Hangfire.Autofac" Version="2.3.1" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.6.0" />
     <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.0" />
@@ -82,7 +82,7 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="WilderMinds.RssSyndication" Version="1.5.0" />
-    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="2.1.58" />
+    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="2.1.59" />
     <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="1.8.18" />
     <PackageReference Include="Z.ExtensionMethods" Version="2.1.1" />
   </ItemGroup>