更新用户管理模块

src/NetCorePal.D3Shop.Admin.Shared/Requests/CreateAdminUserRequest.cs

@@ -9,4 +9,9 @@ public class CreateAdminUserRequest
     [Required] public string Phone { get; set; } = string.Empty;
     [Required] public string PassWord { get; set; } = string.Empty;
     public IEnumerable<RoleId> RoleIds { get; set; } = [];
+
+    public string RealName { get; set; } = string.Empty;
+    public int Status { get; set; }
+
+    public string Email { get;  set; } = string.Empty;
 }

src/NetCorePal.D3Shop.Admin.Shared/Responses/AdminUserResponse.cs

@@ -1,18 +1,22 @@
 using NetCorePal.D3Shop.Domain.AggregatesModel.Identity.AdminUserAggregate;
+using NetCorePal.D3Shop.Domain.AggregatesModel.Identity.RoleAggregate;
 
 namespace NetCorePal.D3Shop.Admin.Shared.Responses;
 
-public class AdminUserResponse(AdminUserId id, string name, string phone, IEnumerable<string> roles,string realName)
+public class AdminUserResponse(AdminUserId id, string name, string phone, IEnumerable<string> roles, string realName,int status,string email, DateTimeOffset createdAt)
 {
     public AdminUserId Id { get; } = id;
     public string Name { get; set; } = name;
     public string Phone { get; set; } = phone;
     public IEnumerable<string> Roles { get; set; } = roles;
+
+    public IEnumerable<string> RoleIds { get; set; } = roles;
+
     public string RealName { get; set; } = realName;
 
+    public int Status { get; set; } = status;
+
+    public DateTimeOffset CreatedAt { get; set; } = createdAt;
 
-    /// <summary>
-    /// 这里确认是使用name还是userName
-    /// </summary>
-    public string UserName { get; set; } = name;
+    public string Email { get; private set; } = email;
 }

src/NetCorePal.D3Shop.Domain/AggregatesModel/Identity/AdminUserAggregate/AdminUser.cs

@@ -22,6 +22,12 @@ protected AdminUser()
 
         public string RealName { get; private set; } = string.Empty;
         public string Email { get; private set; } = string.Empty;
+
+        /// <summary>
+        /// 0:已禁用  1:已启用
+        /// </summary>
+        public int Status { get; private set; } = 1;
+
         public DateTimeOffset CreatedAt { get; init; }
         public virtual ICollection<AdminUserRole> Roles { get; } = [];
 
