移除无用代码

src/Masuit.MyBlogs.Core/Configs/MappingProfile.cs

@@ -30,14 +30,12 @@ namespace Masuit.MyBlogs.Core.Configs
             CreateMap<LeaveMessageCommand, LeaveMessageDto>().ReverseMap();
             CreateMap<LeaveMessage, LeaveMessageViewModel>().ForMember(l => l.PostDate, e => e.MapFrom(l => l.PostDate.ToString("yyyy-MM-dd HH:mm:ss"))).ReverseMap();
 
-            CreateMap<Links, LinksCommand>().ReverseMap();
             CreateMap<Links, LinksDto>().ForMember(e => e.Loopbacks, e => e.MapFrom(m => m.Loopbacks.GroupBy(e =>
                 e.IP).Count())).ReverseMap();
 
             CreateMap<MenuCommand, Menu>().ForMember(c => c.ParentId, e => e.MapFrom(c => c.ParentId > 0 ? c.ParentId : null)).ReverseMap();
             CreateMap<Menu, MenuDto>().ForMember(m => m.Children, e => e.MapFrom(m => m.Children.OrderBy(c => c.Sort).ToList())).ReverseMap();
 
-            CreateMap<Misc, MiscCommand>().ReverseMap();
             CreateMap<Misc, MiscDto>().ReverseMap();
 
             CreateMap<Notice, NoticeDto>().ReverseMap();
@@ -48,7 +46,6 @@ namespace Masuit.MyBlogs.Core.Configs
             CreateMap<Post, PostDto>().ForMember(p => p.CategoryName, e => e.MapFrom(p => p.Category.Name)).ForMember(p => p.LimitMode, e => e.MapFrom(p => p.LimitMode ?? RegionLimitMode.All)).ForMember(p => p.Category, e => e.Ignore()).ReverseMap();
             CreateMap<PostCommand, PostDto>().ReverseMap();
             CreateMap<PostHistoryVersion, PostDto>().ForMember(p => p.CategoryName, e => e.MapFrom(p => p.Category.Name)).ReverseMap();
-            CreateMap<Post, PostViewModel>().ForMember(p => p.CategoryName, e => e.MapFrom(p => p.Category.Name)).ForMember(p => p.PostDate, e => e.MapFrom(p => p.PostDate.ToString("yyyy-MM-dd HH:mm:ss"))).ForMember(p => p.ModifyDate, e => e.MapFrom(p => p.ModifyDate.ToString("yyyy-MM-dd HH:mm:ss"))).ReverseMap();
             CreateMap<Post, PostDataModel>().ForMember(p => p.ModifyDate, e => e.MapFrom(p => p.ModifyDate))
                 .ForMember(p => p.PostDate, e => e.MapFrom(p => p.PostDate))
                 .ForMember(p => p.Status, e => e.MapFrom(p => p.Status.GetDisplay()))
@@ -57,20 +54,17 @@ namespace Masuit.MyBlogs.Core.Configs
                 .ForMember(p => p.Seminars, e => e.MapFrom(p => p.Seminar.Select(s => s.Id).ToArray()))
                 .ForMember(p => p.LimitDesc, e => e.MapFrom(p => p.LimitMode > RegionLimitMode.All ? string.Format(p.LimitMode.GetDescription(), p.Regions, p.ExceptRegions) : "无限制"));
 
-            CreateMap<SearchDetails, SearchDetailsCommand>().ReverseMap();
             CreateMap<SearchDetails, SearchDetailsDto>().ReverseMap();
-            CreateMap<SearchDetailsCommand, SearchDetailsDto>().ReverseMap();
 
-            CreateMap<UserInfo, UserInfoCommand>().ReverseMap();
             CreateMap<UserInfo, UserInfoDto>();
