feat 外包人员,框架升级

Src/Dlhis.Sys/Identity/Controllers/RolesController.cs

@@ -1,7 +1,7 @@
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
-using Dlhis.User.Identity.Services;
-using Kurisu.Core.DataAccess.Dto;
+using Dlhis.Sys.Identity.Services;
+using Kurisu.AspNetCore.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -52,7 +52,7 @@ public class RolesController : ControllerBase
     /// <returns></returns>
     [Authorize(Roles = "admin")]
     [HttpPost("assign")]
-    public async Task AssignRole(AssignRoleRequest request)
+    public async Task AssignRole(RoleAssignRequest request)
     {
         await _roleService.AssignRoleAsync(request);
     }
@@ -75,7 +75,7 @@ public class RolesController : ControllerBase
     /// <returns></returns>
     [Authorize(Roles = "admin")]
     [HttpPost("delete")]
-    public async Task RemoveRole(RoleRemoveRequest request)
+    public async Task RemoveRole(IdRequest request)
     {
         await _roleService.RemoveRoleAsync(request);
     }

Src/Dlhis.Sys/Identity/Controllers/TenantsController.cs

@@ -1,7 +1,7 @@
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
 using Dlhis.Sys.Identity.Services;
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

Src/Dlhis.Sys/Identity/Controllers/UsersController.cs

@@ -1,7 +1,7 @@
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
 using Dlhis.Sys.Identity.Services;
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

Src/Dlhis.Sys/Identity/Request/AssignRoleRequest.cs

@@ -1,8 +0,0 @@
-namespace Dlhis.Sys.Identity.Request;
-
-public class AssignRoleRequest
-{
-    public int UserId { get; set; }
-
-    public int? RoleId { get; set; }
-}

Src/Dlhis.Sys/Identity/Request/ClientGrantRequest.cs

@@ -1,10 +0,0 @@
-namespace Dlhis.Sys.Identity.Request;
-
-public class ClientGrantRequest
-{
-    public string ClientId { get; set; }
-
-    public string ClientSecret { get; set; }
-
-    public string Scope { get; set; } = "yikatong";
-}

Src/Dlhis.Sys/Identity/Request/IdRequest.cs

@@ -0,0 +1,6 @@
+namespace Dlhis.Sys.Identity.Request;
+
+public class IdRequest
+{
+    public int? Id { get; set; }
+}

Src/Dlhis.Sys/Identity/Request/RoleAssignRequest.cs

@@ -0,0 +1,14 @@
+namespace Dlhis.Sys.Identity.Request;
+
+public class RoleAssignRequest
+{
+    /// <summary>
+    /// 用户id
+    /// </summary>
+    public int UserId { get; set; }
+
+    /// <summary>
+    /// 角色id
+    /// </summary>
+    public int? RoleId { get; set; }
+}

Src/Dlhis.Sys/Identity/Request/RolePageRequest.cs

@@ -1,4 +1,4 @@
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 
 namespace Dlhis.Sys.Identity.Request;
 

Src/Dlhis.Sys/Identity/Request/RoleRemoveRequest.cs

@@ -1,6 +0,0 @@
-namespace Dlhis.Sys.Identity.Request;
-
-public class RoleRemoveRequest
-{
-    public int Id { get; set; }
-}

Src/Dlhis.Sys/Identity/Request/RoleSaveRequest.cs

@@ -2,13 +2,17 @@
 
 namespace Dlhis.Sys.Identity.Request;
 
-public class RoleSaveRequest
+public class RoleSaveRequest : IdRequest
 {
-    public int? Id { get; set; }
-
+    /// <summary>
+    /// 角色名称
+    /// </summary>
     [Required(ErrorMessage = "角色标识不能为空")]
     public string Name { get; set; }
 
+    /// <summary>
+    /// 描述
+    /// </summary>
     [Required(ErrorMessage = "描述不能为空")]
     public string Description { get; set; }
-}
+}

Src/Dlhis.Sys/Identity/Request/TenantPageRequest.cs

@@ -1,8 +1,7 @@
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 
-namespace Dlhis.Sys.Identity.Request
+namespace Dlhis.Sys.Identity.Request;
+
+public class TenantPageRequest : PageDto
 {
-    public class TenantPageRequest : PageDto
-    {
-    }
-}
+}

Src/Dlhis.Sys/Identity/Request/TenantSaveRequest.cs

@@ -2,10 +2,8 @@
 
 namespace Dlhis.Sys.Identity.Request;
 
-public class TenantSaveRequest
+public class TenantSaveRequest : IdRequest
 {
-    public int? Id { get; set; }
-
     /// <summary>
     /// 上级
     /// </summary>
@@ -22,4 +20,4 @@ public class TenantSaveRequest
     /// </summary>
     [Required(ErrorMessage = "基地/租户名称不能为空")]
     public string Name { get; set; }
-}
+}

Src/Dlhis.Sys/Identity/Request/UserAvatarUploadRequest.cs

@@ -1,18 +1,18 @@
 using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity;
 
 namespace Dlhis.Sys.Identity.Request;
 
