diff --git a/plugins/Baskets/host/EasyAbp.EShop.Plugins.Baskets.Host.Shared/EasyAbp.EShop.Plugins.Baskets.Host.Shared.csproj b/plugins/Baskets/host/EasyAbp.EShop.Plugins.Baskets.Host.Shared/EasyAbp.EShop.Plugins.Baskets.Host.Shared.csproj index 99d28ac5..1669f598 100644 --- a/plugins/Baskets/host/EasyAbp.EShop.Plugins.Baskets.Host.Shared/EasyAbp.EShop.Plugins.Baskets.Host.Shared.csproj +++ b/plugins/Baskets/host/EasyAbp.EShop.Plugins.Baskets.Host.Shared/EasyAbp.EShop.Plugins.Baskets.Host.Shared.csproj @@ -1,10 +1,10 @@ - + netstandard2.0 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp.EShop.Plugins.Baskets.Application.Contracts.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp.EShop.Plugins.Baskets.Application.Contracts.csproj index 49ddd868..f1a06543 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp.EShop.Plugins.Baskets.Application.Contracts.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp.EShop.Plugins.Baskets.Application.Contracts.csproj @@ -1,10 +1,10 @@ - + netstandard2.0 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/BasketsApplicationContractsModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationContractsModule.cs similarity index 66% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/BasketsApplicationContractsModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationContractsModule.cs index 2ce50989..ebb601f3 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/BasketsApplicationContractsModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationContractsModule.cs @@ -5,11 +5,11 @@ using Volo.Abp.Authorization; namespace EasyAbp.EShop.Plugins.Baskets { [DependsOn( - typeof(BasketsDomainSharedModule), + typeof(EShopPluginsBasketsDomainSharedModule), typeof(AbpDddApplicationContractsModule), typeof(AbpAuthorizationModule) )] - public class BasketsApplicationContractsModule : AbpModule + public class EShopPluginsBasketsApplicationContractsModule : AbpModule { } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Permissions/BasketsPermissionDefinitionProvider.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/Permissions/BasketsPermissionDefinitionProvider.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Permissions/BasketsPermissionDefinitionProvider.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/Permissions/BasketsPermissionDefinitionProvider.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Permissions/BasketsPermissions.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/Permissions/BasketsPermissions.cs similarity index 79% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Permissions/BasketsPermissions.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/Permissions/BasketsPermissions.cs index 7c918e05..792e469c 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Permissions/BasketsPermissions.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/Permissions/BasketsPermissions.cs @@ -4,7 +4,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.Permissions { public class BasketsPermissions { - public const string GroupName = "Baskets"; + public const string GroupName = "EasyAbp.EShop.Plugins.Baskets"; public static string[] GetAll() { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/ISampleAppService.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/ISampleAppService.cs deleted file mode 100644 index a99651a9..00000000 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/ISampleAppService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace EasyAbp.EShop.Plugins.Baskets.Samples -{ - public interface ISampleAppService : IApplicationService - { - Task GetAsync(); - - Task GetAuthorizedAsync(); - } -} diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/SampleDto.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/SampleDto.cs deleted file mode 100644 index 6687989f..00000000 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/SampleDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace EasyAbp.EShop.Plugins.Baskets.Samples -{ - public class SampleDto - { - public int Value { get; set; } - } -} \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp.EShop.Plugins.Baskets.Application.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp.EShop.Plugins.Baskets.Application.csproj index dee82201..c8878160 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp.EShop.Plugins.Baskets.Application.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp.EShop.Plugins.Baskets.Application.csproj @@ -1,10 +1,10 @@ - + netstandard2.0 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsAppService.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketsAppService.cs similarity index 80% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsAppService.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketsAppService.cs index 86b879a0..19f9a367 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsAppService.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketsAppService.cs @@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Plugins.Baskets protected BasketsAppService() { LocalizationResource = typeof(BasketsResource); - ObjectMapperContext = typeof(BasketsApplicationModule); + ObjectMapperContext = typeof(EShopPluginsBasketsApplicationModule); } } } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsApplicationAutoMapperProfile.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketsApplicationAutoMapperProfile.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsApplicationAutoMapperProfile.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketsApplicationAutoMapperProfile.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsApplicationModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationModule.cs similarity index 57% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsApplicationModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationModule.cs index dddaa4c0..932fc751 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsApplicationModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationModule.cs @@ -6,19 +6,19 @@ using Volo.Abp.Application; namespace EasyAbp.EShop.Plugins.Baskets { [DependsOn( - typeof(BasketsDomainModule), - typeof(BasketsApplicationContractsModule), + typeof(EShopPluginsBasketsDomainModule), + typeof(EShopPluginsBasketsApplicationContractsModule), typeof(AbpDddApplicationModule), typeof(AbpAutoMapperModule) )] - public class BasketsApplicationModule : AbpModule + public class EShopPluginsBasketsApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); + context.Services.AddAutoMapperObjectMapper(); Configure(options => { - options.AddMaps(validate: true); + options.AddMaps(validate: true); }); } } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/Samples/SampleAppService.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/Samples/SampleAppService.cs deleted file mode 100644 index 44abc336..00000000 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/Samples/SampleAppService.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; - -namespace EasyAbp.EShop.Plugins.Baskets.Samples -{ - public class SampleAppService : BasketsAppService, ISampleAppService - { - public Task GetAsync() - { - return Task.FromResult( - new SampleDto - { - Value = 42 - } - ); - } - - [Authorize] - public Task GetAuthorizedAsync() - { - return Task.FromResult( - new SampleDto - { - Value = 42 - } - ); - } - } -} \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp.EShop.Plugins.Baskets.Domain.Shared.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp.EShop.Plugins.Baskets.Domain.Shared.csproj index d1ce5054..0c36eb7f 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp.EShop.Plugins.Baskets.Domain.Shared.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp.EShop.Plugins.Baskets.Domain.Shared.csproj @@ -1,10 +1,10 @@ - + netstandard2.0 - EasyAbp.EShop.Plugins.Baskets + true @@ -17,8 +17,8 @@ - - + + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/BasketsErrorCodes.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/BasketsErrorCodes.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/BasketsErrorCodes.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/BasketsErrorCodes.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/BasketsDomainSharedModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainSharedModule.cs similarity index 72% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/BasketsDomainSharedModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainSharedModule.cs index a29726bd..2031e0ca 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/BasketsDomainSharedModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainSharedModule.cs @@ -11,13 +11,13 @@ namespace EasyAbp.EShop.Plugins.Baskets [DependsOn( typeof(AbpValidationModule) )] - public class BasketsDomainSharedModule : AbpModule + public class EShopPluginsBasketsDomainSharedModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { Configure(options => { - options.FileSets.AddEmbedded(); + options.FileSets.AddEmbedded(); }); Configure(options => @@ -25,12 +25,12 @@ namespace EasyAbp.EShop.Plugins.Baskets options.Resources .Add("en") .AddBaseTypes(typeof(AbpValidationResource)) - .AddVirtualJson("/Localization/Baskets"); + .AddVirtualJson("/EasyAbp/EShop/Plugins/Baskets/Localization"); }); Configure(options => { - options.MapCodeNamespace("Baskets", typeof(BasketsResource)); + options.MapCodeNamespace("EasyAbp.EShop.Plugins.Baskets", typeof(BasketsResource)); }); } } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/BasketsResource.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs similarity index 72% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/BasketsResource.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs index ad1315a4..73e83b8e 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/BasketsResource.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs @@ -2,7 +2,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.Localization { - [LocalizationResourceName("Baskets")] + [LocalizationResourceName("EShopPluginsBaskets")] public class BasketsResource { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/cs.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/cs.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/cs.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/cs.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/en.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/en.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/en.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/en.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/pl-PL.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pl-PL.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/pl-PL.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pl-PL.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/pt-BR.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pt-BR.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/pt-BR.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pt-BR.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/sl.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/sl.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/sl.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/sl.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/tr.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/tr.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/tr.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/tr.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/vi.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/vi.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/vi.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/vi.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/zh-Hans.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hans.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/zh-Hans.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hans.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/zh-Hant.json b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hant.json similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/Baskets/zh-Hant.json rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hant.json diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp.EShop.Plugins.Baskets.Domain.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp.EShop.Plugins.Baskets.Domain.csproj index c605738d..005e935a 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp.EShop.Plugins.Baskets.Domain.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp.EShop.Plugins.Baskets.Domain.csproj @@ -1,10 +1,10 @@ - + netstandard2.0 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItem.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItem.cs new file mode 100644 index 00000000..78a009e1 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItem.cs @@ -0,0 +1,41 @@ +using System; +using JetBrains.Annotations; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; + +namespace EasyAbp.EShop.Plugins.Baskets.BasketItems +{ + public class BasketItem : CreationAuditedAggregateRoot, IMultiTenant + { + public virtual Guid? TenantId { get; protected set; } + + [NotNull] + public virtual string BasketLabel { get; protected set; } + + public virtual Guid UserId { get; protected set; } + + public virtual Guid ProductId { get; protected set; } + + public virtual Guid ProductSkuId { get; protected set; } + + public virtual int Quantity { get; protected set; } + + [CanBeNull] + public virtual string MediaResources { get; protected set; } + + [NotNull] + public virtual string ProductName { get; protected set; } + + [NotNull] + public virtual string SkuDescription { get; protected set; } + + [NotNull] + public virtual string Currency { get; protected set; } + + public virtual decimal UnitPrice { get; protected set; } + + public virtual decimal TotalPrice { get; protected set; } + + public virtual decimal TotalDiscount { get; protected set; } + } +} \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDbProperties.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketsDbProperties.cs similarity index 51% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDbProperties.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketsDbProperties.cs index c68088af..63e1a36a 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDbProperties.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketsDbProperties.cs @@ -2,10 +2,10 @@ { public static class BasketsDbProperties { - public static string DbTablePrefix { get; set; } = "Baskets"; + public static string DbTablePrefix { get; set; } = "EShopPluginsBaskets"; public static string DbSchema { get; set; } = null; - public const string ConnectionStringName = "Baskets"; + public const string ConnectionStringName = "EShopPluginsBaskets"; } } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDomainModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainModule.cs similarity index 50% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDomainModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainModule.cs index 36f437fd..2bf6f10c 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDomainModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainModule.cs @@ -3,9 +3,9 @@ namespace EasyAbp.EShop.Plugins.Baskets { [DependsOn( - typeof(BasketsDomainSharedModule) + typeof(EShopPluginsBasketsDomainSharedModule) )] - public class BasketsDomainModule : AbpModule + public class EShopPluginsBasketsDomainModule : AbpModule { } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/Settings/BasketsSettingDefinitionProvider.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/Settings/BasketsSettingDefinitionProvider.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/Settings/BasketsSettingDefinitionProvider.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/Settings/BasketsSettingDefinitionProvider.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/Settings/BasketsSettings.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/Settings/BasketsSettings.cs similarity index 77% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/Settings/BasketsSettings.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/Settings/BasketsSettings.cs index 42787a22..c27f0458 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/Settings/BasketsSettings.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/Settings/BasketsSettings.cs @@ -2,7 +2,7 @@ { public static class BasketsSettings { - public const string GroupName = "Baskets"; + public const string GroupName = "EasyAbp.EShop.Plugins.Baskets"; /* Add constants for setting names. Example: * public const string MySettingName = GroupName + ".MySettingName"; diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj index 03723037..235ab194 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj @@ -1,10 +1,10 @@ - + netstandard2.0 - EasyAbp.EShop.Plugins.Baskets + @@ -12,4 +12,8 @@ + + + + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContext.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContext.cs similarity index 93% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContext.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContext.cs index 96f4e1e7..e795b311 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContext.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContext.cs @@ -21,7 +21,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore { base.OnModelCreating(builder); - builder.ConfigureBaskets(); + builder.ConfigurePluginsBaskets(); } } } \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs similarity index 96% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs index cd7da715..b336a8e4 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs @@ -6,7 +6,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore { public static class BasketsDbContextModelCreatingExtensions { - public static void ConfigureBaskets( + public static void ConfigurePluginsBaskets( this ModelBuilder builder, Action optionsAction = null) { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsModelBuilderConfigurationOptions.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsModelBuilderConfigurationOptions.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsModelBuilderConfigurationOptions.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsModelBuilderConfigurationOptions.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsEntityFrameworkCoreModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/EShopPluginsBasketsEntityFrameworkCoreModule.cs similarity index 83% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsEntityFrameworkCoreModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/EShopPluginsBasketsEntityFrameworkCoreModule.cs index 1aeb25d0..d09f3981 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsEntityFrameworkCoreModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/EShopPluginsBasketsEntityFrameworkCoreModule.cs @@ -5,10 +5,10 @@ using Volo.Abp.Modularity; namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore { [DependsOn( - typeof(BasketsDomainModule), + typeof(EShopPluginsBasketsDomainModule), typeof(AbpEntityFrameworkCoreModule) )] - public class BasketsEntityFrameworkCoreModule : AbpModule + public class EShopPluginsBasketsEntityFrameworkCoreModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/IBasketsDbContext.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/IBasketsDbContext.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/IBasketsDbContext.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/IBasketsDbContext.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.csproj index 32172139..e63ab89f 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.csproj @@ -1,10 +1,10 @@ - + netstandard2.0 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/BasketsHttpApiClientModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiClientModule.cs similarity index 59% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/BasketsHttpApiClientModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiClientModule.cs index 4b15927e..6d38c5d9 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/BasketsHttpApiClientModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiClientModule.cs @@ -5,16 +5,16 @@ using Volo.Abp.Modularity; namespace EasyAbp.EShop.Plugins.Baskets { [DependsOn( - typeof(BasketsApplicationContractsModule), + typeof(EShopPluginsBasketsApplicationContractsModule), typeof(AbpHttpClientModule))] - public class BasketsHttpApiClientModule : AbpModule + public class EShopPluginsBasketsHttpApiClientModule : AbpModule { - public const string RemoteServiceName = "Baskets"; + public const string RemoteServiceName = "EShopPluginsBaskets"; public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddHttpClientProxies( - typeof(BasketsApplicationContractsModule).Assembly, + typeof(EShopPluginsBasketsApplicationContractsModule).Assembly, RemoteServiceName ); } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp.EShop.Plugins.Baskets.HttpApi.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp.EShop.Plugins.Baskets.HttpApi.csproj index 08b50f11..a611e617 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp.EShop.Plugins.Baskets.HttpApi.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp.EShop.Plugins.Baskets.HttpApi.csproj @@ -1,10 +1,10 @@ - + netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/BasketsController.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/BasketsController.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/BasketsController.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/BasketsController.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/BasketsHttpApiModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiModule.cs similarity index 84% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/BasketsHttpApiModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiModule.cs index f5973ac6..51e83f33 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/BasketsHttpApiModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiModule.cs @@ -8,15 +8,15 @@ using Microsoft.Extensions.DependencyInjection; namespace EasyAbp.EShop.Plugins.Baskets { [DependsOn( - typeof(BasketsApplicationContractsModule), + typeof(EShopPluginsBasketsApplicationContractsModule), typeof(AbpAspNetCoreMvcModule))] - public class BasketsHttpApiModule : AbpModule + public class EShopPluginsBasketsHttpApiModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) { PreConfigure(mvcBuilder => { - mvcBuilder.AddApplicationPartIfNotExists(typeof(BasketsHttpApiModule).Assembly); + mvcBuilder.AddApplicationPartIfNotExists(typeof(EShopPluginsBasketsHttpApiModule).Assembly); }); } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/Samples/SampleController.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/Samples/SampleController.cs deleted file mode 100644 index ba72662d..00000000 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/Samples/SampleController.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp; - -namespace EasyAbp.EShop.Plugins.Baskets.Samples -{ - [RemoteService] - [Route("api/Baskets/sample")] - public class SampleController : BasketsController, ISampleAppService - { - private readonly ISampleAppService _sampleAppService; - - public SampleController(ISampleAppService sampleAppService) - { - _sampleAppService = sampleAppService; - } - - [HttpGet] - public async Task GetAsync() - { - return await _sampleAppService.GetAsync(); - } - - [HttpGet] - [Route("authorized")] - [Authorize] - public async Task GetAuthorizedAsync() - { - return await _sampleAppService.GetAsync(); - } - } -} diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp.EShop.Plugins.Baskets.MongoDB.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp.EShop.Plugins.Baskets.MongoDB.csproj index 6f789b89..e1468e3f 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp.EShop.Plugins.Baskets.MongoDB.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp.EShop.Plugins.Baskets.MongoDB.csproj @@ -1,10 +1,10 @@ - + netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + @@ -12,4 +12,8 @@ + + + + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbContext.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/BasketsMongoDbContext.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbContext.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/BasketsMongoDbContext.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbContextExtensions.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/BasketsMongoDbContextExtensions.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbContextExtensions.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/BasketsMongoDbContextExtensions.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoModelBuilderConfigurationOptions.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/BasketsMongoModelBuilderConfigurationOptions.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoModelBuilderConfigurationOptions.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/BasketsMongoModelBuilderConfigurationOptions.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/EShopPluginsBasketsMongoDbModule.cs similarity index 84% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/EShopPluginsBasketsMongoDbModule.cs index 86b1321c..1d81ef0d 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/EShopPluginsBasketsMongoDbModule.cs @@ -5,10 +5,10 @@ using Volo.Abp.MongoDB; namespace EasyAbp.EShop.Plugins.Baskets.MongoDB { [DependsOn( - typeof(BasketsDomainModule), + typeof(EShopPluginsBasketsDomainModule), typeof(AbpMongoDbModule) )] - public class BasketsMongoDbModule : AbpModule + public class EShopPluginsBasketsMongoDbModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/IBasketsMongoDbContext.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/IBasketsMongoDbContext.cs similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/IBasketsMongoDbContext.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/IBasketsMongoDbContext.cs diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/BasketsWebModule.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EShopPluginsBasketsWebModule.cs similarity index 78% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/BasketsWebModule.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EShopPluginsBasketsWebModule.cs index 6464cacf..682c5de7 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/BasketsWebModule.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EShopPluginsBasketsWebModule.cs @@ -13,22 +13,22 @@ using EasyAbp.EShop.Plugins.Baskets.Permissions; namespace EasyAbp.EShop.Plugins.Baskets.Web { [DependsOn( - typeof(BasketsHttpApiModule), + typeof(EShopPluginsBasketsHttpApiModule), typeof(AbpAspNetCoreMvcUiThemeSharedModule), typeof(AbpAutoMapperModule) )] - public class BasketsWebModule : AbpModule + public class EShopPluginsBasketsWebModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) { context.Services.PreConfigure(options => { - options.AddAssemblyResource(typeof(BasketsResource), typeof(BasketsWebModule).Assembly); + options.AddAssemblyResource(typeof(BasketsResource), typeof(EShopPluginsBasketsWebModule).Assembly); }); PreConfigure(mvcBuilder => { - mvcBuilder.AddApplicationPartIfNotExists(typeof(BasketsWebModule).Assembly); + mvcBuilder.AddApplicationPartIfNotExists(typeof(EShopPluginsBasketsWebModule).Assembly); }); } @@ -41,13 +41,13 @@ namespace EasyAbp.EShop.Plugins.Baskets.Web Configure(options => { - options.FileSets.AddEmbedded(); + options.FileSets.AddEmbedded(); }); - context.Services.AddAutoMapperObjectMapper(); + context.Services.AddAutoMapperObjectMapper(); Configure(options => { - options.AddMaps(validate: true); + options.AddMaps(validate: true); }); Configure(options => diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EasyAbp.EShop.Plugins.Baskets.Web.csproj b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EasyAbp.EShop.Plugins.Baskets.Web.csproj index edb04221..4cb1aba0 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EasyAbp.EShop.Plugins.Baskets.Web.csproj +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EasyAbp.EShop.Plugins.Baskets.Web.csproj @@ -1,6 +1,6 @@ - + netcoreapp3.1 @@ -31,6 +31,14 @@ + + true + PreserveNewest + + + true + PreserveNewest + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xsd b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenus.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenus.cs index ceafecf2..8f0fc7fd 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenus.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenus.cs @@ -2,7 +2,7 @@ { public class BasketsMenus { - private const string Prefix = "Baskets"; + private const string Prefix = "EasyAbp.EShop.Plugins.Baskets"; //Add your menu items here... //public const string Home = Prefix + ".MyNewMenuItem"; diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/BasketsPageModel.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/BasketsPageModel.cs index ba95da76..3078fea0 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/BasketsPageModel.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/BasketsPageModel.cs @@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.Web.Pages protected BasketsPageModel() { LocalizationResourceType = typeof(BasketsResource); - ObjectMapperContext = typeof(BasketsWebModule); + ObjectMapperContext = typeof(EShopPluginsBasketsWebModule); } } } \ No newline at end of file diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml similarity index 71% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml index 9b68dd59..de6ee7a1 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml @@ -1,7 +1,7 @@ @page @using Microsoft.Extensions.Localization @using EasyAbp.EShop.Plugins.Baskets.Localization -@model EasyAbp.EShop.Plugins.Baskets.Web.Pages.Baskets.IndexModel +@model EasyAbp.EShop.Plugins.Baskets.Web.Pages.EShop.Plugins.Baskets.IndexModel @inject IStringLocalizer L @{ } diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml.cs similarity index 59% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml.cs rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml.cs index ed55f79c..ef49669a 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml.cs @@ -1,4 +1,4 @@ -namespace EasyAbp.EShop.Plugins.Baskets.Web.Pages.Baskets +namespace EasyAbp.EShop.Plugins.Baskets.Web.Pages.EShop.Plugins.Baskets { public class IndexModel : BasketsPageModel { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/_ViewImports.cshtml b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/_ViewImports.cshtml similarity index 100% rename from plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/_ViewImports.cshtml rename to plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/_ViewImports.cshtml diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/BasketsApplicationTestModule.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/BasketsApplicationTestModule.cs index 767da374..4dcd14ee 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/BasketsApplicationTestModule.cs +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/BasketsApplicationTestModule.cs @@ -3,7 +3,7 @@ namespace EasyAbp.EShop.Plugins.Baskets { [DependsOn( - typeof(BasketsApplicationModule), + typeof(EShopPluginsBasketsApplicationModule), typeof(BasketsDomainTestModule) )] public class BasketsApplicationTestModule : AbpModule diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj index c06c1827..de08d856 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj @@ -1,10 +1,10 @@ - + netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xml b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xsd b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/Samples/SampleAppService_Tests.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/Samples/SampleAppService_Tests.cs deleted file mode 100644 index 36de476a..00000000 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/Samples/SampleAppService_Tests.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace EasyAbp.EShop.Plugins.Baskets.Samples -{ - public class SampleAppService_Tests : BasketsApplicationTestBase - { - private readonly ISampleAppService _sampleAppService; - - public SampleAppService_Tests() - { - _sampleAppService = GetRequiredService(); - } - - [Fact] - public async Task GetAsync() - { - var result = await _sampleAppService.GetAsync(); - result.Value.ShouldBe(42); - } - - [Fact] - public async Task GetAuthorizedAsync() - { - var result = await _sampleAppService.GetAuthorizedAsync(); - result.Value.ShouldBe(42); - } - } -} diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj index 7df70f66..3bc3982c 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj @@ -1,10 +1,10 @@ - + netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xml b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xsd b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/Samples/SampleManager_Tests.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/Samples/SampleManager_Tests.cs deleted file mode 100644 index 28ff298e..00000000 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/Samples/SampleManager_Tests.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Threading.Tasks; -using Xunit; - -namespace EasyAbp.EShop.Plugins.Baskets.Samples -{ - public class SampleManager_Tests : BasketsDomainTestBase - { - //private readonly SampleManager _sampleManager; - - public SampleManager_Tests() - { - //_sampleManager = GetRequiredService(); - } - - [Fact] - public async Task Method1Async() - { - - } - } -} diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj index a7682ae9..6c105219 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj @@ -1,10 +1,10 @@ - + netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/BasketsEntityFrameworkCoreTestModule.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/BasketsEntityFrameworkCoreTestModule.cs index ae4d1373..fe974241 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/BasketsEntityFrameworkCoreTestModule.cs +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/BasketsEntityFrameworkCoreTestModule.cs @@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore { [DependsOn( typeof(BasketsTestBaseModule), - typeof(BasketsEntityFrameworkCoreModule), + typeof(EShopPluginsBasketsEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreSqliteModule) )] public class BasketsEntityFrameworkCoreTestModule : AbpModule diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs deleted file mode 100644 index 0a7c1c04..00000000 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs +++ /dev/null @@ -1,12 +0,0 @@ -using EasyAbp.EShop.Plugins.Baskets.Samples; - -namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Samples -{ - public class SampleRepository_Tests : SampleRepository_Tests - { - /* Don't write custom repository tests here, instead write to - * the base class. - * One exception can be some specific tests related to EF core. - */ - } -} diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xml b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xsd b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/BasketsConsoleApiClientModule.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/BasketsConsoleApiClientModule.cs index b7d52b54..e5ec6265 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/BasketsConsoleApiClientModule.cs +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/BasketsConsoleApiClientModule.cs @@ -4,7 +4,7 @@ using Volo.Abp.Modularity; namespace EasyAbp.EShop.Plugins.Baskets { [DependsOn( - typeof(BasketsHttpApiClientModule), + typeof(EShopPluginsBasketsHttpApiClientModule), typeof(AbpHttpClientIdentityModelModule) )] public class BasketsConsoleApiClientModule : AbpModule diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index 323691f0..e2e0d81b 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -3,7 +3,6 @@ using System.Net.Http; using System.Threading.Tasks; using IdentityModel.Client; using Microsoft.Extensions.Configuration; -using EasyAbp.EShop.Plugins.Baskets.Samples; using Volo.Abp.DependencyInjection; using Volo.Abp.IdentityModel; @@ -11,16 +10,13 @@ namespace EasyAbp.EShop.Plugins.Baskets { public class ClientDemoService : ITransientDependency { - private readonly ISampleAppService _sampleAppService; private readonly IIdentityModelAuthenticationService _authenticationService; private readonly IConfiguration _configuration; public ClientDemoService( - ISampleAppService sampleAppService, IIdentityModelAuthenticationService authenticationService, IConfiguration configuration) { - _sampleAppService = sampleAppService; _authenticationService = authenticationService; _configuration = configuration; } @@ -40,12 +36,6 @@ namespace EasyAbp.EShop.Plugins.Baskets { Console.WriteLine(); Console.WriteLine($"***** {nameof(TestWithDynamicProxiesAsync)} *****"); - - var result = await _sampleAppService.GetAsync(); - Console.WriteLine("Result: " + result.Value); - - result = await _sampleAppService.GetAuthorizedAsync(); - Console.WriteLine("Result (authorized): " + result.Value); } /* Shows how to use HttpClient to perform a request to the HTTP API. diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp.csproj index a9a9510c..9b345f73 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj index 90c433a8..3a0e6aa3 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj @@ -1,10 +1,10 @@ - + netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xml b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xsd b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/BasketsMongoDbTestModule.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/BasketsMongoDbTestModule.cs index 505356e1..ef8b81f3 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/BasketsMongoDbTestModule.cs +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/BasketsMongoDbTestModule.cs @@ -6,7 +6,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.MongoDB { [DependsOn( typeof(BasketsTestBaseModule), - typeof(BasketsMongoDbModule) + typeof(EShopPluginsBasketsMongoDbModule) )] public class BasketsMongoDbTestModule : AbpModule { diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs deleted file mode 100644 index 21ad0560..00000000 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs +++ /dev/null @@ -1,14 +0,0 @@ -using EasyAbp.EShop.Plugins.Baskets.Samples; -using Xunit; - -namespace EasyAbp.EShop.Plugins.Baskets.MongoDB.Samples -{ - [Collection(MongoTestCollection.Name)] - public class SampleRepository_Tests : SampleRepository_Tests - { - /* Don't write custom repository tests here, instead write to - * the base class. - * One exception can be some specific tests related to MongoDB. - */ - } -} diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/BasketsTestBaseModule.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/BasketsTestBaseModule.cs index 2ca6280b..29271fd7 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/BasketsTestBaseModule.cs +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/BasketsTestBaseModule.cs @@ -12,7 +12,7 @@ namespace EasyAbp.EShop.Plugins.Baskets typeof(AbpAutofacModule), typeof(AbpTestBaseModule), typeof(AbpAuthorizationModule), - typeof(BasketsDomainModule) + typeof(EShopPluginsBasketsDomainModule) )] public class BasketsTestBaseModule : AbpModule { diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj index e2eab95c..50ff4421 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj @@ -1,10 +1,10 @@ - + netcoreapp3.1 - EasyAbp.EShop.Plugins.Baskets + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xml b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xsd b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/Samples/SampleRepository_Tests.cs b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/Samples/SampleRepository_Tests.cs deleted file mode 100644 index 555b4eed..00000000 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/Samples/SampleRepository_Tests.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Modularity; -using Xunit; - -namespace EasyAbp.EShop.Plugins.Baskets.Samples -{ - /* Write your custom repository tests like that, in this project, as abstract classes. - * Then inherit these abstract classes from EF Core & MongoDB test projects. - * In this way, both database providers are tests with the same set tests. - */ - public abstract class SampleRepository_Tests : BasketsTestBase - where TStartupModule : IAbpModule - { - //private readonly ISampleRepository _sampleRepository; - - protected SampleRepository_Tests() - { - //_sampleRepository = GetRequiredService(); - } - - [Fact] - public async Task Method1Async() - { - - } - } -} diff --git a/samples/EShopSample/aspnet-core/EShopSample.sln b/samples/EShopSample/aspnet-core/EShopSample.sln index e453e858..f0730436 100644 --- a/samples/EShopSample/aspnet-core/EShopSample.sln +++ b/samples/EShopSample/aspnet-core/EShopSample.sln @@ -267,6 +267,40 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Coupons", "Coupons", "{6D9A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExpressDelivery", "ExpressDelivery", "{04F47882-9E52-4555-A2DC-1A5164EA04DB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E629CC4-E7E7-4785-BC26-1C5087909879}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.Application", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.Application\EasyAbp.EShop.Plugins.Baskets.Application.csproj", "{B6F50299-D334-407E-81CC-92123C502F5D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.Application.Contracts", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.Application.Contracts\EasyAbp.EShop.Plugins.Baskets.Application.Contracts.csproj", "{83B7D504-05A5-4E8D-866A-BE10CAEAA3B6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.Domain", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.Domain\EasyAbp.EShop.Plugins.Baskets.Domain.csproj", "{AF779BD9-F8EC-4A7B-9885-DDBA5155219C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.Domain.Shared", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.Domain.Shared\EasyAbp.EShop.Plugins.Baskets.Domain.Shared.csproj", "{5D46CA17-B7B1-47EB-852C-2685F38D2B62}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj", "{FFD4CD13-97E4-42EB-A6A3-97F2140738D0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.HttpApi", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.HttpApi\EasyAbp.EShop.Plugins.Baskets.HttpApi.csproj", "{38CEF8C8-8DE0-49CF-984B-D1BA03542321}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.HttpApi.Client", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.HttpApi.Client\EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.csproj", "{442B331D-DD64-43A3-8533-70FC99BDDD42}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.MongoDB", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.MongoDB\EasyAbp.EShop.Plugins.Baskets.MongoDB.csproj", "{D2621F2C-463F-463B-8007-A29005400385}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.Web", "..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.Web\EasyAbp.EShop.Plugins.Baskets.Web.csproj", "{7DD60A60-597D-4D90-B861-457930B652A5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9333EF8D-0A21-4586-81EB-9C39ECA2873C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.Application.Tests", "..\..\..\plugins\Baskets\test\EasyAbp.EShop.Plugins.Baskets.Application.Tests\EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj", "{9AE9D280-542A-4DB1-AD64-CBEA05043F0A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.Domain.Tests", "..\..\..\plugins\Baskets\test\EasyAbp.EShop.Plugins.Baskets.Domain.Tests\EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj", "{3DD64C01-52DC-4E04-A7E3-65FFB22B3895}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests", "..\..\..\plugins\Baskets\test\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj", "{E8E8C326-CD54-4158-B5C1-D7265457E2FA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp", "..\..\..\plugins\Baskets\test\EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp\EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp.csproj", "{8A2C9B88-9257-4489-B0B4-F26AF3B01FA2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests", "..\..\..\plugins\Baskets\test\EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests\EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj", "{F5CD8112-382D-42AC-9D91-46B91D64FACB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Plugins.Baskets.TestBase", "..\..\..\plugins\Baskets\test\EasyAbp.EShop.Plugins.Baskets.TestBase\EasyAbp.EShop.Plugins.Baskets.TestBase.csproj", "{5929D955-4E2C-4E84-B9D7-F32A3375A1AA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -697,6 +731,66 @@ Global {45B6591E-6517-4F57-9AFA-F28AF880B725}.Debug|Any CPU.Build.0 = Debug|Any CPU {45B6591E-6517-4F57-9AFA-F28AF880B725}.Release|Any CPU.ActiveCfg = Release|Any CPU {45B6591E-6517-4F57-9AFA-F28AF880B725}.Release|Any CPU.Build.0 = Release|Any CPU + {B6F50299-D334-407E-81CC-92123C502F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6F50299-D334-407E-81CC-92123C502F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6F50299-D334-407E-81CC-92123C502F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6F50299-D334-407E-81CC-92123C502F5D}.Release|Any CPU.Build.0 = Release|Any CPU + {83B7D504-05A5-4E8D-866A-BE10CAEAA3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83B7D504-05A5-4E8D-866A-BE10CAEAA3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83B7D504-05A5-4E8D-866A-BE10CAEAA3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83B7D504-05A5-4E8D-866A-BE10CAEAA3B6}.Release|Any CPU.Build.0 = Release|Any CPU + {AF779BD9-F8EC-4A7B-9885-DDBA5155219C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF779BD9-F8EC-4A7B-9885-DDBA5155219C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF779BD9-F8EC-4A7B-9885-DDBA5155219C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF779BD9-F8EC-4A7B-9885-DDBA5155219C}.Release|Any CPU.Build.0 = Release|Any CPU + {5D46CA17-B7B1-47EB-852C-2685F38D2B62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5D46CA17-B7B1-47EB-852C-2685F38D2B62}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D46CA17-B7B1-47EB-852C-2685F38D2B62}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5D46CA17-B7B1-47EB-852C-2685F38D2B62}.Release|Any CPU.Build.0 = Release|Any CPU + {FFD4CD13-97E4-42EB-A6A3-97F2140738D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FFD4CD13-97E4-42EB-A6A3-97F2140738D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FFD4CD13-97E4-42EB-A6A3-97F2140738D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FFD4CD13-97E4-42EB-A6A3-97F2140738D0}.Release|Any CPU.Build.0 = Release|Any CPU + {38CEF8C8-8DE0-49CF-984B-D1BA03542321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {38CEF8C8-8DE0-49CF-984B-D1BA03542321}.Debug|Any CPU.Build.0 = Debug|Any CPU + {38CEF8C8-8DE0-49CF-984B-D1BA03542321}.Release|Any CPU.ActiveCfg = Release|Any CPU + {38CEF8C8-8DE0-49CF-984B-D1BA03542321}.Release|Any CPU.Build.0 = Release|Any CPU + {442B331D-DD64-43A3-8533-70FC99BDDD42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {442B331D-DD64-43A3-8533-70FC99BDDD42}.Debug|Any CPU.Build.0 = Debug|Any CPU + {442B331D-DD64-43A3-8533-70FC99BDDD42}.Release|Any CPU.ActiveCfg = Release|Any CPU + {442B331D-DD64-43A3-8533-70FC99BDDD42}.Release|Any CPU.Build.0 = Release|Any CPU + {D2621F2C-463F-463B-8007-A29005400385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2621F2C-463F-463B-8007-A29005400385}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D2621F2C-463F-463B-8007-A29005400385}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D2621F2C-463F-463B-8007-A29005400385}.Release|Any CPU.Build.0 = Release|Any CPU + {7DD60A60-597D-4D90-B861-457930B652A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DD60A60-597D-4D90-B861-457930B652A5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DD60A60-597D-4D90-B861-457930B652A5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DD60A60-597D-4D90-B861-457930B652A5}.Release|Any CPU.Build.0 = Release|Any CPU + {9AE9D280-542A-4DB1-AD64-CBEA05043F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9AE9D280-542A-4DB1-AD64-CBEA05043F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9AE9D280-542A-4DB1-AD64-CBEA05043F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9AE9D280-542A-4DB1-AD64-CBEA05043F0A}.Release|Any CPU.Build.0 = Release|Any CPU + {3DD64C01-52DC-4E04-A7E3-65FFB22B3895}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DD64C01-52DC-4E04-A7E3-65FFB22B3895}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DD64C01-52DC-4E04-A7E3-65FFB22B3895}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DD64C01-52DC-4E04-A7E3-65FFB22B3895}.Release|Any CPU.Build.0 = Release|Any CPU + {E8E8C326-CD54-4158-B5C1-D7265457E2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8E8C326-CD54-4158-B5C1-D7265457E2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8E8C326-CD54-4158-B5C1-D7265457E2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8E8C326-CD54-4158-B5C1-D7265457E2FA}.Release|Any CPU.Build.0 = Release|Any CPU + {8A2C9B88-9257-4489-B0B4-F26AF3B01FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A2C9B88-9257-4489-B0B4-F26AF3B01FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A2C9B88-9257-4489-B0B4-F26AF3B01FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A2C9B88-9257-4489-B0B4-F26AF3B01FA2}.Release|Any CPU.Build.0 = Release|Any CPU + {F5CD8112-382D-42AC-9D91-46B91D64FACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5CD8112-382D-42AC-9D91-46B91D64FACB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5CD8112-382D-42AC-9D91-46B91D64FACB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5CD8112-382D-42AC-9D91-46B91D64FACB}.Release|Any CPU.Build.0 = Release|Any CPU + {5929D955-4E2C-4E84-B9D7-F32A3375A1AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5929D955-4E2C-4E84-B9D7-F32A3375A1AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5929D955-4E2C-4E84-B9D7-F32A3375A1AA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5929D955-4E2C-4E84-B9D7-F32A3375A1AA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -830,6 +924,23 @@ Global {C93BAB01-7D07-4C47-B19A-B91987D10F94} = {94CC5A11-DA0F-413C-96CA-01DB0FC426E0} {6D9A736A-DE07-4517-A40A-B26D6ECD1A93} = {94CC5A11-DA0F-413C-96CA-01DB0FC426E0} {04F47882-9E52-4555-A2DC-1A5164EA04DB} = {94CC5A11-DA0F-413C-96CA-01DB0FC426E0} + {5E629CC4-E7E7-4785-BC26-1C5087909879} = {C93BAB01-7D07-4C47-B19A-B91987D10F94} + {B6F50299-D334-407E-81CC-92123C502F5D} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {83B7D504-05A5-4E8D-866A-BE10CAEAA3B6} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {AF779BD9-F8EC-4A7B-9885-DDBA5155219C} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {5D46CA17-B7B1-47EB-852C-2685F38D2B62} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {FFD4CD13-97E4-42EB-A6A3-97F2140738D0} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {38CEF8C8-8DE0-49CF-984B-D1BA03542321} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {442B331D-DD64-43A3-8533-70FC99BDDD42} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {D2621F2C-463F-463B-8007-A29005400385} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {7DD60A60-597D-4D90-B861-457930B652A5} = {5E629CC4-E7E7-4785-BC26-1C5087909879} + {9333EF8D-0A21-4586-81EB-9C39ECA2873C} = {C93BAB01-7D07-4C47-B19A-B91987D10F94} + {9AE9D280-542A-4DB1-AD64-CBEA05043F0A} = {9333EF8D-0A21-4586-81EB-9C39ECA2873C} + {3DD64C01-52DC-4E04-A7E3-65FFB22B3895} = {9333EF8D-0A21-4586-81EB-9C39ECA2873C} + {E8E8C326-CD54-4158-B5C1-D7265457E2FA} = {9333EF8D-0A21-4586-81EB-9C39ECA2873C} + {8A2C9B88-9257-4489-B0B4-F26AF3B01FA2} = {9333EF8D-0A21-4586-81EB-9C39ECA2873C} + {F5CD8112-382D-42AC-9D91-46B91D64FACB} = {9333EF8D-0A21-4586-81EB-9C39ECA2873C} + {5929D955-4E2C-4E84-B9D7-F32A3375A1AA} = {9333EF8D-0A21-4586-81EB-9C39ECA2873C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj index a9f48900..0e168791 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj @@ -9,6 +9,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleApplicationContractsModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleApplicationContractsModule.cs index fd0a9ecd..78c19a34 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleApplicationContractsModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleApplicationContractsModule.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop; +using EasyAbp.EShop.Plugins.Baskets; using EasyAbp.PaymentService; using EasyAbp.PaymentService.WeChatPay; using Volo.Abp.Account; @@ -20,6 +21,7 @@ namespace EShopSample typeof(AbpTenantManagementApplicationContractsModule), typeof(AbpObjectExtendingModule), typeof(EShopApplicationContractsModule), + typeof(EShopPluginsBasketsApplicationContractsModule), typeof(PaymentServiceApplicationContractsModule), typeof(PaymentServiceWeChatPayApplicationContractsModule) )] diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj index 97309684..47779dc8 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj @@ -9,6 +9,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationModule.cs index 9da68fa7..bc53d525 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationModule.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop; +using EasyAbp.EShop.Plugins.Baskets; using EasyAbp.PaymentService; using EasyAbp.PaymentService.WeChatPay; using Volo.Abp.Account; @@ -20,9 +21,10 @@ namespace EShopSample typeof(AbpTenantManagementApplicationModule), typeof(AbpFeatureManagementApplicationModule), typeof(EShopApplicationModule), + typeof(EShopPluginsBasketsApplicationModule), typeof(PaymentServiceApplicationModule), typeof(PaymentServiceWeChatPayApplicationModule) - )] + )] public class EShopSampleApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj index b365719e..5d01f5ca 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj @@ -19,6 +19,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainSharedModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainSharedModule.cs index 72ca41e0..01cd9361 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainSharedModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainSharedModule.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop; +using EasyAbp.EShop.Plugins.Baskets; using EasyAbp.PaymentService; using EasyAbp.PaymentService.WeChatPay; using EShopSample.Localization; @@ -27,6 +28,7 @@ namespace EShopSample typeof(AbpSettingManagementDomainSharedModule), typeof(AbpTenantManagementDomainSharedModule), typeof(EShopDomainSharedModule), + typeof(EShopPluginsBasketsDomainSharedModule), typeof(PaymentServiceDomainSharedModule), typeof(PaymentServiceWeChatPayDomainSharedModule) )] diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj index 8325a296..f739a87d 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj @@ -9,6 +9,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs index 1c4cdc62..5b18d5cf 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop; +using EasyAbp.EShop.Plugins.Baskets; using EasyAbp.PaymentService; using EasyAbp.PaymentService.Payments; using EasyAbp.PaymentService.WeChatPay; @@ -32,6 +33,7 @@ namespace EShopSample typeof(AbpSettingManagementDomainModule), typeof(AbpTenantManagementDomainModule), typeof(EShopDomainModule), + typeof(EShopPluginsBasketsDomainModule), typeof(PaymentServiceDomainModule), typeof(PaymentServiceWeChatPayDomainModule) )] 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 index f1fa493f..a206adaa 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContext.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContext.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop.EntityFrameworkCore; +using EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore; using EasyAbp.PaymentService.EntityFrameworkCore; using EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; @@ -45,8 +46,11 @@ namespace EShopSample.EntityFrameworkCore /* Configure your own tables/entities inside the ConfigureEShopSample method */ builder.ConfigureEShopSample(); + builder.ConfigureEShop(); + builder.ConfigurePluginsBaskets(); + builder.ConfigurePaymentService(); builder.ConfigurePaymentServiceWeChatPay(); } diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj index 208eab01..bd631bb1 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj @@ -9,6 +9,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEntityFrameworkCoreModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEntityFrameworkCoreModule.cs index 37085390..5d944849 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEntityFrameworkCoreModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEntityFrameworkCoreModule.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop.EntityFrameworkCore; +using EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore; using EasyAbp.PaymentService.EntityFrameworkCore; using EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; @@ -28,6 +29,7 @@ namespace EShopSample.EntityFrameworkCore typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule), typeof(EShopEntityFrameworkCoreModule), + typeof(EShopPluginsBasketsEntityFrameworkCoreModule), typeof(PaymentServiceEntityFrameworkCoreModule), typeof(PaymentServiceWeChatPayEntityFrameworkCoreModule) )] diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj index 1342d774..0e858054 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj @@ -9,6 +9,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSampleHttpApiClientModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSampleHttpApiClientModule.cs index 33ee1527..0950818a 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSampleHttpApiClientModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSampleHttpApiClientModule.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop; +using EasyAbp.EShop.Plugins.Baskets; using EasyAbp.PaymentService; using EasyAbp.PaymentService.WeChatPay; using Microsoft.Extensions.DependencyInjection; @@ -19,6 +20,7 @@ namespace EShopSample typeof(AbpTenantManagementHttpApiClientModule), typeof(AbpFeatureManagementHttpApiClientModule), typeof(EShopHttpApiClientModule), + typeof(EShopPluginsBasketsHttpApiClientModule), typeof(PaymentServiceHttpApiClientModule), typeof(PaymentServiceWeChatPayHttpApiClientModule) )] diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj index 6b52fa1a..94b01c57 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj @@ -9,6 +9,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSampleHttpApiModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSampleHttpApiModule.cs index 9c9cbb8a..e8659388 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSampleHttpApiModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSampleHttpApiModule.cs @@ -1,4 +1,5 @@ using EasyAbp.EShop; +using EasyAbp.EShop.Plugins.Baskets; using EasyAbp.PaymentService; using EasyAbp.PaymentService.WeChatPay; using Volo.Abp.Account; @@ -18,6 +19,7 @@ namespace EShopSample typeof(AbpTenantManagementHttpApiModule), typeof(AbpFeatureManagementHttpApiModule), typeof(EShopHttpApiModule), + typeof(EShopPluginsBasketsHttpApiModule), typeof(PaymentServiceHttpApiModule), typeof(PaymentServiceWeChatPayHttpApiModule) )] diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj index 46aafdb8..3d4107c0 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj @@ -42,6 +42,7 @@ + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSampleWebModule.cs b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSampleWebModule.cs index fe1c876f..177d6337 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSampleWebModule.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSampleWebModule.cs @@ -7,6 +7,8 @@ using EasyAbp.EShop.Orders; using EasyAbp.EShop.Orders.Web; using EasyAbp.EShop.Payments; using EasyAbp.EShop.Payments.Web; +using EasyAbp.EShop.Plugins.Baskets; +using EasyAbp.EShop.Plugins.Baskets.Web; using EasyAbp.EShop.Products; using EasyAbp.EShop.Products.Web; using EasyAbp.EShop.Stores; @@ -67,6 +69,7 @@ namespace EShopSample.Web typeof(AbpTenantManagementWebModule), typeof(AbpAspNetCoreSerilogModule), typeof(EShopWebModule), + typeof(EShopPluginsBasketsWebModule), typeof(PaymentServiceWebModule), typeof(PaymentServiceWeChatPayWebModule) )] @@ -128,6 +131,11 @@ namespace EShopSample.Web opt.RootPath = "eShop"; }); + options.ConventionalControllers.Create(typeof(EShopPluginsBasketsApplicationModule).Assembly, opt => + { + opt.RootPath = "eShop/plugins/baskets"; + }); + options.ConventionalControllers.Create(typeof(PaymentServiceApplicationModule).Assembly, opt => { opt.RootPath = "paymentService"; @@ -214,6 +222,12 @@ namespace EShopSample.Web options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Stores{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Stores.Application.Contracts")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Stores{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Stores.Application")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Stores{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Stores.Web")); + + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}plugins{Path.DirectorySeparatorChar}Baskets{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Plugins.Baskets.Domain.Shared")); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}plugins{Path.DirectorySeparatorChar}Baskets{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Plugins.Baskets.Domain")); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}plugins{Path.DirectorySeparatorChar}Baskets{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Plugins.Baskets.Application.Contracts")); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}plugins{Path.DirectorySeparatorChar}Baskets{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Plugins.Baskets.Application")); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}plugins{Path.DirectorySeparatorChar}Baskets{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Plugins.Baskets.Web")); }); } }