-            CreateMap<UserInfoDto, UserInfo>().ForMember(u => u.Id, e => e.Ignore()).ForMember(u => u.Password, e => e.Ignore()).ForMember(u => u.SaltKey, e => e.Ignore());
-            CreateMap<UserInfoCommand, UserInfoDto>().ReverseMap();
+            CreateMap<UserInfoDto, UserInfo>()
+                .ForMember(u => u.Id, e => e.Ignore())
+                .ForMember(u => u.Password, e => e.Ignore())
+                .ForMember(u => u.SaltKey, e => e.Ignore());
 
             CreateMap<LoginRecord, LoginRecordViewModel>().ReverseMap();
 
-            CreateMap<Seminar, SeminarCommand>().ReverseMap();
             CreateMap<Seminar, SeminarDto>().ReverseMap();
-            CreateMap<SeminarCommand, SeminarDto>().ReverseMap();
 
             CreateMap<PostMergeRequestCommandBase, PostMergeRequest>().ForMember(p => p.Id, e => e.Ignore()).ForMember(p => p.MergeState, e => e.Ignore()).ReverseMap();
             CreateMap<PostMergeRequestCommand, PostMergeRequest>().ForMember(p => p.Id, e => e.Ignore()).ForMember(p => p.MergeState, e => e.Ignore()).ReverseMap();
@@ -80,7 +74,9 @@ namespace Masuit.MyBlogs.Core.Configs
             CreateMap<PostMergeRequest, Post>().ForMember(p => p.Id, e => e.Ignore()).ForMember(p => p.Status, e => e.Ignore()).ReverseMap();
             CreateMap<Post, PostMergeRequestDto>().ReverseMap();
 
-            CreateMap<Advertisement, AdvertisementViewModel>().ForMember(m => m.AverageViewCount, e => e.MapFrom(a => a.ClickRecords.GroupBy(r => r.Time.Date).Select(g => g.Count()).DefaultIfEmpty().Average())).ForMember(m => m.ViewCount, e => e.MapFrom(a => a.ClickRecords.Count));
+            CreateMap<Advertisement, AdvertisementViewModel>()
+                .ForMember(m => m.AverageViewCount, e => e.MapFrom(a => a.ClickRecords.Where(o => o.Time >= DateTime.Today.AddMonths(-1)).GroupBy(r => r.Time.Date).Select(g => g.Count()).DefaultIfEmpty().Average()))
+                .ForMember(m => m.ViewCount, e => e.MapFrom(a => a.ClickRecords.Count(o => o.Time >= DateTime.Today.AddMonths(-1))));
             CreateMap<AdvertisementDto, Advertisement>().ForMember(a => a.ClickRecords, e => e.Ignore()).ForMember(a => a.Status, e => e.Ignore()).ForMember(a => a.UpdateTime, e => e.MapFrom(a => DateTime.Now));
 
             CreateMap<Donate, DonateDto>();

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

@@ -181,8 +181,6 @@ public class AdvertisementController : BaseController
     /// 导出广告访问记录
     /// </summary>
     /// <param name="id"></param>
-    /// <param name="page"></param>
-    /// <param name="size"></param>
     /// <returns></returns>
     [HttpGet("/partner/{id}/records-export"), MyAuthorize]
     public IActionResult ExportClickRecords(int id)

src/Masuit.MyBlogs.Core/Models/Command/LinksCommand.cs