-public class UserAvatarUploadRequest
+public class UserAvatarUploadRequest : IImageUrl
 {
     /// <summary>
     /// 用户id
     /// </summary>
-    [Range(1, int.MaxValue)]
-    public int UserNo { get; set; }
+    public int UserId { get; set; }
 
     /// <summary>
     /// 图片地址
     /// </summary>
     [Required(ErrorMessage = "图片地址不能为空")]
-    public string Picture { get; set; }
-}
+    public string ImageUrl { get; set; }
+}

Src/Dlhis.Sys/Identity/Request/UserPageRequest.cs

@@ -1,4 +1,4 @@
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 
 namespace Dlhis.Sys.Identity.Request;
 

Src/Dlhis.Sys/Identity/Request/UserTenantSaveRequest.cs

@@ -1,9 +1,14 @@
-namespace Dlhis.Sys.Identity.Request
-{
-    public class UserTenantSaveRequest
-    {
-        public int UserId { get; set; }
+namespace Dlhis.Sys.Identity.Request;
 
-        public List<string> TenantCodes { get; set; } = new();
-    }
+public class UserTenantSaveRequest
+{
+    /// <summary>
+    /// 用户id
+    /// </summary>
+    public int UserId { get; set; }
+
+    /// <summary>
+    /// 租户codes
+    /// </summary>
+    public List<string> TenantCodes { get; set; } = new();
 }

Src/Dlhis.Sys/Identity/Services/IRoleService.cs

@@ -1,8 +1,8 @@
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 
-namespace Dlhis.User.Identity.Services;
+namespace Dlhis.Sys.Identity.Services;
 
 public interface IRoleService : IScopeDependency
 {
@@ -14,7 +14,7 @@ public interface IRoleService : IScopeDependency
 
     Task<RoleResponse> GetMyRoleAsync(int? userId);
 
-    Task RemoveRoleAsync(RoleRemoveRequest request);
+    Task RemoveRoleAsync(IdRequest request);
 
-    Task AssignRoleAsync(AssignRoleRequest request);
+    Task AssignRoleAsync(RoleAssignRequest request);
 }

Src/Dlhis.Sys/Identity/Services/ITenantService.cs

@@ -1,6 +1,6 @@
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 
 namespace Dlhis.Sys.Identity.Services;
 

Src/Dlhis.Sys/Identity/Services/IUserService.cs

@@ -1,6 +1,6 @@
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
-using Kurisu.Core.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
 
 namespace Dlhis.Sys.Identity.Services;
 

Src/Dlhis.Sys/Identity/Services/Implements/RoleService.cs

@@ -1,13 +1,12 @@
 using Dlhis.Entity.Sys.Entities;
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
-using Dlhis.User.Identity.Services;
+using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.Utils.Extensions;
-using Kurisu.Core.CustomClass;
-using Kurisu.Core.DataAccess.Dto;
-using Kurisu.Core.User.Abstractions;
-using Kurisu.SqlSugar.Extensions;
-using Kurisu.SqlSugar.Services;
 
 namespace Dlhis.Sys.Identity.Services.Implements;
 
@@ -71,7 +70,7 @@ public class RoleService : IRoleService
     }
 
 
-    public async Task AssignRoleAsync(AssignRoleRequest request)
+    public async Task AssignRoleAsync(RoleAssignRequest request)
     {
         var myUserId = _currentUser.GetIntSubjectId();
 
@@ -113,7 +112,7 @@ public class RoleService : IRoleService
         }
     }
 
-    public async Task RemoveRoleAsync(RoleRemoveRequest request)
+    public async Task RemoveRoleAsync(IdRequest request)
     {
         var role = await _dbContext.Queryable<RoleEntity>().FirstAsync(x => x.Id == request.Id);
         role.ThrowIfNull("角色不存在");

Src/Dlhis.Sys/Identity/Services/Implements/TenantService.cs

@@ -1,11 +1,11 @@
 using Dlhis.Entity.Sys.Entities;
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
+using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.Utils.Extensions;
-using Kurisu.Core.DataAccess.Dto;
-using Kurisu.Core.User.Abstractions;
-using Kurisu.SqlSugar.Extensions;
-using Kurisu.SqlSugar.Services;
 
 namespace Dlhis.Sys.Identity.Services.Implements;
 

Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs

@@ -2,11 +2,11 @@
 using Dlhis.Entity.Sys.Entities;
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
+using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.Utils.Extensions;
-using Kurisu.Core.DataAccess.Dto;
-using Kurisu.Core.User.Abstractions;
-using Kurisu.SqlSugar.Extensions;
-using Kurisu.SqlSugar.Services;
 using Microsoft.AspNetCore.Identity;
 using SqlSugar;
 
@@ -94,7 +94,7 @@ public class UserService : IUserService
 
     public async Task UploadUserAvatarAsync(UserAvatarUploadRequest request)
     {
-        var user = await _identityDbContext.Queryable<UserEntity>().Where(x => x.Id == request.UserNo).Select<UserResponse>().FirstAsync();
+        var user = await _identityDbContext.Queryable<UserEntity>().Where(x => x.Id == request.UserId).Select<UserResponse>().FirstAsync();
     }
 
     public async Task<List<UserResponse>> GetUserByIdsAsync(List<int> ids)

Src/Dlhis.Sys/Identity/Services/Implements/UserTenantService.cs

@@ -1,7 +1,7 @@
 using Dlhis.Entity.Sys.Entities;
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
-using Kurisu.SqlSugar.Services;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 
 namespace Dlhis.Sys.Identity.Services.Implements;