diff --git a/src/NetCorePal.D3Shop.Web/Migrations/20250310120744_addOpeniddict.cs b/src/NetCorePal.D3Shop.Web/Migrations/20250310120744_addOpeniddict.cs
index 08870a8..dc862e0 100644
--- a/src/NetCorePal.D3Shop.Web/Migrations/20250310120744_addOpeniddict.cs
+++ b/src/NetCorePal.D3Shop.Web/Migrations/20250310120744_addOpeniddict.cs
@@ -12,6 +12,10 @@ public partial class addOpeniddict : Migration
///
protected override void Up(MigrationBuilder migrationBuilder)
{
+ migrationBuilder.DropForeignKey(
+ name: "FK_rolePermissions_roles_RoleId",
+ table: "rolePermissions");
+
migrationBuilder.AlterColumn(
name: "Id",
table: "roles",
@@ -19,7 +23,18 @@ protected override void Up(MigrationBuilder migrationBuilder)
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
- .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+ .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
+ .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_rolePermissions_roles_RoleId",
+ table: "rolePermissions",
+ column: "RoleId",
+ principalTable: "roles",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade,
+ onUpdate:ReferentialAction.Restrict);
+
migrationBuilder.AlterColumn(
name: "Id",
@@ -30,6 +45,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
oldType: "bigint")
.OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+ migrationBuilder.DropForeignKey(
+ name: "FK_departmentUser_departments_DeptId",
+ table: "departmentUser");
+
migrationBuilder.AlterColumn(
name: "Id",
table: "departments",
@@ -37,7 +56,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
- .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+ .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
+ .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_departmentUser_departments_DeptId",
+ table: "departmentUser",
+ column: "DeptId",
+ principalTable: "departments",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict,
+ onUpdate:ReferentialAction.Restrict);
migrationBuilder.AlterColumn(
name: "Id",
@@ -58,6 +87,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
oldType: "datetime(6)",
oldNullable: true);
+ // 手动删除外键
+
+ migrationBuilder.DropForeignKey(
+ name: "FK_userDeliveryAddresses_clientUsers_UserId",
+ table: "userDeliveryAddresses");
+
+ migrationBuilder.DropForeignKey(
+ name: "FK_userThirdPartyLogins_clientUsers_UserId",
+ table: "userThirdPartyLogins");
+
+
migrationBuilder.AlterColumn(
name: "Id",
table: "clientUsers",
@@ -65,28 +105,49 @@ protected override void Up(MigrationBuilder migrationBuilder)
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
- .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
-
- migrationBuilder.AddColumn(
- name: "LoginExpiryDate",
- table: "clientUsers",
- type: "datetime(6)",
- nullable: false,
- defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-
- migrationBuilder.AddColumn(
- name: "PasswordSalt",
- table: "clientUsers",
- type: "longtext",
- nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.AddColumn(
- name: "RefreshToken",
- table: "clientUsers",
- type: "longtext",
- nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4");
+ .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
+ .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_userDeliveryAddresses_clientUsers_UserId",
+ table: "userDeliveryAddresses",
+ column: "UserId",
+ principalTable: "clientUsers",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict,
+ onUpdate:ReferentialAction.Restrict);
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_userThirdPartyLogins_clientUsers_UserId",
+ table: "userThirdPartyLogins",
+ column: "UserId",
+ principalTable: "clientUsers",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict,
+ onUpdate:ReferentialAction.Restrict);
+
+
+
+ // migrationBuilder.AddColumn(
+ // name: "LoginExpiryDate",
+ // table: "clientUsers",
+ // type: "datetime(6)",
+ // nullable: false,
+ // defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+ // migrationBuilder.AddColumn(
+ // name: "PasswordSalt",
+ // table: "clientUsers",
+ // type: "longtext",
+ // nullable: false)
+ // .Annotation("MySql:CharSet", "utf8mb4");
+ //
+ // migrationBuilder.AddColumn(
+ // name: "RefreshToken",
+ // table: "clientUsers",
+ // type: "longtext",
+ // nullable: false)
+ // .Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn(
name: "Id",
@@ -97,6 +158,20 @@ protected override void Up(MigrationBuilder migrationBuilder)
oldType: "bigint")
.OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+
+ migrationBuilder.DropForeignKey(
+ name: "FK_adminUserPermissions_adminUsers_AdminUserId",
+ table: "adminUserPermissions");
+
+ migrationBuilder.DropForeignKey(
+ name: "FK_adminUserRoles_adminUsers_AdminUserId",
+ table: "adminUserRoles");
+
+ migrationBuilder.DropForeignKey(
+ name: "FK_userDepts_adminUsers_AdminUserId",
+ table: "userDepts");
+
migrationBuilder.AlterColumn(
name: "Id",
table: "adminUsers",
@@ -104,8 +179,38 @@ protected override void Up(MigrationBuilder migrationBuilder)
nullable: false,
oldClrType: typeof(long),
oldType: "bigint")
- .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
-
+ .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
+ .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_adminUserPermissions_adminUsers_AdminUserId",
+ table: "adminUserPermissions",
+ column: "AdminUserId",
+ principalTable: "adminUsers",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict,
+ onUpdate:ReferentialAction.Restrict);
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_adminUserRoles_adminUsers_AdminUserId",
+ table: "adminUserRoles",
+ column: "AdminUserId",
+ principalTable: "adminUsers",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict,
+ onUpdate:ReferentialAction.Restrict);
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_userDepts_adminUsers_AdminUserId",
+ table: "userDepts",
+ column: "AdminUserId",
+ principalTable: "adminUsers",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict,
+ onUpdate:ReferentialAction.Restrict);
+
+
migrationBuilder.CreateTable(
name: "OpenIddictApplications",
columns: table => new
@@ -304,17 +409,17 @@ protected override void Down(MigrationBuilder migrationBuilder)
migrationBuilder.DropTable(
name: "OpenIddictApplications");
- migrationBuilder.DropColumn(
- name: "LoginExpiryDate",
- table: "clientUsers");
+ // migrationBuilder.DropColumn(
+ // name: "LoginExpiryDate",
+ // table: "clientUsers");
- migrationBuilder.DropColumn(
- name: "PasswordSalt",
- table: "clientUsers");
+ // migrationBuilder.DropColumn(
+ // name: "PasswordSalt",
+ // table: "clientUsers");
- migrationBuilder.DropColumn(
- name: "RefreshToken",
- table: "clientUsers");
+ // migrationBuilder.DropColumn(
+ // name: "RefreshToken",
+ // table: "clientUsers");
migrationBuilder.AlterColumn(
name: "Id",
diff --git a/src/NetCorePal.D3Shop.Web/Migrations/20250419084411_useDatetimeOffset.cs b/src/NetCorePal.D3Shop.Web/Migrations/20250419084411_useDatetimeOffset.cs
index f717750..1dbc6cb 100644
--- a/src/NetCorePal.D3Shop.Web/Migrations/20250419084411_useDatetimeOffset.cs
+++ b/src/NetCorePal.D3Shop.Web/Migrations/20250419084411_useDatetimeOffset.cs
@@ -12,9 +12,9 @@ public partial class useDatetimeOffset : Migration
///
protected override void Up(MigrationBuilder migrationBuilder)
{
- migrationBuilder.DropColumn(
- name: "RefreshToken",
- table: "clientUsers");
+ // migrationBuilder.DropColumn(
+ // name: "RefreshToken",
+ // table: "clientUsers");
migrationBuilder.AlterColumn(
name: "Id",
@@ -154,12 +154,12 @@ protected override void Down(MigrationBuilder migrationBuilder)
oldType: "bigint")
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
- migrationBuilder.AddColumn(
- name: "RefreshToken",
- table: "clientUsers",
- type: "longtext",
- nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4");
+ // migrationBuilder.AddColumn(
+ // name: "RefreshToken",
+ // table: "clientUsers",
+ // type: "longtext",
+ // nullable: false)
+ // .Annotation("MySql:CharSet", "utf8mb4");
}
}
}
diff --git a/src/NetCorePal.D3Shop.Web/Program.cs b/src/NetCorePal.D3Shop.Web/Program.cs
index 38cd061..7bf49c4 100644
--- a/src/NetCorePal.D3Shop.Web/Program.cs
+++ b/src/NetCorePal.D3Shop.Web/Program.cs
@@ -159,7 +159,7 @@
builder.Services.AddDbContext(options =>
{
options.UseMySql(builder.Configuration.GetConnectionString("MySql"),
- new MySqlServerVersion(new Version(8, 0, 34)),
+ ServerVersion.AutoDetect(builder.Configuration.GetConnectionString("MySql")),
b =>
{
b.MigrationsAssembly(typeof(Program).Assembly.FullName);