@@ -1,35 +0,0 @@
-using Masuit.MyBlogs.Core.Models.Entity;
-using Masuit.MyBlogs.Core.Models.Enum;
-using System.ComponentModel.DataAnnotations;
-
-namespace Masuit.MyBlogs.Core.Models.Command
-{
-    /// <summary>
-    /// 友情链接
-    /// </summary>
-    public class LinksCommand : BaseEntity
-    {
-        public LinksCommand()
-        {
-            Status = Status.Available;
-            Except = false;
-        }
-
-        /// <summary>
-        /// 名字
-        /// </summary>
-        [Required(ErrorMessage = "站点名不能为空！"), MaxLength(16, ErrorMessage = "站点名称最长只能是16个字符！"), MinLength(2, ErrorMessage = "站点名称至少2个字")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// URL
-        /// </summary>
-        [Required(ErrorMessage = "站点的URL不能为空！"), StringLength(256, ErrorMessage = "URL最长支持256个字符！")]
-        public string Url { get; set; }
-
-        /// <summary>
-        /// 是否检测白名单
-        /// </summary>
-        public bool Except { get; set; }
-    }
-}

src/Masuit.MyBlogs.Core/Models/Command/MiscCommand.cs

@@ -1,30 +0,0 @@
-using Masuit.MyBlogs.Core.Models.Entity;
-using Masuit.MyBlogs.Core.Models.Enum;
-using Masuit.MyBlogs.Core.Models.Validation;
-using System.ComponentModel.DataAnnotations;
-
-namespace Masuit.MyBlogs.Core.Models.Command
-{
-    /// <summary>
-    /// 杂项页输入模型
-    /// </summary>
-    public class MiscCommand : BaseEntity
-    {
-        public MiscCommand()
-        {
-            Status = Status.Display;
-        }
-
-        /// <summary>
-        /// 标题
-        /// </summary>
-        [Required(ErrorMessage = "标题不能为空！"), MaxLength(64, ErrorMessage = "标题最长支持64个字符！"), MinLength(4, ErrorMessage = "标题至少4个字符！")]
-        public string Title { get; set; }
-
-        /// <summary>
-        /// 内容
-        /// </summary>
-        [Required(ErrorMessage = "内容不能为空！"), SubmitCheck(100000, false)]
-        public string Content { get; set; }
-    }
-}

src/Masuit.MyBlogs.Core/Models/Command/SearchDetailsCommand.cs

@@ -1,31 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Masuit.MyBlogs.Core.Models.Command
-{
-    /// <summary>
-    /// 搜索详细记录输入模型
-    /// </summary>
-    public class SearchDetailsCommand
-    {
-        public SearchDetailsCommand()
-        {
-            SearchTime = DateTime.Now;
-        }
-
-        /// <summary>
-        /// 关键词
-        /// </summary>
-        [Required(ErrorMessage = "关键词不能为空"), MaxLength(64, ErrorMessage = "关键词最大允许64个字符")]
-        public string Keywords { get; set; }
-
-        /// <summary>
-        /// 搜索时间
-        /// </summary>
-        public DateTime SearchTime { get; set; }
-
-        /// <summary>
-        /// 访问者IP
-        /// </summary>
-        public string IP { get; set; }
-    }
-}

src/Masuit.MyBlogs.Core/Models/Command/SeminarCommand.cs

@@ -1,28 +0,0 @@
-using Masuit.MyBlogs.Core.Models.DTO;
-using System.ComponentModel.DataAnnotations;
-
-namespace Masuit.MyBlogs.Core.Models.Command
-{
-    /// <summary>
-    /// 文章专题输入模型
-    /// </summary>
-    public partial class SeminarCommand : BaseDto
-    {
-        /// <summary>
-        /// 专题名称
-        /// </summary>
-        [Required(ErrorMessage = "专题名称不能为空！"), MinLength(2, ErrorMessage = "专题名称至少2个字符！"), MaxLength(16, ErrorMessage = "专题名称最多16个字符！")]
-        public string Title { get; set; }
-
-        /// <summary>
-        /// 专题子标题
-        /// </summary>
-        public string SubTitle { get; set; }
-
-        /// <summary>
-        /// 专题描述
-        /// </summary>
-        [Required(ErrorMessage = "专题描述不能为空！"), MinLength(15, ErrorMessage = "专题描述至少15个字符！"), MaxLength(1500, ErrorMessage = "专题描述最多1500个字符！")]
-        public string Description { get; set; }
-    }
-}

src/Masuit.MyBlogs.Core/Models/Command/UserInfoCommand.cs

@@ -1,68 +0,0 @@
-using Masuit.Tools.Core.Validator;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Masuit.MyBlogs.Core.Models.Command
-{
-    /// <summary>
-    /// 用户信息输入模型
-    /// </summary>
-    public class UserInfoCommand
-    {
-        public UserInfoCommand()
-        {
-            IsAdmin = false;
-        }
-
-        /// <summary>
-        /// 用户名
-        /// </summary>
-        [Required(ErrorMessage = "用户名不能为空！"), MinLength(2, ErrorMessage = "用户名至少2个字符！"), MaxLength(24, ErrorMessage = "用户名最多允许24个字符")]
-        public string Username { get; set; }
-
-        /// <summary>
-        /// 显示名称
-        /// </summary>
-        [Required(ErrorMessage = "昵称不能为空！"), MinLength(2, ErrorMessage = "昵称至少2个字符！"), MaxLength(48, ErrorMessage = "昵称最多允许48个字符")]
-        public string NickName { get; set; }
-
-        /// <summary>
-        /// 密码
-        /// </summary>
-        [Required(ErrorMessage = "密码不能为空！"), ComplexPassword]
-        public string Password { get; set; }
-
-        /// <summary>
-        /// 加密盐
-        /// </summary>
-        [Required]
-        public string SaltKey { get; set; }
-
-        /// <summary>
-        /// 是否是管理员
-        /// </summary>
-        [DefaultValue(false)]
-        public bool IsAdmin { get; set; }
-
-        /// <summary>
-        /// 邮箱
-        /// </summary>
-        [IsEmail]
-        public string Email { get; set; }
-
-        /// <summary>
-        /// QQ或微信
-        /// </summary>
-        public string QQorWechat { get; set; }
-
-        /// <summary>
-        /// 用户头像
-        /// </summary>
-        public string Avatar { get; set; }
-
-        /// <summary>
-        /// AccessToken，接入第三方登陆时用
-        /// </summary>
-        public string AccessToken { get; set; }
-    }
-}

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

@@ -1,15 +0,0 @@
-using Masuit.MyBlogs.Core.Models.DTO;
-
-namespace Masuit.MyBlogs.Core.Models.ViewModel
-{
-    /// <summary>
-    /// 页脚视图模型
-    /// </summary>
-    public class PageFootViewModel
-    {
-        /// <summary>
-        /// 友情链接
-        /// </summary>
-        public IList<LinksDto> Links { get; set; }
-    }
-}

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

@@ -1,85 +0,0 @@
-using Masuit.MyBlogs.Core.Models.Entity;
-
-namespace Masuit.MyBlogs.Core.Models.ViewModel
-{
-    /// <summary>
-    /// 文章视图模型
-    /// </summary>
-    public class PostViewModel : BaseEntity
-    {
-        /// <summary>
-        /// 标题
-        /// </summary>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// 作者
-        /// </summary>
-        public string Author { get; set; }
-
-        /// <summary>
-        /// 内容
-        /// </summary>
-        public string Content { get; set; }
-
-        /// <summary>
-        /// 分类id
-        /// </summary>
-        public int CategoryId { get; set; }
-
-        /// <summary>
-        /// 浏览次数
-        /// </summary>
-        public int ViewCount { get; set; }
-
-        /// <summary>
-        /// 发表时间
-        /// </summary>
-        public string PostDate { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public string ModifyDate { get; set; }
-
-        /// <summary>
-        /// 是否置顶
-        /// </summary>
-        public bool IsFixedTop { get; set; }
-
-        /// <summary>
-        /// 作者邮箱
-        /// </summary>
-        public string Email { get; set; }
-
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string Label { get; set; }
-
-        /// <summary>
-        /// 支持数
-        /// </summary>
-        public int VoteUpCount { get; set; }
-
-        /// <summary>
-        /// 反对数
-        /// </summary>
-        public int VoteDownCount { get; set; }
-
-        /// <summary>
-        /// 最后访问时间
-        /// </summary>
-        public DateTime LastAccessTime { get; set; }
-
-        /// <summary>
-        /// 禁止评论
-        /// </summary>
-        public bool DisableComment { get; set; }
-
-        /// <summary>
-        /// 所属分类名
-        /// </summary>
-        public string CategoryName { get; set; }
-    }
-}