diff --git a/Directory.Build.props b/Directory.Build.props
index 33fca1a0..565a3ed1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,10 +1,10 @@
- 4.3.0
- 2.3.0
- 1.10.2
- 0.6.3
+ 4.4.0
+ 2.4.0
+ 1.10.3
+ 0.7.1
\ No newline at end of file
diff --git a/EShop.sln b/EShop.sln
index c6b3f81f..f003f77d 100644
--- a/EShop.sln
+++ b/EShop.sln
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Application.Tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Web.Tests", "samples\EShopSample\aspnet-core\test\EShopSample.Web.Tests\EShopSample.Web.Tests.csproj", "{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.EntityFrameworkCore.DbMigrations", "samples\EShopSample\aspnet-core\src\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Domain.Shared", "samples\EShopSample\aspnet-core\src\EShopSample.Domain.Shared\EShopSample.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Application.Contracts", "samples\EShopSample\aspnet-core\src\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
@@ -373,10 +371,6 @@ Global
{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.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
@@ -914,7 +908,6 @@ Global
{04DBDB01-70F4-4E06-B468-8F87850B22BE} = {FE0A5FD6-AEE7-4738-9A6D-261BF086704D}
{50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
{5F1B28C6-8D0C-4155-92D0-252F7EA5F674} = {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/azure-pipelines.yml b/azure-pipelines.yml
index 65b40396..330868f1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -105,7 +105,7 @@ stages:
displayName: 'update database'
inputs:
script: |
- dotnet ef database update --project samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EShopSample.EntityFrameworkCore.DbMigrations.csproj -s samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
+ dotnet ef database update --project samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj -s samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
- task: CmdLine@2
inputs:
diff --git a/common.props b/common.props
index c3a60c36..193ec38f 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
latest
- 2.2.2
+ 2.2.3
$(NoWarn);CS1591
true
EasyAbp Team
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj
index e39acaae..a3453e24 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj
@@ -28,7 +28,7 @@
-
+
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSampleDbMigratorModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSampleDbMigratorModule.cs
index 22a22974..3208bdcd 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSampleDbMigratorModule.cs
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSampleDbMigratorModule.cs
@@ -7,7 +7,7 @@ namespace EShopSample.DbMigrator
{
[DependsOn(
typeof(AbpAutofacModule),
- typeof(EShopSampleEntityFrameworkCoreDbMigrationsModule),
+ typeof(EShopSampleEntityFrameworkCoreModule),
typeof(EShopSampleApplicationContractsModule)
)]
public class EShopSampleDbMigratorModule : AbpModule
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/Users/AppUser.cs b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/Users/AppUser.cs
deleted file mode 100644
index 5f4243e3..00000000
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/Users/AppUser.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using Volo.Abp.Domain.Entities.Auditing;
-using Volo.Abp.Users;
-
-namespace EShopSample.Users
-{
- /* This entity shares the same table/collection ("AbpUsers" by default) with the
- * IdentityUser entity of the Identity module.
- *
- * - You can define your custom properties into this class.
- * - You never create or delete this entity, because it is Identity module's job.
- * - You can query users from database with this entity.
- * - You can update values of your custom properties.
- */
- public class AppUser : FullAuditedAggregateRoot, IUser
- {
- #region Base properties
-
- /* These properties are shared with the IdentityUser entity of the Identity module.
- * Do not change these properties through this class. Instead, use Identity module
- * services (like IdentityUserManager) to change them.
- * So, this properties are designed as read only!
- */
-
- public virtual Guid? TenantId { get; private set; }
-
- public virtual string UserName { get; private set; }
-
- public virtual string Name { get; private set; }
-
- public virtual string Surname { get; private set; }
-
- public virtual string Email { get; private set; }
-
- public virtual bool EmailConfirmed { get; private set; }
-
- public virtual string PhoneNumber { get; private set; }
-
- public virtual bool PhoneNumberConfirmed { get; private set; }
-
- #endregion
-
- /* Add your own properties here. Example:
- *
- * public string MyProperty { get; set; }
- *
- * If you add a property and using the EF Core, remember these;
- *
- * 1. Update EShopSampleDbContext.OnModelCreating
- * to configure the mapping for your new property
- * 2. Update EShopSampleEfCoreEntityExtensionMappings to extend the IdentityUser entity
- * and add your new property to the migration.
- * 3. Use the Add-Migration to add a new database migration.
- * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
- * schema change to the database.
- */
-
- private AppUser()
- {
-
- }
- }
-}
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EShopSample.EntityFrameworkCore.DbMigrations.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EShopSample.EntityFrameworkCore.DbMigrations.csproj
deleted file mode 100644
index 4580454a..00000000
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EShopSample.EntityFrameworkCore.DbMigrations.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- net5.0
- EShopSample
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleEntityFrameworkCoreDbMigrationsModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleEntityFrameworkCoreDbMigrationsModule.cs
deleted file mode 100644
index e28ed4ef..00000000
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleEntityFrameworkCoreDbMigrationsModule.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-
-namespace EShopSample.EntityFrameworkCore
-{
- [DependsOn(
- typeof(EShopSampleEntityFrameworkCoreModule)
- )]
- public class EShopSampleEntityFrameworkCoreDbMigrationsModule : AbpModule
- {
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddAbpDbContext();
- }
- }
-}
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContext.cs b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContext.cs
deleted file mode 100644
index e28b73e1..00000000
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContext.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using EasyAbp.EShop.EntityFrameworkCore;
-using EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore;
-using EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore;
-using EasyAbp.PaymentService.EntityFrameworkCore;
-using EasyAbp.PaymentService.Prepayment.EntityFrameworkCore;
-using EasyAbp.PaymentService.WeChatPay.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.EntityFrameworkCore;
-using Volo.Abp.IdentityServer.EntityFrameworkCore;
-using Volo.Abp.PermissionManagement.EntityFrameworkCore;
-using Volo.Abp.SettingManagement.EntityFrameworkCore;
-using Volo.Abp.TenantManagement.EntityFrameworkCore;
-
-namespace EShopSample.EntityFrameworkCore
-{
- /* This DbContext is only used for database migrations.
- * It is not used on runtime. See EShopSampleDbContext for the runtime DbContext.
- * It is a unified model that includes configuration for
- * all used modules and your application.
- */
- public class EShopSampleMigrationsDbContext : AbpDbContext
- {
- public EShopSampleMigrationsDbContext(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 ConfigureEShopSample method */
-
- builder.ConfigureEShopSample();
-
- builder.ConfigureEShop();
-
- builder.ConfigureEShopPluginsBaskets();
- builder.ConfigureEShopPluginsCoupons();
-
- builder.ConfigurePaymentService();
- builder.ConfigurePaymentServiceWeChatPay();
- builder.ConfigurePaymentServicePrepayment();
- }
- }
-}
\ No newline at end of file
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.Designer.cs b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.Designer.cs
deleted file mode 100644
index 19c4cb0a..00000000
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.Designer.cs
+++ /dev/null
@@ -1,3123 +0,0 @@
-//
-using System;
-using EShopSample.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace EShopSample.Migrations
-{
- [DbContext(typeof(EShopSampleMigrationsDbContext))]
- [Migration("20200526074907_AddedCodeToProductSku")]
- partial class AddedCodeToProductSku
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.2")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("EasyAbp.EShop.Orders.Orders.Order", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("CancelledTime")
- .HasColumnType("datetime2");
-
- b.Property("CompletionTime")
- .HasColumnType("datetime2");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Currency")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CustomerRemark")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CustomerUserId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("OrderStatus")
- .HasColumnType("int");
-
- b.Property("PaidTime")
- .HasColumnType("datetime2");
-
- b.Property("PaymentId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductTotalPrice")
- .HasColumnType("decimal(18,6)");
-
- b.Property("ReducedInventoryAfterPaymentTime")
- .HasColumnType("datetime2");
-
- b.Property("ReducedInventoryAfterPlacingTime")
- .HasColumnType("datetime2");
-
- b.Property("RefundedAmount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("StaffRemark")
- .HasColumnType("nvarchar(max)");
-
- b.Property("StoreId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TenantId")
- .HasColumnName("TenantId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TotalDiscount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("TotalPrice")
- .HasColumnType("decimal(18,6)");
-
- b.HasKey("Id");
-
- b.ToTable("EShopOrdersOrders");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Orders.Orders.OrderLine", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Currency")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("MediaResources")
- .HasColumnType("nvarchar(max)");
-
- b.Property("OrderId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductDetailModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("ProductId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("ProductName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ProductSkuId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Quantity")
- .HasColumnType("int");
-
- b.Property("SkuDescription")
- .HasColumnType("nvarchar(max)");
-
- b.Property("TotalDiscount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("TotalPrice")
- .HasColumnType("decimal(18,6)");
-
- b.Property("UnitPrice")
- .HasColumnType("decimal(18,6)");
-
- b.HasKey("Id");
-
- b.HasIndex("OrderId");
-
- b.ToTable("EShopOrdersOrderLines");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.Categories.Category", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("Description")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DisplayName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("IsHidden")
- .HasColumnType("bit");
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("MediaResources")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ParentCategoryId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TenantId")
- .HasColumnName("TenantId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.ToTable("EShopProductsCategories");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.ProductCategories.ProductCategory", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("CategoryId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DisplayOrder")
- .HasColumnType("int");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TenantId")
- .HasColumnName("TenantId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.ToTable("EShopProductsProductCategories");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.ProductDetailHistories.ProductDetailHistory", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("ProductDetailId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("SerializedDto")
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.HasIndex("ModificationTime");
-
- b.HasIndex("ProductDetailId");
-
- b.ToTable("EShopProductsProductDetailHistories");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.ProductDetails.ProductDetail", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("Description")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.ToTable("EShopProductsProductDetails");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.ProductHistories.ProductHistory", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("ProductId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("SerializedDto")
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.HasIndex("ModificationTime");
-
- b.HasIndex("ProductId");
-
- b.ToTable("EShopProductsProductHistories");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.ProductStores.ProductStore", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("IsOwner")
- .HasColumnType("bit");
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("StoreId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TenantId")
- .HasColumnName("TenantId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.ToTable("EShopProductsProductStores");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.ProductTypes.ProductType", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("Description")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DisplayName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("MultiTenancySide")
- .HasColumnType("int");
-
- b.Property("Name")
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.ToTable("EShopProductsProductTypes");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.Products.Product", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("Code")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("DisplayName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DisplayOrder")
- .HasColumnType("int");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("InventoryStrategy")
- .HasColumnType("int");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("IsHidden")
- .HasColumnType("bit");
-
- b.Property("IsPublished")
- .HasColumnType("bit");
-
- b.Property("IsStatic")
- .HasColumnType("bit");
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("MediaResources")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ProductDetailId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductTypeId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.ToTable("EShopProductsProducts");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductAttribute", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("Description")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DisplayName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DisplayOrder")
- .HasColumnType("int");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.HasIndex("ProductId");
-
- b.ToTable("EShopProductsProductAttributes");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductAttributeOption", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("Description")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DisplayName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DisplayOrder")
- .HasColumnType("int");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductAttributeId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.HasIndex("ProductAttributeId");
-
- b.ToTable("EShopProductsProductAttributeOptions");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductSku", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("Code")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Currency")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("Inventory")
- .HasColumnType("int");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("OrderMinQuantity")
- .HasColumnType("int");
-
- b.Property("OriginalPrice")
- .HasColumnType("decimal(18,6)");
-
- b.Property("Price")
- .HasColumnType("decimal(18,6)");
-
- b.Property("ProductDetailId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ProductId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("SerializedAttributeOptionIds")
- .HasColumnType("nvarchar(max)");
-
- b.Property("Sold")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("ProductId");
-
- b.ToTable("EShopProductsProductSkus");
- });
-
- modelBuilder.Entity("EasyAbp.EShop.Stores.Stores.Store", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Name")
- .HasColumnType("nvarchar(max)");
-
- b.Property("TenantId")
- .HasColumnName("TenantId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.ToTable("EShopStoresStores");
- });
-
- modelBuilder.Entity("EasyAbp.PaymentService.Payments.Payment", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ActualPaymentAmount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("CancelledTime")
- .HasColumnType("datetime2");
-
- b.Property("CompletionTime")
- .HasColumnType("datetime2");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Currency")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("ExternalTradingCode")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("OriginalPaymentAmount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("PayeeAccount")
- .HasColumnType("nvarchar(max)");
-
- b.Property("PaymentDiscount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("PaymentMethod")
- .HasColumnType("nvarchar(max)");
-
- b.Property("RefundAmount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("TenantId")
- .HasColumnName("TenantId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("UserId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.ToTable("PaymentServicePayments");
- });
-
- modelBuilder.Entity("EasyAbp.PaymentService.Payments.PaymentItem", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ActualPaymentAmount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Currency")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("ItemKey")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ItemType")
- .HasColumnType("nvarchar(max)");
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property("LastModifierId")
- .HasColumnName("LastModifierId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("OriginalPaymentAmount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("PaymentDiscount")
- .HasColumnType("decimal(18,6)");
-
- b.Property("PaymentId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("RefundAmount")
- .HasColumnType("decimal(18,6)");
-
- b.HasKey("Id");
-
- b.HasIndex("PaymentId");
-
- b.ToTable("PaymentServicePaymentItems");
- });
-
- modelBuilder.Entity("EasyAbp.PaymentService.Refunds.Refund", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnName("ConcurrencyStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnName("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("CreatorId")
- .HasColumnName("CreatorId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Currency")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CustomerRemark")
- .HasColumnType("nvarchar(max)");
-
- b.Property("DeleterId")
- .HasColumnName("DeleterId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("DeletionTime")
- .HasColumnName("DeletionTime")
- .HasColumnType("datetime2");
-
- b.Property("ExternalTradingCode")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnName("ExtraProperties")
- .HasColumnType("nvarchar(max)");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnName("IsDeleted")
- .HasColumnType("bit")
- .HasDefaultValue(false);
-
- b.Property("LastModificationTime")
- .HasColumnName("LastModificationTime")
- .HasColumnType("datetime2");
-
- b.Property