diff --git a/aspnet-core/CompanyName.ProjectName.sln b/aspnet-core/CompanyName.ProjectName.sln index 085e899f..180e541f 100644 --- a/aspnet-core/CompanyName.ProjectName.sln +++ b/aspnet-core/CompanyName.ProjectName.sln @@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-7 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Application.Tests", "services\test\CompanyName.ProjectName.Application.Tests\CompanyName.ProjectName.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.EntityFrameworkCore.DbMigrations", "services\src\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Domain.Shared", "services\src\CompanyName.ProjectName.Domain.Shared\CompanyName.ProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Application.Contracts", "services\src\CompanyName.ProjectName.Application.Contracts\CompanyName.ProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" @@ -169,10 +167,6 @@ Global {50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU - {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -352,7 +346,6 @@ Global {CA9AC87F-097E-4F15-8393-4BC07735A5B0} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} {04DBDB01-70F4-4E06-B468-8F87850B22BE} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} {50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} - {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} diff --git a/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj b/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj index 0c612dbf..cc572c13 100644 --- a/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj +++ b/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj @@ -15,7 +15,6 @@ - diff --git a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj index d9d44fac..f291110c 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj +++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj @@ -39,7 +39,7 @@ - + diff --git a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs index b6ee4e6d..c477a14d 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs +++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs @@ -52,7 +52,7 @@ namespace CompanyName.ProjectName typeof(AbpCachingStackExchangeRedisModule), typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(ProjectNameApplicationModule), - typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule), + typeof(ProjectNameEntityFrameworkCoreModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpSwashbuckleModule), typeof(AbpAccountWebModule), diff --git a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json index 8690b060..cb3e6c63 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json @@ -15,7 +15,7 @@ "CorsOrigins": "https://*.ProjectName.com,http://localhost:4200,http://localhost:3100" }, "ConnectionStrings": { - "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" }, "Redis": { "Configuration": "localhost,password=mypassword,defaultdatabase=1" diff --git a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/CompanyName.ProjectName.IdentityServer.csproj b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/CompanyName.ProjectName.IdentityServer.csproj index aae881e0..41e5f41f 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/CompanyName.ProjectName.IdentityServer.csproj +++ b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/CompanyName.ProjectName.IdentityServer.csproj @@ -45,7 +45,7 @@ - + diff --git a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs index 6af8c091..ded2833d 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs +++ b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs @@ -45,7 +45,7 @@ namespace CompanyName.ProjectName typeof(AbpAccountWebIdentityServerModule), typeof(AbpAccountApplicationModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), - typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule), + typeof(ProjectNameEntityFrameworkCoreModule), typeof(AbpAspNetCoreSerilogModule) )] public class ProjectNameIdentityServerModule : AbpModule diff --git a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json index 03748433..0b328417 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json +++ b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json @@ -6,7 +6,7 @@ "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307" }, "ConnectionStrings": { - "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" }, "Redis": { "Configuration": "localhost,password=mypassword,defaultdatabase=1" diff --git a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/CompanyName.ProjectName.DbMigrator.csproj b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/CompanyName.ProjectName.DbMigrator.csproj index 871713a1..8f036463 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/CompanyName.ProjectName.DbMigrator.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/CompanyName.ProjectName.DbMigrator.csproj @@ -28,7 +28,7 @@ - + diff --git a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/ProjectNameDbMigratorModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/ProjectNameDbMigratorModule.cs index 7a87799f..001cba66 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/ProjectNameDbMigratorModule.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/ProjectNameDbMigratorModule.cs @@ -7,7 +7,7 @@ namespace CompanyName.ProjectName.DbMigrator { [DependsOn( typeof(AbpAutofacModule), - typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule), + typeof(ProjectNameEntityFrameworkCoreModule), typeof(ProjectNameApplicationContractsModule) )] public class ProjectNameDbMigratorModule : AbpModule diff --git a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json index 24b4a3a1..9b330dd2 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json +++ b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "Default": "Data Source=120.24.194.14;Database=CompanyNameProjectNameDB1;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" } } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj deleted file mode 100644 index babde0a1..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - net5.0 - CompanyName.ProjectName - - - - - - - - - runtime; build; native; contentfiles; analyzers - compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native - - - - diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameEntityFrameworkCoreDbMigrationsModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameEntityFrameworkCoreDbMigrationsModule.cs deleted file mode 100644 index 02684436..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameEntityFrameworkCoreDbMigrationsModule.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Modularity; - -namespace CompanyName.ProjectName.EntityFrameworkCore -{ - [DependsOn( - typeof(ProjectNameEntityFrameworkCoreModule) - )] - public class ProjectNameEntityFrameworkCoreDbMigrationsModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAbpDbContext(); - } - } -} diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContext.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContext.cs deleted file mode 100644 index 7eccf854..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContext.cs +++ /dev/null @@ -1,54 +0,0 @@ -using CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore; -using CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Volo.Abp.AuditLogging.EntityFrameworkCore; -using Volo.Abp.BackgroundJobs.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.FeatureManagement.EntityFrameworkCore; -using Volo.Abp.Identity; -using Volo.Abp.Identity.EntityFrameworkCore; -using Volo.Abp.IdentityServer.EntityFrameworkCore; -using Volo.Abp.PermissionManagement.EntityFrameworkCore; -using Volo.Abp.SettingManagement.EntityFrameworkCore; -using Volo.Abp.TenantManagement.EntityFrameworkCore; - -namespace CompanyName.ProjectName.EntityFrameworkCore -{ - /* This DbContext is only used for database migrations. - * It is not used on runtime. See ProjectNameDbContext for the runtime DbContext. - * It is a unified model that includes configuration for - * all used modules and your application. - */ - public class ProjectNameMigrationsDbContext : AbpDbContext - { - public ProjectNameMigrationsDbContext(DbContextOptions options) - : base(options) - { - } - - protected override void OnModelCreating(ModelBuilder builder) - { - base.OnModelCreating(builder); - - /* Include modules to your migration db context */ - - builder.ConfigurePermissionManagement(); - builder.ConfigureSettingManagement(); - builder.ConfigureBackgroundJobs(); - builder.ConfigureAuditLogging(); - builder.ConfigureIdentity(); - builder.ConfigureIdentityServer(); - builder.ConfigureFeatureManagement(); - builder.ConfigureTenantManagement(); - - /* Configure your own tables/entities inside the ConfigureProjectName method */ - - builder.ConfigureProjectName(); - - // 数据字典 - builder.ConfigureDataDictionaryManagement(); - - builder.ConfigureNotificationManagement(); - } - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/CompanyName.ProjectName.EntityFrameworkCore.csproj b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/CompanyName.ProjectName.EntityFrameworkCore.csproj index 546c884f..92e50f01 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/CompanyName.ProjectName.EntityFrameworkCore.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/CompanyName.ProjectName.EntityFrameworkCore.csproj @@ -1,24 +1,29 @@  - - - net5.0 - CompanyName.ProjectName - - - - - - - - - - - - - - - - + + + net5.0 + CompanyName.ProjectName + + + + + + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers + compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native + + diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs similarity index 93% rename from aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs rename to aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs index e9509f16..4d788744 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using CompanyName.ProjectName.Data; +using Microsoft.EntityFrameworkCore; using Volo.Abp.DependencyInjection; namespace CompanyName.ProjectName.EntityFrameworkCore @@ -27,7 +27,7 @@ namespace CompanyName.ProjectName.EntityFrameworkCore */ await _serviceProvider - .GetRequiredService() + .GetRequiredService() .Database .MigrateAsync(); } diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameDbContext.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameDbContext.cs index 3da930f2..5d34127e 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameDbContext.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameDbContext.cs @@ -1,4 +1,7 @@ -using CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore; +using CompanyName.ProjectName.DataDictionaryManagement; +using CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore; +using CompanyName.ProjectName.NotificationManagement; +using CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using CompanyName.ProjectName.Users; using Volo.Abp.AuditLogging; @@ -67,6 +70,14 @@ namespace CompanyName.ProjectName.EntityFrameworkCore protected override void OnModelCreating(ModelBuilder builder) { + + // 如何设置表前缀 + // Abp框架表前缀 Abp得不建议修改表前缀 + // AbpCommonDbProperties.DbTablePrefix = "xxx"; + // 数据字典表前缀 + //DataDictionaryManagementDbProperties=“xxx” + // 通知模块 + //NotificationManagementDbProperties = "xxx" base.OnModelCreating(builder); builder.ConfigurePermissionManagement( ); @@ -78,6 +89,13 @@ namespace CompanyName.ProjectName.EntityFrameworkCore builder.ConfigureTenantManagement(); builder.ConfigureIdentityServer(); builder.ConfigureProjectName(); + + + // 数据字典 + builder.ConfigureDataDictionaryManagement(); + + // 消息通知 + builder.ConfigureNotificationManagement(); } } } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs similarity index 82% rename from aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs rename to aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs index cb5598b6..cf2727cd 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs @@ -7,18 +7,18 @@ namespace CompanyName.ProjectName.EntityFrameworkCore { /* This class is needed for EF Core console commands * (like Add-Migration and Update-Database commands) */ - public class ProjectNameMigrationsDbContextFactory : IDesignTimeDbContextFactory + public class ProjectNameMigrationsDbContextFactory : IDesignTimeDbContextFactory { - public ProjectNameMigrationsDbContext CreateDbContext(string[] args) + public ProjectNameDbContext CreateDbContext(string[] args) { ProjectNameEfCoreEntityExtensionMappings.Configure(); var configuration = BuildConfiguration(); - var builder = new DbContextOptionsBuilder() + var builder = new DbContextOptionsBuilder() .UseMySql(configuration.GetConnectionString("Default"), MySqlServerVersion.LatestSupportedServerVersion); - return new ProjectNameMigrationsDbContext(builder.Options); + return new ProjectNameDbContext(builder.Options); } private static IConfigurationRoot BuildConfiguration() diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/20210903085042_Init.Designer.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/20211106001555_Init.Designer.cs similarity index 99% rename from aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/20210903085042_Init.Designer.cs rename to aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/20211106001555_Init.Designer.cs index 4687891b..93b9eadb 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/20210903085042_Init.Designer.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/20211106001555_Init.Designer.cs @@ -9,8 +9,8 @@ using Volo.Abp.EntityFrameworkCore; namespace CompanyName.ProjectName.Migrations { - [DbContext(typeof(ProjectNameMigrationsDbContext))] - [Migration("20210903085042_Init")] + [DbContext(typeof(ProjectNameDbContext))] + [Migration("20211106001555_Init")] partial class Init { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -263,7 +263,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ApplicationName") @@ -371,7 +370,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("AuditLogId") @@ -421,7 +419,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("AuditLogId") @@ -471,7 +468,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("EntityChangeId") @@ -513,7 +509,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -571,7 +566,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Name") @@ -602,7 +596,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -649,7 +642,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("SourceTenantId") @@ -675,7 +667,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -752,7 +743,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Action") @@ -827,7 +817,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("AccessFailedCount") @@ -1107,7 +1096,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Code") @@ -2036,7 +2024,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Name") @@ -2068,7 +2055,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Name") @@ -2099,7 +2085,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/20210903085042_Init.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/20211106001555_Init.cs similarity index 100% rename from aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/20210903085042_Init.cs rename to aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/20211106001555_Init.cs diff --git a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/ProjectNameMigrationsDbContextModelSnapshot.cs b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/ProjectNameDbContextModelSnapshot.cs similarity index 99% rename from aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/ProjectNameMigrationsDbContextModelSnapshot.cs rename to aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/ProjectNameDbContextModelSnapshot.cs index fbc1a605..e4ac2580 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/ProjectNameMigrationsDbContextModelSnapshot.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/ProjectNameDbContextModelSnapshot.cs @@ -8,8 +8,8 @@ using Volo.Abp.EntityFrameworkCore; namespace CompanyName.ProjectName.Migrations { - [DbContext(typeof(ProjectNameMigrationsDbContext))] - partial class ProjectNameMigrationsDbContextModelSnapshot : ModelSnapshot + [DbContext(typeof(ProjectNameDbContext))] + partial class ProjectNameDbContextModelSnapshot : ModelSnapshot { protected override void BuildModel(ModelBuilder modelBuilder) { @@ -261,7 +261,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ApplicationName") @@ -369,7 +368,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("AuditLogId") @@ -419,7 +417,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("AuditLogId") @@ -469,7 +466,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("EntityChangeId") @@ -511,7 +507,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -569,7 +564,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Name") @@ -600,7 +594,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -647,7 +640,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("SourceTenantId") @@ -673,7 +665,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -750,7 +741,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Action") @@ -825,7 +815,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("AccessFailedCount") @@ -1105,7 +1094,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Code") @@ -2034,7 +2022,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Name") @@ -2066,7 +2053,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Name") @@ -2097,7 +2083,6 @@ namespace CompanyName.ProjectName.Migrations modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") diff --git a/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj b/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj index 790890e8..0641af02 100644 --- a/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj +++ b/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/ProjectNameEntityFrameworkCoreTestModule.cs b/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/ProjectNameEntityFrameworkCoreTestModule.cs index fb8482e1..8d9831f5 100644 --- a/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/ProjectNameEntityFrameworkCoreTestModule.cs +++ b/aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/ProjectNameEntityFrameworkCoreTestModule.cs @@ -11,8 +11,8 @@ using Volo.Abp.Modularity; namespace CompanyName.ProjectName.EntityFrameworkCore { [DependsOn( - typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule), typeof(ProjectNameTestBaseModule), + typeof(ProjectNameEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreSqliteModule) )] public class ProjectNameEntityFrameworkCoreTestModule : AbpModule @@ -47,11 +47,11 @@ namespace CompanyName.ProjectName.EntityFrameworkCore var connection = new SqliteConnection("Data Source=:memory:"); connection.Open(); - var options = new DbContextOptionsBuilder() + var options = new DbContextOptionsBuilder() .UseSqlite(connection) .Options; - using (var context = new ProjectNameMigrationsDbContext(options)) + using (var context = new ProjectNameDbContext(options)) { context.GetService().CreateTables(); }