XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级efcore 测试内存
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-08-15 21:08:47 +08:00
parent 816d81b555
commit 4048c28628
10 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -1224,11 +1224,11 @@ namespace IRaCIS.Core.Application.Service
IdentityUserId = t.IdentityUserId, IdentityUserId = t.IdentityUserId,
UserTypeEnum = t.UserTypeEnum, UserTypeEnum = t.UserTypeEnum,
UserTypeId = t.UserTypeId, UserTypeId = t.UserTypeId,
//IsTestUser = t.IdentityUser.IsTestUser, IsTestUser = t.IdentityUser.IsTestUser,
//IsZhiZhun = t.IdentityUser.IsZhiZhun, IsZhiZhun = t.IdentityUser.IsZhiZhun,
//FullName = t.IdentityUser.FullName, FullName = t.IdentityUser.FullName,
//PermissionStr = t.UserTypeRole.PermissionStr, PermissionStr = t.UserTypeRole.PermissionStr,
//UserName = t.IdentityUser.UserName, UserName = t.IdentityUser.UserName,
UserTypeShortName = t.UserTypeRole.UserTypeShortName, UserTypeShortName = t.UserTypeRole.UserTypeShortName,
}).FirstOrDefaultAsync(); }).FirstOrDefaultAsync();

4
IRaCIS.Core.Domain/BaseModel/Entity.cs
View File

@ -110,14 +110,14 @@ public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
public UserRole CreateUserRole { get; set; } public UserRole CreateUserRole { get; set; }
} }
public abstract class BaseFullAuditEntity2 : Entity, IAuditUpdate, IAuditAdd public abstract class BaseFullAuditEntityNoNavigat : Entity, IAuditUpdate, IAuditAdd
{ {
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
public Guid UpdateUserId { get; set; } public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; } public DateTime UpdateTime { get; set; }
} }
public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
{ {
public Guid? DeleteUserId { get; set; } public Guid? DeleteUserId { get; set; }

2
IRaCIS.Core.Domain/Management/HospitalGroup.cs
View File

@ -40,7 +40,7 @@ namespace IRaCIS.Core.Domain.Models
[Comment("后台 - 系统真实账户表")] [Comment("后台 - 系统真实账户表")]
[Table("IdentityUser")] [Table("IdentityUser")]
public class IdentityUser : BaseFullAuditEntity2 public class IdentityUser : BaseFullAuditEntityNoNavigat
{ {
[JsonIgnore] [JsonIgnore]

10
IRaCIS.Core.Domain/Management/User.cs
View File

@ -5,17 +5,17 @@ namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统账户")] [Comment("后台 - 系统账户")]
[Table("User")] [Table("User")]
public class UserRole : BaseFullAuditEntity public class UserRole : BaseFullAuditEntityNoNavigat
{ {
#region 导航属性 #region 导航属性
//[NotMapped] //[ForeignKey("IdentityUserId")]
//[JsonIgnore] [JsonIgnore]
//public IdentityUser IdentityUser { get; set; } public IdentityUser IdentityUser { get; set; }
[JsonIgnore] [JsonIgnore]
public List<TrialUserRole> UserRoleTrials { get; set; } = new List<TrialUserRole>(); public List<TrialUserRole> UserRoleTrials { get; set; }
[JsonIgnore] [JsonIgnore]

3
IRaCIS.Core.Domain/Management/UserType.cs
View File

@ -11,9 +11,6 @@ public class UserType : Entity
[JsonIgnore] [JsonIgnore]
public List<UserTypeGroup> UserTypeGroupList { get; set; } public List<UserTypeGroup> UserTypeGroupList { get; set; }
[JsonIgnore]
public List<UserRole> UserList { get; set; }
#endregion #endregion
public UserTypeEnum UserTypeEnum { get; set; } public UserTypeEnum UserTypeEnum { get; set; }

1
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -373,7 +373,6 @@ public class IRaCISDBContext : DbContext
public virtual DbSet<VerificationCode> VerificationCodes { get; set; } public virtual DbSet<VerificationCode> VerificationCodes { get; set; }
public virtual DbSet<Menu> MenuFunctions { get; set; } public virtual DbSet<Menu> MenuFunctions { get; set; }
public virtual DbSet<UserTypeMenu> UserTypeMenuFunction { get; set; } public virtual DbSet<UserTypeMenu> UserTypeMenuFunction { get; set; }
public virtual DbSet<UserRole> Users { get; set; }
public virtual DbSet<UserType> UserType { get; set; } public virtual DbSet<UserType> UserType { get; set; }

5
IRaCIS.Core.Infra.EFCore/EntityConfigration/SubjectConfigration.cs
View File

@ -51,6 +51,8 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
//User 和VisitTask 存在一对多的关系 这里不显式配置就报错，why? //User 和VisitTask 存在一对多的关系 这里不显式配置就报错，why?
builder.HasMany(t => t.VisitTaskList).WithOne(t => t.DoctorUser).HasForeignKey(t => t.DoctorUserId); builder.HasMany(t => t.VisitTaskList).WithOne(t => t.DoctorUser).HasForeignKey(t => t.DoctorUserId);
//builder.HasOne(t => t.IdentityUser).WithMany(t => t.UserRoleList).HasForeignKey(t => t.IdentityUserId);
} }
} }
@ -76,9 +78,10 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
// public void Configure(EntityTypeBuilder<IdentityUser> builder) // public void Configure(EntityTypeBuilder<IdentityUser> builder)
// { // {
// builder.HasMany(s => s.UserRoleList) // builder.HasMany(s => s.UserRoleList)
// .WithOne(t => t.IdentityUser) // .WithOne(t=>t.IdentityUser)
// .HasForeignKey(s => s.IdentityUserId); // .HasForeignKey(s => s.IdentityUserId);
// } // }
//} //}

6
IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
View File

@ -31,12 +31,12 @@
<PackageReference Include="Hangfire.Core" Version="1.8.18" /> <PackageReference Include="Hangfire.Core" Version="1.8.18" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" /> <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.15" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.19" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.19">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.19">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

2
IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
View File

@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" /> <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.19" />
<PackageReference Include="SharpCompress" Version="0.38.0" /> <PackageReference Include="SharpCompress" Version="0.38.0" />
<PackageReference Include="SharpZipLib" Version="1.4.2" /> <PackageReference Include="SharpZipLib" Version="1.4.2" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />

6
IRaCIS.Core.Test/IRaCIS.Core.Test.csproj
View File

@ -50,10 +50,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Fluid.Core" Version="2.11.1" /> <PackageReference Include="Fluid.Core" Version="2.11.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.19" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.15" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.19" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.19">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>