chore: 升级ABP框架及相关依赖版本，更新数据库连接字符串并清理Swagger配置
1. 将ABP相关包版本从10.0.1升级至10.5.0，LeptonX主题从5.0.1升级至5.5.0 2. 更新测试相关依赖包版本，统一项目包版本 3. 修改数据库连接字符串默认库名为Hua.Abp.Demo 4. 移除冗余的Swagger OpenIddict文档过滤器配置 5. 添加数据库迁移文件更新数据库结构
This commit is contained in:
ShaoHua
Generated
+2291
File diff suppressed because it is too large
Load Diff
+221
@@ -0,0 +1,221 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Hua.Abp.Demo.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class AddLastSignInTimeToUsers : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_AbpPermissions_Name",
|
||||
table: "AbpPermissions");
|
||||
|
||||
migrationBuilder.AddColumn<DateTimeOffset>(
|
||||
name: "LastSignInTime",
|
||||
table: "AbpUsers",
|
||||
type: "timestamp with time zone",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "Leaved",
|
||||
table: "AbpUsers",
|
||||
type: "boolean",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "GroupName",
|
||||
table: "AbpPermissions",
|
||||
type: "character varying(128)",
|
||||
maxLength: 128,
|
||||
nullable: true,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(128)",
|
||||
oldMaxLength: 128);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "ManagementPermissionName",
|
||||
table: "AbpPermissions",
|
||||
type: "character varying(128)",
|
||||
maxLength: 128,
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "ResourceName",
|
||||
table: "AbpPermissions",
|
||||
type: "character varying(256)",
|
||||
maxLength: 256,
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "PropertyTypeFullName",
|
||||
table: "AbpEntityPropertyChanges",
|
||||
type: "character varying(512)",
|
||||
maxLength: 512,
|
||||
nullable: false,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(64)",
|
||||
oldMaxLength: 64);
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "EntityTypeFullName",
|
||||
table: "AbpEntityChanges",
|
||||
type: "character varying(512)",
|
||||
maxLength: 512,
|
||||
nullable: false,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(128)",
|
||||
oldMaxLength: 128);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "AbpResourcePermissionGrants",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
TenantId = table.Column<Guid>(type: "uuid", nullable: true),
|
||||
Name = table.Column<string>(type: "character varying(128)", maxLength: 128, nullable: false),
|
||||
ProviderName = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
|
||||
ProviderKey = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
|
||||
ResourceName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
|
||||
ResourceKey = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_AbpResourcePermissionGrants", x => x.Id);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "AbpUserPasskeys",
|
||||
columns: table => new
|
||||
{
|
||||
CredentialId = table.Column<byte[]>(type: "bytea", maxLength: 1024, nullable: false),
|
||||
TenantId = table.Column<Guid>(type: "uuid", nullable: true),
|
||||
UserId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
Data = table.Column<string>(type: "jsonb", nullable: true)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_AbpUserPasskeys", x => x.CredentialId);
|
||||
table.ForeignKey(
|
||||
name: "FK_AbpUserPasskeys_AbpUsers_UserId",
|
||||
column: x => x.UserId,
|
||||
principalTable: "AbpUsers",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "AbpUserPasswordHistories",
|
||||
columns: table => new
|
||||
{
|
||||
UserId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
Password = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
|
||||
TenantId = table.Column<Guid>(type: "uuid", nullable: true),
|
||||
CreatedAt = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_AbpUserPasswordHistories", x => new { x.UserId, x.Password });
|
||||
table.ForeignKey(
|
||||
name: "FK_AbpUserPasswordHistories_AbpUsers_UserId",
|
||||
column: x => x.UserId,
|
||||
principalTable: "AbpUsers",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_AbpPermissions_ResourceName_Name",
|
||||
table: "AbpPermissions",
|
||||
columns: new[] { "ResourceName", "Name" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_AbpResourcePermissionGrants_TenantId_Name_ResourceName_Reso~",
|
||||
table: "AbpResourcePermissionGrants",
|
||||
columns: new[] { "TenantId", "Name", "ResourceName", "ResourceKey", "ProviderName", "ProviderKey" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_AbpUserPasskeys_UserId",
|
||||
table: "AbpUserPasskeys",
|
||||
column: "UserId");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "AbpResourcePermissionGrants");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "AbpUserPasskeys");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "AbpUserPasswordHistories");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_AbpPermissions_ResourceName_Name",
|
||||
table: "AbpPermissions");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "LastSignInTime",
|
||||
table: "AbpUsers");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Leaved",
|
||||
table: "AbpUsers");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ManagementPermissionName",
|
||||
table: "AbpPermissions");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ResourceName",
|
||||
table: "AbpPermissions");
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "GroupName",
|
||||
table: "AbpPermissions",
|
||||
type: "character varying(128)",
|
||||
maxLength: 128,
|
||||
nullable: false,
|
||||
defaultValue: "",
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(128)",
|
||||
oldMaxLength: 128,
|
||||
oldNullable: true);
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "PropertyTypeFullName",
|
||||
table: "AbpEntityPropertyChanges",
|
||||
type: "character varying(64)",
|
||||
maxLength: 64,
|
||||
nullable: false,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(512)",
|
||||
oldMaxLength: 512);
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "EntityTypeFullName",
|
||||
table: "AbpEntityChanges",
|
||||
type: "character varying(128)",
|
||||
maxLength: 128,
|
||||
nullable: false,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(512)",
|
||||
oldMaxLength: 512);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_AbpPermissions_Name",
|
||||
table: "AbpPermissions",
|
||||
column: "Name",
|
||||
unique: true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ namespace Hua.Abp.Demo.Migrations
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
|
||||
.HasAnnotation("ProductVersion", "10.0.0")
|
||||
.HasAnnotation("ProductVersion", "10.0.9")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
@@ -304,8 +304,8 @@ namespace Hua.Abp.Demo.Migrations
|
||||
|
||||
b.Property<string>("EntityTypeFullName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("character varying(128)")
|
||||
.HasMaxLength(512)
|
||||
.HasColumnType("character varying(512)")
|
||||
.HasColumnName("EntityTypeFullName");
|
||||
|
||||
b.Property<string>("ExtraProperties")
|
||||
@@ -352,8 +352,8 @@ namespace Hua.Abp.Demo.Migrations
|
||||
|
||||
b.Property<string>("PropertyTypeFullName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("character varying(64)")
|
||||
.HasMaxLength(512)
|
||||
.HasColumnType("character varying(512)")
|
||||
.HasColumnName("PropertyTypeFullName");
|
||||
|
||||
b.Property<Guid?>("TenantId")
|
||||
@@ -1003,6 +1003,15 @@ namespace Hua.Abp.Demo.Migrations
|
||||
b.Property<DateTimeOffset?>("LastPasswordChangeTime")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTimeOffset?>("LastSignInTime")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<bool>("Leaved")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("boolean")
|
||||
.HasDefaultValue(false)
|
||||
.HasColumnName("Leaved");
|
||||
|
||||
b.Property<bool>("LockoutEnabled")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("boolean")
|
||||
@@ -1198,6 +1207,47 @@ namespace Hua.Abp.Demo.Migrations
|
||||
b.ToTable("AbpUserOrganizationUnits", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasskey", b =>
|
||||
{
|
||||
b.Property<byte[]>("CredentialId")
|
||||
.HasMaxLength(1024)
|
||||
.HasColumnType("bytea");
|
||||
|
||||
b.Property<Guid?>("TenantId")
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("TenantId");
|
||||
|
||||
b.Property<Guid>("UserId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.HasKey("CredentialId");
|
||||
|
||||
b.HasIndex("UserId");
|
||||
|
||||
b.ToTable("AbpUserPasskeys", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasswordHistory", b =>
|
||||
{
|
||||
b.Property<Guid>("UserId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("Password")
|
||||
.HasMaxLength(256)
|
||||
.HasColumnType("character varying(256)");
|
||||
|
||||
b.Property<DateTimeOffset>("CreatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<Guid?>("TenantId")
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("TenantId");
|
||||
|
||||
b.HasKey("UserId", "Password");
|
||||
|
||||
b.ToTable("AbpUserPasswordHistories", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
|
||||
{
|
||||
b.Property<Guid>("UserId")
|
||||
@@ -1665,13 +1715,16 @@ namespace Hua.Abp.Demo.Migrations
|
||||
.HasColumnName("ExtraProperties");
|
||||
|
||||
b.Property<string>("GroupName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("character varying(128)");
|
||||
|
||||
b.Property<bool>("IsEnabled")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("ManagementPermissionName")
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("character varying(128)");
|
||||
|
||||
b.Property<byte>("MultiTenancySide")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
@@ -1688,6 +1741,10 @@ namespace Hua.Abp.Demo.Migrations
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("character varying(128)");
|
||||
|
||||
b.Property<string>("ResourceName")
|
||||
.HasMaxLength(256)
|
||||
.HasColumnType("character varying(256)");
|
||||
|
||||
b.Property<string>("StateCheckers")
|
||||
.HasMaxLength(256)
|
||||
.HasColumnType("character varying(256)");
|
||||
@@ -1696,7 +1753,7 @@ namespace Hua.Abp.Demo.Migrations
|
||||
|
||||
b.HasIndex("GroupName");
|
||||
|
||||
b.HasIndex("Name")
|
||||
b.HasIndex("ResourceName", "Name")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("AbpPermissions", (string)null);
|
||||
@@ -1763,6 +1820,49 @@ namespace Hua.Abp.Demo.Migrations
|
||||
b.ToTable("AbpPermissionGroups", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.PermissionManagement.ResourcePermissionGrant", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("character varying(128)");
|
||||
|
||||
b.Property<string>("ProviderKey")
|
||||
.IsRequired()
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("character varying(64)");
|
||||
|
||||
b.Property<string>("ProviderName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("character varying(64)");
|
||||
|
||||
b.Property<string>("ResourceKey")
|
||||
.IsRequired()
|
||||
.HasMaxLength(256)
|
||||
.HasColumnType("character varying(256)");
|
||||
|
||||
b.Property<string>("ResourceName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(256)
|
||||
.HasColumnType("character varying(256)");
|
||||
|
||||
b.Property<Guid?>("TenantId")
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("TenantId");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("TenantId", "Name", "ResourceName", "ResourceKey", "ProviderName", "ProviderKey")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("AbpResourcePermissionGrants", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@@ -2010,6 +2110,62 @@ namespace Hua.Abp.Demo.Migrations
|
||||
.IsRequired();
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasskey", b =>
|
||||
{
|
||||
b.HasOne("Volo.Abp.Identity.IdentityUser", null)
|
||||
.WithMany("Passkeys")
|
||||
.HasForeignKey("UserId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.OwnsOne("Volo.Abp.Identity.IdentityPasskeyData", "Data", b1 =>
|
||||
{
|
||||
b1.Property<byte[]>("IdentityUserPasskeyCredentialId");
|
||||
|
||||
b1.Property<byte[]>("AttestationObject");
|
||||
|
||||
b1.Property<byte[]>("ClientDataJson");
|
||||
|
||||
b1.Property<DateTimeOffset>("CreatedAt");
|
||||
|
||||
b1.Property<bool>("IsBackedUp");
|
||||
|
||||
b1.Property<bool>("IsBackupEligible");
|
||||
|
||||
b1.Property<bool>("IsUserVerified");
|
||||
|
||||
b1.Property<string>("Name");
|
||||
|
||||
b1.Property<byte[]>("PublicKey");
|
||||
|
||||
b1.Property<long>("SignCount");
|
||||
|
||||
b1.PrimitiveCollection<string>("Transports");
|
||||
|
||||
b1.HasKey("IdentityUserPasskeyCredentialId");
|
||||
|
||||
b1.ToTable("AbpUserPasskeys");
|
||||
|
||||
b1
|
||||
.ToJson("Data")
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b1.WithOwner()
|
||||
.HasForeignKey("IdentityUserPasskeyCredentialId");
|
||||
});
|
||||
|
||||
b.Navigation("Data");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasswordHistory", b =>
|
||||
{
|
||||
b.HasOne("Volo.Abp.Identity.IdentityUser", null)
|
||||
.WithMany("PasswordHistories")
|
||||
.HasForeignKey("UserId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
|
||||
{
|
||||
b.HasOne("Volo.Abp.Identity.IdentityRole", null)
|
||||
@@ -2108,6 +2264,10 @@ namespace Hua.Abp.Demo.Migrations
|
||||
|
||||
b.Navigation("OrganizationUnits");
|
||||
|
||||
b.Navigation("Passkeys");
|
||||
|
||||
b.Navigation("PasswordHistories");
|
||||
|
||||
b.Navigation("Roles");
|
||||
|
||||
b.Navigation("Tokens");
|
||||
|
||||
Reference in New Issue
Block a user