konsoft/KonSoft.Clean
7
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.konsoft.top/konsoft/KonSoft.Clean

Browse Source
This commit is contained in:
KarlsEcho
2025-10-26 15:07:23 +08:00
parent b699762c1b 931ecbd4bc
commit e4629b1771
4 changed files with 2410 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs
View File

@ -52,6 +52,7 @@ public class AdminHttpApiHostModule : AbpModule
app.UseAbpRequestLocalization();
app.UseCorrelationId();
app.UseStaticFiles();
app.UseRouting();
app.UseCors();
app.UseAuthentication();
@ -74,8 +75,7 @@ public class AdminHttpApiHostModule : AbpModule
options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
options.OAuthScopes("Admin");
});
app.UseStaticFiles();
app.UseAuditing();
app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints();

2315
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/20251026064212_V1.0.1.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

69
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/20251026064212_V1.0.1.cs Normal file
View File

@ -0,0 +1,69 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace KonSoft.Admin.Migrations
{
/// <inheritdoc />
public partial class V101 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "WorkerId",
table: "AppOrder",
newName: "HouseholdWorkerId");
migrationBuilder.CreateIndex(
name: "IX_AppOrder_CustomerId",
table: "AppOrder",
column: "CustomerId");
migrationBuilder.CreateIndex(
name: "IX_AppOrder_HouseholdWorkerId",
table: "AppOrder",
column: "HouseholdWorkerId");
migrationBuilder.AddForeignKey(
name: "FK_AppOrder_AbpUsers_CustomerId",
table: "AppOrder",
column: "CustomerId",
principalTable: "AbpUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_AppOrder_AbpUsers_HouseholdWorkerId",
table: "AppOrder",
column: "HouseholdWorkerId",
principalTable: "AbpUsers",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AppOrder_AbpUsers_CustomerId",
table: "AppOrder");
migrationBuilder.DropForeignKey(
name: "FK_AppOrder_AbpUsers_HouseholdWorkerId",
table: "AppOrder");
migrationBuilder.DropIndex(
name: "IX_AppOrder_CustomerId",
table: "AppOrder");
migrationBuilder.DropIndex(
name: "IX_AppOrder_HouseholdWorkerId",
table: "AppOrder");
migrationBuilder.RenameColumn(
name: "HouseholdWorkerId",
table: "AppOrder",
newName: "WorkerId");
}
}
}

27
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/AdminDbContextModelSnapshot.cs
View File

@ -68,6 +68,9 @@ namespace KonSoft.Admin.Migrations
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<Guid?>("HouseholdWorkerId")
.HasColumnType("uuid");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
@ -101,9 +104,6 @@ namespace KonSoft.Admin.Migrations
b.Property<int>("Status")
.HasColumnType("integer");
b.Property<Guid?>("WorkerId")
.HasColumnType("uuid");
b.ComplexProperty<Dictionary<string, object>>("Address", "KonSoft.Admin.Entities.Order.Address#AddressInfo", b1 =>
{
b1.IsRequired();
@ -131,6 +131,10 @@ namespace KonSoft.Admin.Migrations
b.HasKey("Id");
b.HasIndex("CustomerId");
b.HasIndex("HouseholdWorkerId");
b.ToTable("AppOrder", (string)null);
});
@ -2104,6 +2108,23 @@ namespace KonSoft.Admin.Migrations
b.HasDiscriminator().HasValue("HouseholdWorker");
});
modelBuilder.Entity("KonSoft.Admin.Entities.Order", b =>
{
b.HasOne("Volo.Abp.Identity.IdentityUser", "Customer")
.WithMany()
.HasForeignKey("CustomerId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Volo.Abp.Identity.IdentityUser", "HouseholdWorker")
.WithMany()
.HasForeignKey("HouseholdWorkerId");
b.Navigation("Customer");
b.Navigation("HouseholdWorker");
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
{
b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)