From de913375df0f0e7488422d72335abb930e1cfafa Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 19 Jan 2022 09:54:00 +0800 Subject: [PATCH] Update the mgrations. --- .../Data/MyProjectNameDbContext.cs | 5 ++--- ...ner.cs => 20220119015238_Initial.Designer.cs} | 16 ++++++++++++++-- ...4845_Initial.cs => 20220119015238_Initial.cs} | 4 +++- .../MyProjectNameDbContextModelSnapshot.cs | 14 +++++++++++++- .../MyCompanyName.MyProjectName.csproj | 4 ++-- .../MyCompanyName.MyProjectName/Program.cs | 8 +++++++- 6 files changed, 41 insertions(+), 10 deletions(-) rename templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/{20220116184845_Initial.Designer.cs => 20220119015238_Initial.Designer.cs} (99%) rename templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/{20220116184845_Initial.cs => 20220119015238_Initial.cs} (99%) diff --git a/templates/app-nolayers/MyCompanyName.MyProjectName/Data/MyProjectNameDbContext.cs b/templates/app-nolayers/MyCompanyName.MyProjectName/Data/MyProjectNameDbContext.cs index 37fe8eda88..6265e8ebba 100644 --- a/templates/app-nolayers/MyCompanyName.MyProjectName/Data/MyProjectNameDbContext.cs +++ b/templates/app-nolayers/MyCompanyName.MyProjectName/Data/MyProjectNameDbContext.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore.Modeling; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.IdentityServer.EntityFrameworkCore; @@ -31,7 +30,7 @@ public class MyProjectNameDbContext : AbpDbContext builder.ConfigureIdentityServer(); builder.ConfigureFeatureManagement(); builder.ConfigureTenantManagement(); - + /* Configure your own entities here */ } -} \ No newline at end of file +} diff --git a/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220116184845_Initial.Designer.cs b/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220119015238_Initial.Designer.cs similarity index 99% rename from templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220116184845_Initial.Designer.cs rename to templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220119015238_Initial.Designer.cs index 9a08b50fb6..606c549e29 100644 --- a/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220116184845_Initial.Designer.cs +++ b/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220119015238_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(MyProjectNameDbContext))] - [Migration("20220116184845_Initial")] + [Migration("20220119015238_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -100,16 +100,28 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("ImpersonatorTenantId"); + b.Property("ImpersonatorTenantName") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("ImpersonatorTenantName"); + b.Property("ImpersonatorUserId") .HasColumnType("uniqueidentifier") .HasColumnName("ImpersonatorUserId"); + b.Property("ImpersonatorUserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("ImpersonatorUserName"); + b.Property("TenantId") .HasColumnType("uniqueidentifier") .HasColumnName("TenantId"); b.Property("TenantName") - .HasColumnType("nvarchar(max)"); + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("TenantName"); b.Property("Url") .HasMaxLength(256) diff --git a/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220116184845_Initial.cs b/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220119015238_Initial.cs similarity index 99% rename from templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220116184845_Initial.cs rename to templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220119015238_Initial.cs index abec77f8c4..61dd143293 100644 --- a/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220116184845_Initial.cs +++ b/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/20220119015238_Initial.cs @@ -18,9 +18,11 @@ namespace MyCompanyName.MyProjectName.Migrations UserId = table.Column(type: "uniqueidentifier", nullable: true), UserName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), TenantId = table.Column(type: "uniqueidentifier", nullable: true), - TenantName = table.Column(type: "nvarchar(max)", nullable: true), + TenantName = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), ImpersonatorUserId = table.Column(type: "uniqueidentifier", nullable: true), + ImpersonatorUserName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), ImpersonatorTenantId = table.Column(type: "uniqueidentifier", nullable: true), + ImpersonatorTenantName = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), ExecutionTime = table.Column(type: "datetime2", nullable: false), ExecutionDuration = table.Column(type: "int", nullable: false), ClientIpAddress = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), diff --git a/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/MyProjectNameDbContextModelSnapshot.cs index 49e87cea80..af4ba29c12 100644 --- a/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/MyProjectNameDbContextModelSnapshot.cs +++ b/templates/app-nolayers/MyCompanyName.MyProjectName/Migrations/MyProjectNameDbContextModelSnapshot.cs @@ -98,16 +98,28 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("ImpersonatorTenantId"); + b.Property("ImpersonatorTenantName") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("ImpersonatorTenantName"); + b.Property("ImpersonatorUserId") .HasColumnType("uniqueidentifier") .HasColumnName("ImpersonatorUserId"); + b.Property("ImpersonatorUserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("ImpersonatorUserName"); + b.Property("TenantId") .HasColumnType("uniqueidentifier") .HasColumnName("TenantId"); b.Property("TenantName") - .HasColumnType("nvarchar(max)"); + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("TenantName"); b.Property("Url") .HasMaxLength(256) diff --git a/templates/app-nolayers/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/app-nolayers/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index 20d8b634db..da71f5a49f 100644 --- a/templates/app-nolayers/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/app-nolayers/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -71,11 +71,11 @@ - + - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/templates/app-nolayers/MyCompanyName.MyProjectName/Program.cs b/templates/app-nolayers/MyCompanyName.MyProjectName/Program.cs index a30410cd0f..87d4d61515 100644 --- a/templates/app-nolayers/MyCompanyName.MyProjectName/Program.cs +++ b/templates/app-nolayers/MyCompanyName.MyProjectName/Program.cs @@ -24,7 +24,6 @@ public class Program try { - Log.Information("Starting MyCompanyName.MyProjectName."); var builder = WebApplication.CreateBuilder(args); builder.Host.AddAppSettingsSecretsJson() .UseAutofac() @@ -32,11 +31,18 @@ public class Program await builder.AddApplicationAsync(); var app = builder.Build(); await app.InitializeApplicationAsync(); + + Log.Information("Starting MyCompanyName.MyProjectName."); await app.RunAsync(); return 0; } catch (Exception ex) { + if (ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal)) + { + throw; + } + Log.Fatal(ex, "MyCompanyName.MyProjectName terminated unexpectedly!"); return 1; }