diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityConsts.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityConsts.cs deleted file mode 100644 index de7cede4bb..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityConsts.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Volo.Abp.Identity -{ - public static class AbpIdentityConsts - { - public const string DefaultDbTablePrefix = "Abp"; - - public const string DefaultDbSchema = null; - - public const string ConnectionStringName = "AbpIdentity"; - } -} diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDbProperties.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDbProperties.cs new file mode 100644 index 0000000000..9123449357 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDbProperties.cs @@ -0,0 +1,13 @@ +using Volo.Abp.Data; + +namespace Volo.Abp.Identity +{ + public static class AbpIdentityDbProperties + { + public static string DbTablePrefix { get; } = AbpCommonDbProperties.DbTablePrefix; + + public static string DbSchema { get; } = AbpCommonDbProperties.DbSchema; + + public const string ConnectionStringName = "AbpIdentity"; + } +} diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs index 69f0f1e72d..d3c560dca2 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs @@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Volo.Abp.Identity.EntityFrameworkCore { - [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)] + [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)] public interface IIdentityDbContext : IEfCoreDbContext { DbSet Users { get; set; } diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs index a5734a3cda..05050159bc 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs @@ -7,13 +7,9 @@ namespace Volo.Abp.Identity.EntityFrameworkCore /// /// Base class for the Entity Framework database context used for identity. /// - [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)] + [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)] public class IdentityDbContext : AbpDbContext, IIdentityDbContext { - public static string TablePrefix { get; set; } = AbpIdentityConsts.DefaultDbTablePrefix; - - public static string Schema { get; set; } = AbpIdentityConsts.DefaultDbSchema; - public DbSet Users { get; set; } public DbSet Roles { get; set; } @@ -30,11 +26,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore { base.OnModelCreating(builder); - builder.ConfigureIdentity(options => - { - options.TablePrefix = TablePrefix; - options.Schema = Schema; - }); + builder.ConfigureIdentity(); } } } \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs index 5df9e6de60..01adfad531 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs @@ -14,7 +14,10 @@ namespace Volo.Abp.Identity.EntityFrameworkCore { Check.NotNull(builder, nameof(builder)); - var options = new IdentityModelBuilderConfigurationOptions(); + var options = new IdentityModelBuilderConfigurationOptions( + AbpIdentityDbProperties.DbTablePrefix, + AbpIdentityDbProperties.DbSchema + ); optionsAction?.Invoke(options); diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs index 09e1747372..ce27e4c1e9 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs @@ -6,8 +6,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore public class IdentityModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions { public IdentityModelBuilderConfigurationOptions( - [NotNull] string tablePrefix = AbpIdentityConsts.DefaultDbTablePrefix, - [CanBeNull] string schema = AbpIdentityConsts.DefaultDbSchema) + [NotNull] string tablePrefix, + [CanBeNull] string schema) : base( tablePrefix, schema) diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs index b199fbe941..3db35866f5 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs @@ -4,11 +4,9 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.Identity.MongoDB { - [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)] + [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)] public class AbpIdentityMongoDbContext : AbpMongoDbContext, IAbpIdentityMongoDbContext { - public static string CollectionPrefix { get; set; } = AbpIdentityConsts.DefaultDbTablePrefix; - public IMongoCollection Users => Collection(); public IMongoCollection Roles => Collection(); @@ -19,10 +17,7 @@ namespace Volo.Abp.Identity.MongoDB { base.CreateModel(modelBuilder); - modelBuilder.ConfigureIdentity(options => - { - options.CollectionPrefix = CollectionPrefix; - }); + modelBuilder.ConfigureIdentity(); } } } \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContextExtensions.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContextExtensions.cs index 266c100ff6..dd0cc8d42e 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContextExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContextExtensions.cs @@ -11,7 +11,9 @@ namespace Volo.Abp.Identity.MongoDB { Check.NotNull(builder, nameof(builder)); - var options = new IdentityMongoModelBuilderConfigurationOptions(); + var options = new IdentityMongoModelBuilderConfigurationOptions( + AbpIdentityDbProperties.DbTablePrefix + ); optionsAction?.Invoke(options); diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs index 1ed5a4286b..36cdcbec3e 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs @@ -4,7 +4,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.Identity.MongoDB { - [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)] + [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)] public interface IAbpIdentityMongoDbContext : IAbpMongoDbContext { IMongoCollection Users { get; } diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs index 60ab8ef57b..e1c6796d84 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs @@ -1,11 +1,12 @@ -using Volo.Abp.MongoDB; +using JetBrains.Annotations; +using Volo.Abp.MongoDB; namespace Volo.Abp.Identity.MongoDB { public class IdentityMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions { - public IdentityMongoModelBuilderConfigurationOptions() - : base(AbpIdentityConsts.DefaultDbTablePrefix) + public IdentityMongoModelBuilderConfigurationOptions([NotNull] string collectionPrefix = "") + : base(collectionPrefix) { } }