升级2.2.0

src/platform/ZhonTai.Admin/Domain/Role/Dto/RoleGetListInput.cs

@@ -0,0 +1,9 @@
+namespace ZhonTai.Admin.Domain.Role.Dto;
+
+public partial class RoleGetListInput
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
+}

src/platform/ZhonTai.Admin/Domain/User/Dto/UserGetListInput.cs

@@ -0,0 +1,9 @@
+namespace ZhonTai.Admin.Domain.User.Dto;
+
+public partial class UserGetListInput
+{
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    public string Name { get; set; }
+}

src/platform/ZhonTai.Admin/Services/Role/Dto/RoleGetListOutput.cs

@@ -0,0 +1,14 @@
+namespace ZhonTai.Admin.Services.Role.Dto;
+
+public class RoleGetListOutput
+{
+    /// <summary>
+    /// 主键
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
+}

src/platform/ZhonTai.Admin/Services/Role/Dto/RoleListOutput.cs → src/platform/ZhonTai.Admin/Services/Role/Dto/RoleGetPageOutput.cs

@@ -2,7 +2,7 @@
 
 namespace ZhonTai.Admin.Services.Role.Dto;
 
-public class RoleListOutput
+public class RoleGetPageOutput
 {
     /// <summary>
     /// 主键

src/platform/ZhonTai.Admin/Services/Role/IRoleService.cs

@@ -12,6 +12,8 @@ public interface IRoleService
 {
     Task<IResultOutput> GetAsync(long id);
 
+    Task<IResultOutput> GetListAsync(RoleGetListInput input);
+
     Task<IResultOutput> GetPageAsync(PageInput<RoleGetPageDto> input);
 
     Task<IResultOutput> AddAsync(RoleAddInput input);

src/platform/ZhonTai.Admin/Services/Role/RoleService.cs

@@ -42,6 +42,21 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
         return ResultOutput.Ok(result);
     }
 
+    /// <summary>
+    /// 查询角色列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<IResultOutput> GetListAsync([FromQuery]RoleGetListInput input)
+    {
+        var list = await _roleRepository.Select
+        .WhereIf(input.Name.NotNull(), a => a.Name.Contains(input.Name))
+        .OrderByDescending(true, c => c.Id)
+        .ToListAsync<RoleGetListOutput>();
+
+        return ResultOutput.Ok(list);
+    }
+
     /// <summary>
     /// 查询角色列表
     /// </summary>
@@ -58,9 +73,9 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
         .Count(out var total)
         .OrderByDescending(true, c => c.Id)
         .Page(input.CurrentPage, input.PageSize)
-        .ToListAsync<RoleListOutput>();
+        .ToListAsync<RoleGetPageOutput>();
 
-        var data = new PageOutput<RoleListOutput>()
+        var data = new PageOutput<RoleGetPageOutput>()
         {
             List = list,
             Total = total

src/platform/ZhonTai.Admin/Services/User/Dto/UserGetListOutput.cs

@@ -0,0 +1,14 @@
+namespace ZhonTai.Admin.Services.User.Dto;
+
+public class UserGetListOutput
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    public string Name { get; set; }
+}

src/platform/ZhonTai.Admin/Services/User/Dto/UserListOutput.cs → src/platform/ZhonTai.Admin/Services/User/Dto/UserGetPageOutput.cs

@@ -2,7 +2,7 @@
 
 namespace ZhonTai.Admin.Services.User.Dto;
 
-public class UserListOutput
+public class UserGetPageOutput
 {
     /// <summary>
     /// 主键Id

src/platform/ZhonTai.Admin/Services/User/Dto/UserUpdateInput.cs

@@ -21,6 +21,7 @@ public partial class UserUpdateInput
     /// <summary>
     /// 姓名
     /// </summary>
+    [Required(ErrorMessage = "请输入姓名")]
     public string Name { get; set; }
 
     /// <summary>

src/platform/ZhonTai.Admin/Services/User/IUserService.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
+using ZhonTai.Admin.Domain.User.Dto;
 using ZhonTai.Admin.Services.Auth.Dto;
 using ZhonTai.Admin.Services.User.Dto;
 
@@ -17,6 +18,8 @@ public interface IUserService
 
     Task<IResultOutput> GetSelectAsync();
 
+    Task<IResultOutput> GetListAsync(UserGetListInput input);
+
     Task<IResultOutput> GetPageAsync(PageInput input);
 
     Task<IResultOutput> AddAsync(UserAddInput input);

src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -22,6 +22,8 @@ using ZhonTai.DynamicApi;
 using ZhonTai.DynamicApi.Attributes;
 using ZhonTai.Admin.Core.Helpers;
 using ZhonTai.Admin.Core.Consts;
+using ZhonTai.Admin.Domain.User.Dto;
+using ZhonTai.Admin.Services.Role.Dto;
 
 namespace ZhonTai.Admin.Services.User;
 
@@ -71,6 +73,21 @@ public class UserService : BaseService, IUserService, IDynamicApi
         return ResultOutput.Ok(new { Form = Mapper.Map<UserGetOutput>(entity), Select = new { roles } });
     }
 
+    /// <summary>
+    /// 查询列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<IResultOutput> GetListAsync([FromQuery] UserGetListInput input)
+    {
+        var list = await _userRepository.Select
+        .WhereIf(input.Name.NotNull(), a => a.Name.Contains(input.Name))
+        .OrderByDescending(true, c => c.Id)
+        .ToListAsync<UserGetListOutput>();
+
+        return ResultOutput.Ok(list);
+    }
+
     /// <summary>
     /// 查询分页
     /// </summary>
@@ -87,9 +104,9 @@ public class UserService : BaseService, IUserService, IDynamicApi
         .Page(input.CurrentPage, input.PageSize)
         .ToListAsync();
 
-        var data = new PageOutput<UserListOutput>()
+        var data = new PageOutput<UserGetPageOutput>()
         {
-            List = Mapper.Map<List<UserListOutput>>(list),
+            List = Mapper.Map<List<UserGetPageOutput>>(list),
             Total = total
         };
 

src/platform/ZhonTai.Admin/Services/User/_MapConfig.cs

@@ -17,7 +17,7 @@ public class MapConfig : IRegister
         .Map(dest => dest.RoleIds, src => src.Roles.Select(a => a.Id));
 
         config
-        .NewConfig<UserEntity, UserListOutput>()
+        .NewConfig<UserEntity, UserGetPageOutput>()
         .Map(dest => dest.RoleNames, src => src.Roles.Select(a => a.Name));
     }
 }

