修复集成测试

src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs

@@ -43,12 +43,6 @@ public partial class RoleEntity : EntityFull, ITenant
     [Column(StringLength = 50)]
     public string Code { get; set; }
 
-    /// <summary>
-    /// 角色类型
-    /// </summary>
-    [Column(MapType = typeof(int))]
-    public RoleType Type { get; set; }
-
     /// <summary>
     /// 数据范围
     /// </summary>

src/platform/ZhonTai.Admin/Domain/Role/RoleType.cs

@@ -1,22 +0,0 @@
-namespace ZhonTai.Admin.Domain.Role;
-
-/// <summary>
-/// 角色类型
-/// </summary>
-public enum RoleType
-{
-    /// <summary>
-    /// 自定义
-    /// </summary>
-    Custom = 0,
-
-    /// <summary>
-    /// 默认
-    /// </summary>
-    Default = 1,
-
-    /// <summary>
-    /// 主管理员
-    /// </summary>
-    MainAdmin = 101,
-}

src/platform/ZhonTai.Admin/Domain/User/UserStatus.cs

@@ -18,10 +18,10 @@ public enum UserStatus
     /// <summary>
     /// 待修改密码
     /// </summary>
-    WaitChangePasssword = 3,
+    WaitChangePasssword = 2,
 
     /// <summary>
     /// 待激活
     /// </summary>
-    WaitActive = 4,
+    WaitActive = 3,
 }

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

@@ -28,8 +28,6 @@ using ZhonTai.Admin.Domain.Org;
 using System.Data;
 using ZhonTai.Admin.Domain.TenantPermission;
 using FreeSql;
-using ZhonTai.Admin.Core.Auth;
-using Org.BouncyCastle.Crypto;
 
 namespace ZhonTai.Admin.Services.User;
 

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

@@ -2172,11 +2172,6 @@
             编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Role.RoleEntity.Type">
-            <summary>
-            角色类型
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.Role.RoleEntity.DataScope">
             <summary>
             数据范围
@@ -2197,26 +2192,6 @@
             排序
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Domain.Role.RoleType">
-            <summary>
-            角色类型
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Domain.Role.RoleType.Custom">
-            <summary>
-            自定义
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Domain.Role.RoleType.Default">
-            <summary>
-            默认
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Domain.Role.RoleType.MainAdmin">
-            <summary>
-            主管理员
-            </summary>
-        </member>
         <member name="T:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput">
             <summary>
             添加

src/tests/ZhonTai.Tests/Controllers/ApiControllerTest.cs

@@ -5,6 +5,7 @@ using Xunit;
 using ZhonTai.Admin.Services.Api.Dto;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Domain.Api;
+using ZhonTai.Admin.Domain.Api.Dto;
 
 namespace ZhonTai.Tests.Controllers;
 
@@ -32,17 +33,18 @@ public class ApiControllerTest : BaseControllerTest
     public async Task GetPage()
     {
         await Login();
-        var input = new PageInput<ApiEntity>
+        var input = new PageInput<ApiGetPageDto>
         {
             CurrentPage = 1,
             PageSize = 20,
-            Filter = new ApiEntity
+            Filter = new ApiGetPageDto
             {
                 Label = "接口管理"
             }
         };
-        var res = await Client.PostAsync($"/api/admin/api/get-page", GetHttpContent(input));
-        Assert.Equal(HttpStatusCode.Forbidden, res.StatusCode);
+
+        var res = await PostResult($"/api/admin/api/get-page", input);
+        Assert.True(res.Success);
     }
 
     [Fact]

src/tests/ZhonTai.Tests/ResultOutput.cs

@@ -9,12 +9,12 @@ public class ResultOutput<T>
     /// <summary>
     /// 是否成功标记
     /// </summary>
-    public bool Success => Code == 1;
+    public bool Success { get; set; }
 
     /// <summary>
     /// 状态码
     /// </summary>
-    public int Code { get; set; }
+    public string Code { get; set; }
 
     /// <summary>
     /// 消息

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

@@ -6,9 +6,9 @@
 	</PropertyGroup>
 
   <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.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.9" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>