完成第八章

SpringFarSoft · Jul 2, 2021 · e1a3b43 · e1a3b43
1 parent e892ebd
commit e1a3b43
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 65 deletions.
diff --git a/SwiftCode.BBS.API/Controllers/AuthController.cs b/SwiftCode.BBS.API/Controllers/AuthController.cs
@@ -77,7 +77,7 @@ public async Task<MessageModel<string>> Login(string loginName, string loginPass
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<MessageModel<string>> Register(RegisterInputDto input)
+        public async Task<MessageModel<string>> Register(CreateUserInfoInputDto input)
         {
             var userInfo = await _userInfoService.FindAsync(x => x.LoginName == input.LoginName);
             if (userInfo != null)

diff --git a/SwiftCode.BBS.API/Controllers/UserInfoController.cs b/SwiftCode.BBS.API/Controllers/UserInfoController.cs
@@ -65,7 +65,7 @@ public async Task<MessageModel<UserInfoDetailsDto>> GetAsync()
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPut]
-        public async Task<MessageModel<string>> UpdateAsync(UserInfoInputDto input)
+        public async Task<MessageModel<string>> UpdateAsync(UpdateUserInfoInputDto input)
         {
             var token = JwtHelper.ParsingJwtToken(HttpContext);
             var userInfo = await _userInfoService.GetAsync(x => x.Id == token.Uid);

diff --git a/SwiftCode.BBS.API/SwiftCode.BBS.API.xml b/SwiftCode.BBS.API/SwiftCode.BBS.API.xml
diff --git a/SwiftCode.BBS.EntityFramework/SwiftCodeBbsContext.cs b/SwiftCode.BBS.EntityFramework/SwiftCodeBbsContext.cs
@@ -13,10 +13,19 @@ public SwiftCodeBbsContext(DbContextOptions<SwiftCodeBbsContext> options)
         {
 
         }
+        public DbSet<UserInfo> UserInfos { get; set; }
+
         public DbSet<Article> Articles { get; set; }
 
         public DbSet<Question> Questions { get; set; }
 
+        public DbSet<ArticleComment> ArticleComments { get; set; }
+
+        public DbSet<QuestionComment> QuestionComments { get; set; }
+
+        public DbSet<Advertisement> Advertisements { get; set; }
+
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             // 用户

diff --git a/SwiftCode.BBS.Extensions/AutoMapper/UserInfoProfile.cs b/SwiftCode.BBS.Extensions/AutoMapper/UserInfoProfile.cs
@@ -16,7 +16,7 @@ public class UserInfoProfile : Profile
         /// </summary>
         public UserInfoProfile()
         {
-            CreateMap<RegisterInputDto, UserInfo>();
+            CreateMap<CreateUserInfoInputDto, UserInfo>();
             CreateMap<UserInfo, UserInfoDto>();
 
             CreateMap<UserInfo, UserInfoDetailsDto>();

diff --git a/SwiftCode.BBS.Extensions/ServiceExtensions/AutofacModuleRegister.cs b/SwiftCode.BBS.Extensions/ServiceExtensions/AutofacModuleRegister.cs
@@ -20,7 +20,6 @@ public class AutofacModuleRegister: Autofac.Module
         protected override void Load(ContainerBuilder builder)
         {
 
-            var basePath = AppContext.BaseDirectory;
             builder.RegisterGeneric(typeof(BaseRepository<>)).As(typeof(IBaseRepository<>)).InstancePerDependency();
             builder.RegisterGeneric(typeof(BaseServices<>)).As(typeof(IBaseServices<>)).InstancePerDependency();
 

diff --git a/SwiftCode.BBS.IRepositories/BASE/IBaseRepository.cs b/SwiftCode.BBS.IRepositories/BASE/IBaseRepository.cs
@@ -36,6 +36,7 @@ public  interface IBaseRepository<TEntity> where TEntity : class
         Task<List<TEntity>> GetPagedListAsync(int skipCount, int maxResultCount, string sorting, CancellationToken cancellationToken = default);
 
         Task<long> GetCountAsync(CancellationToken cancellationToken = default);
-        Task<long> GetCountAsync<TEntity>(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken) where TEntity : class, new();
+
+        Task<long> GetCountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken);
     }
 }
diff --git a/SwiftCode.BBS.Model/SwiftCode.BBS.Model.xml b/SwiftCode.BBS.Model/SwiftCode.BBS.Model.xml
diff --git a/SwiftCode.BBS.Model/ViewModels/PagedDto.cs b/SwiftCode.BBS.Model/ViewModels/PagedDto.cs
diff --git a/...l/ViewModels/UserInfo/RegisterInputDto.cs → ...Models/UserInfo/CreateUserInfoInputDto.cs b/...l/ViewModels/UserInfo/RegisterInputDto.cs → ...Models/UserInfo/CreateUserInfoInputDto.cs
@@ -6,7 +6,7 @@
 
 namespace SwiftCode.BBS.Model.ViewModels.UserInfo
 {
-    public class RegisterInputDto
+    public class CreateUserInfoInputDto
     {
         /// <summary>
         /// 用户名

diff --git a/SwiftCode.BBS.Model/ViewModels/UserInfo/TokenInfoViewModel.cs b/SwiftCode.BBS.Model/ViewModels/UserInfo/TokenInfoViewModel.cs
diff --git a/...l/ViewModels/UserInfo/UserInfoInputDto.cs → ...Models/UserInfo/UpdateUserInfoInputDto.cs b/...l/ViewModels/UserInfo/UserInfoInputDto.cs → ...Models/UserInfo/UpdateUserInfoInputDto.cs
@@ -6,7 +6,7 @@
 
 namespace SwiftCode.BBS.Model.ViewModels.UserInfo
 {
-    public  class UserInfoInputDto
+    public  class UpdateUserInfoInputDto
     {
         /// <summary>
         /// 个人介绍

diff --git a/SwiftCode.BBS.Repositories/BASE/BaseRepository.cs b/SwiftCode.BBS.Repositories/BASE/BaseRepository.cs
@@ -116,7 +116,12 @@ public Task<TEntity> FindAsync(Expression<Func<TEntity, bool>> predicate, Cancel
         {
             return _context.Set<TEntity>().Where(predicate).SingleOrDefaultAsync(cancellationToken);
         }
-
+        /// <summary>
+        /// 数据不存在会抛出异常
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
         public async Task<TEntity> GetAsync(Expression<Func<TEntity, bool>> predicate,  CancellationToken cancellationToken = default)
         {
             var entity = await FindAsync(predicate, cancellationToken);
@@ -150,7 +155,7 @@ public Task<long> GetCountAsync(CancellationToken cancellationToken = default)
             return _context.Set<TEntity>().LongCountAsync(cancellationToken);
         }
 
-        public Task<long> GetCountAsync<TEntity1>(Expression<Func<TEntity1, bool>> predicate, CancellationToken cancellationToken) where TEntity1 : class, new()
+        public Task<long> GetCountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken)
         {
             return _context.Set<TEntity>().Where(predicate).LongCountAsync(cancellationToken);
         }