src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Description>中台Admin接口库</Description>
+		<Description>中台Admin权限管理接口库</Description>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,35 +13,35 @@
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
 		<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
-		<PackageReference Include="CSRedisCore" Version="3.8.3" />
-		<PackageReference Include="Caching.CSRedis" Version="3.8.3" />
-		<PackageReference Include="FluentValidation.AspNetCore" Version="11.2.1" />
-		<PackageReference Include="FreeSql" Version="3.2.665" />
-		<PackageReference Include="FreeSql.Repository" Version="3.2.665" />
+		<PackageReference Include="CSRedisCore" Version="3.8.668" />
+		<PackageReference Include="Caching.CSRedis" Version="3.8.668" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
+		<PackageReference Include="FreeSql" Version="3.2.669" />
+		<PackageReference Include="FreeSql.Repository" Version="3.2.669" />
 		<PackageReference Include="IdleBus" Version="1.5.2" />
-		<PackageReference Include="FreeScheduler" Version="1.0.3" />
+		<PackageReference Include="FreeScheduler" Version="1.0.8" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
-		<PackageReference Include="NLog" Version="5.0.2" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.1" />
+		<PackageReference Include="NLog" Version="5.0.4" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.4" />
 		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
 		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.22.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.23.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(Configuration)'=='Debug'">
-		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.665" />
-		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.665" />
-		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.665" />
-		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.665" />
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.665" />
+		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.669" />
+		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.669" />
+		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.669" />
+		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.669" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.669" />
 	</ItemGroup>
 
 	<ItemGroup>

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -2526,6 +2526,11 @@
             排序
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Role.Dto.RoleGetListInput.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.Role.Dto.RoleGetPageDto.Name">
             <summary>
             名称
@@ -2756,6 +2761,11 @@
             备注
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.User.Dto.UserGetListInput.Name">
+            <summary>
+            姓名
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.User.UserEntity">
             <summary>
             用户
@@ -5226,32 +5236,42 @@
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleListOutput.Id">
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetListOutput.Id">
+            <summary>
+            主键
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetListOutput.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetPageOutput.Id">
             <summary>
             主键
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleListOutput.Name">
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetPageOutput.Name">
             <summary>
             名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleListOutput.Code">
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetPageOutput.Code">
             <summary>
             编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleListOutput.Description">
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetPageOutput.Description">
             <summary>
             说明
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleListOutput.Enabled">
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetPageOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleListOutput.CreatedTime">
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetPageOutput.CreatedTime">
             <summary>
             创建时间
             </summary>
@@ -5288,6 +5308,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:ZhonTai.Admin.Services.Role.RoleService.GetListAsync(ZhonTai.Admin.Domain.Role.Dto.RoleGetListInput)">
+            <summary>
+            查询角色列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:ZhonTai.Admin.Services.Role.RoleService.GetPageAsync(ZhonTai.Admin.Core.Dto.PageInput{ZhonTai.Admin.Domain.Role.Dto.RoleGetPageDto})">
             <summary>
             查询角色列表
@@ -5783,42 +5810,52 @@
             版本
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.Id">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetListOutput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetListOutput.Name">
+            <summary>
+            姓名
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Id">
             <summary>
             主键Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.UserName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.UserName">
             <summary>
             账号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.Name">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Name">
             <summary>
             姓名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.NickName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.NickName">
             <summary>
             昵称
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.Status">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Status">
             <summary>
             状态
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.RoleNames">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.RoleNames">
             <summary>
             角色
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.Remark">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Remark">
             <summary>
             备注
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserListOutput.CreatedTime">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.CreatedTime">
             <summary>
             创建时间
             </summary>
@@ -5905,6 +5942,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:ZhonTai.Admin.Services.User.UserService.GetListAsync(ZhonTai.Admin.Domain.User.Dto.UserGetListInput)">
+            <summary>
+            查询列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:ZhonTai.Admin.Services.User.UserService.GetPageAsync(ZhonTai.Admin.Core.Dto.PageInput)">
             <summary>
             查询分页

src/platform/ZhonTai.ApiUI/ZhonTai.ApiUI.csproj

@@ -4,7 +4,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<Description>中台Api UI库</Description>
+		<Description>中台接口文档库</Description>
 		<PackageTags>Api UI;Swagger UI;</PackageTags>
 	</PropertyGroup>
 

src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.8" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>