@@ -34,12 +40,15 @@ protected AdminUser()
         public DateTimeOffset? DeletedAt { get; private set; }
 
         public AdminUser(string name, string phone, string password,
-            IEnumerable<AdminUserRole> roles, IEnumerable<AdminUserPermission> permissions)
+            IEnumerable<AdminUserRole> roles, IEnumerable<AdminUserPermission> permissions, string realName, int status, string email)
         {
             CreatedAt = DateTimeOffset.Now;
             Name = name;
             Phone = phone;
             Password = password;
+            RealName = realName;
+            Status = status;
+            Email = email;
             foreach (var adminUserRole in roles)
             {
                 Roles.Add(adminUserRole);

src/NetCorePal.D3Shop.Web/Application/Commands/Identity/Admin/CreateAdminUserCommand.cs

@@ -11,7 +11,10 @@ public record CreateAdminUserCommand(
     string Name,
     string Phone,
     string Password,
-    IEnumerable<AssignAdminUserRoleDto> RolesToBeAssigned)
+    IEnumerable<AssignAdminUserRoleDto> RolesToBeAssigned,
+    string RealName,
+    int Status,
+    string Email)
     : ICommand<AdminUserId>;
 
 public class CreateAdminUserCommandValidator : AbstractValidator<CreateAdminUserCommand>
@@ -42,7 +45,7 @@ public async Task<AdminUserId> Handle(CreateAdminUserCommand request, Cancellati
 
         var adminUser = new AdminUser(request.Name, request.Phone,
             request.Password,
-            adminUserRoles, adminUserPermissions);
+            adminUserRoles, adminUserPermissions,request.RealName, request.Status, request.Email);
 
         await adminUserRepository.AddAsync(adminUser, cancellationToken);
         return adminUser.Id;

src/NetCorePal.D3Shop.Web/Application/Queries/Identity/Admin/AdminUserQuery.cs

@@ -60,7 +60,7 @@ public async Task<PagedData<AdminUserResponse>> GetAllAdminUsersAsync(AdminUserQ
             .WhereIf(!queryRequest.Name.IsNullOrWhiteSpace(), au => au.Name.Contains(queryRequest.Name!))
             .WhereIf(!queryRequest.Phone.IsNullOrWhiteSpace(), au => au.Phone.Contains(queryRequest.Phone!))
             .OrderBy(au => au.Id)
-            .Select(au => new AdminUserResponse(au.Id, au.Name, au.Phone, au.Roles.Select(r => r.RoleName),au.RealName))
+            .Select(au => new AdminUserResponse(au.Id, au.Name, au.Phone, au.Roles.Select(r => r.RoleName),au.RealName,au.Status,au.Email,au.CreatedAt))
             .ToPagedDataAsync(queryRequest, cancellationToken);
         return adminUsers;
     }
@@ -71,7 +71,7 @@ public async Task<PagedData<AdminUserResponse>> GetAllAdminUsersAsync(AdminUserQ
     {
         var adminUsers = await AdminUserSet.AsNoTracking()
             .Where(x => x.Id == id)
-            .Select(au => new AdminUserResponse(au.Id, au.Name, au.Name, au.Roles.Select(r => r.RoleName), au.RealName))
+           .Select(au => new AdminUserResponse(au.Id, au.Name, au.Phone, au.Roles.Select(r => r.RoleName), au.RealName, au.Status, au.Email, au.CreatedAt))
             .FirstOrDefaultAsync(cancellationToken);
         return adminUsers;
     }

src/NetCorePal.D3Shop.Web/Controllers/Identity/Admin/AdminUserController.cs

@@ -37,7 +37,7 @@ public async Task<ResponseData<AdminUserId>> CreateAdminUser([FromBody] CreateAd
 
         var password = PasswordHasher.HashPassword(request.PassWord);
         var adminUserId = await mediator.Send(
-            new CreateAdminUserCommand(request.Name, request.Phone, password, rolesToBeAssigned),
+            new CreateAdminUserCommand(request.Name, request.Phone, password, rolesToBeAssigned,request.RealName,request.Status,request.Email),
             CancellationToken);
 
         return adminUserId.AsResponseData();

src/NetCorePal.D3Shop.Web/Extensions/SeedDatabaseExtension.cs

@@ -16,7 +16,7 @@ internal static IApplicationBuilder SeedDatabase(this IApplicationBuilder app)
             if (!dbContext.AdminUsers.Any(u => u.Name == AppDefaultCredentials.Name))
             {
                 var adminUser = new AdminUser(AppDefaultCredentials.Name, "",
-                    PasswordHasher.HashPassword(AppDefaultCredentials.Password), [], []);
+                    PasswordHasher.HashPassword(AppDefaultCredentials.Password), [], [], "", 1, "");
                 dbContext.AdminUsers.Add(adminUser);
                 dbContext.SaveChanges();
             }

test/NetCorePal.D3Shop.Domain.Tests/Identity/AdminUserTests.cs

@@ -5,7 +5,7 @@ namespace NetCorePal.D3Shop.Domain.Tests.Identity
 {
     public class AdminUserTests
     {
-        private readonly AdminUser _testUser = new("test", "1", "", [], []);
+        private readonly AdminUser _testUser = new("test", "1", "", [], [],"",1,"");
 
         [Fact]
         public void EditRole_Test()

test/NetCorePal.D3Shop.Web.Tests/Identity/AuthTests.cs

@@ -10,7 +10,7 @@ namespace NetCorePal.D3Shop.Web.Tests.Identity;
 public class AuthTests
 {
     private readonly HttpClient _client;
-    private readonly AdminUser _testUser = new("Test", "", "", [], []);
+    private readonly AdminUser _testUser = new("Test", "", "", [], [], "", 1, "");
 
     public AuthTests(MyWebApplicationFactory factory)
     {