tsai
/
EShop
mirror of https://github.com/EasyAbp/EShop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Used MenuConfigurationContext's IsGrantedAsync method 

Upgraded PaymentService module to version
pull/49/head v0.2.6
gdlcf88 6 years ago
parent
477fc4d630
commit
579248babb
20 changed files with 31 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      integration/EasyAbp.EShop/common.props
  2. 2
      modules/EasyAbp.EShop.Baskets/common.props
  3. 2
      modules/EasyAbp.EShop.Orders/common.props
  4. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj
  5. 4
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs
  6. 2
      modules/EasyAbp.EShop.Payments/common.props
  7. 2
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj
  8. 6
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs
  9. 2
      modules/EasyAbp.EShop.Products/common.props
  10. 8
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs
  11. 2
      modules/EasyAbp.EShop.Stores/common.props
  12. 4
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs
  13. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
  14. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
  15. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
  16. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
  17. 4
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
  18. 4
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
  19. 4
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
  20. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj

2
integration/EasyAbp.EShop/common.props
View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>0.2.5</Version>
<Version>0.2.6</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>

2
modules/EasyAbp.EShop.Baskets/common.props
View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>0.2.5</Version>
<Version>0.2.6</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>

2
modules/EasyAbp.EShop.Orders/common.props
View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>0.2.5</Version>
<Version>0.2.6</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.4" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />

4
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs
View File

@ -24,11 +24,9 @@ namespace EasyAbp.EShop.Orders.Web
{
var l = context.GetLocalizer<OrdersResource>(); //Add main menu items.
var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
var orderManagementMenuItem = new ApplicationMenuItem("OrderManagement", l["Menu:OrderManagement"]);
if (await authorizationService.IsGrantedAsync(OrdersPermissions.Orders.Manage))
if (await context.IsGrantedAsync(OrdersPermissions.Orders.Manage))
{
var storeAppService = context.ServiceProvider.GetRequiredService<IStoreAppService>();

2
modules/EasyAbp.EShop.Payments/common.props
View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>0.2.5</Version>
<Version>0.2.6</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>

2
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.4" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />

6
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs
View File

@ -35,21 +35,19 @@ namespace EasyAbp.EShop.Payments.Web
{
var l = context.GetLocalizer<PaymentsResource>(); //Add main menu items.
var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
var paymentManagementMenuItem = new ApplicationMenuItem("PaymentManagement", l["Menu:PaymentManagement"]);
var storeAppService = context.ServiceProvider.GetRequiredService<IStoreAppService>();
var defaultStore = (await storeAppService.GetDefaultAsync())?.Id;
if (await authorizationService.IsGrantedAsync(PaymentsPermissions.Payments.Manage))
if (await context.IsGrantedAsync(PaymentsPermissions.Payments.Manage))
{
paymentManagementMenuItem.AddItem(
new ApplicationMenuItem("Payments", l["Menu:Payments"], "/EShop/Payments/Payments/Payment?storeId=" + defaultStore)
);
}
if (await authorizationService.IsGrantedAsync(PaymentsPermissions.Refunds.Manage))
if (await context.IsGrantedAsync(PaymentsPermissions.Refunds.Manage))
{
paymentManagementMenuItem.AddItem(
new ApplicationMenuItem("Refunds", l["Menu:Refunds"], "/EShop/Payments/Refunds/Refund?storeId=" + defaultStore)

2
modules/EasyAbp.EShop.Products/common.props
View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>0.2.5</Version>
<Version>0.2.6</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>

8
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs
View File

@ -30,25 +30,23 @@ namespace EasyAbp.EShop.Products.Web
{
var l = context.GetLocalizer<ProductsResource>(); //Add main menu items.
var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
var productManagementMenuItem = new ApplicationMenuItem("ProductManagement", l["Menu:ProductManagement"]);
if (await authorizationService.IsGrantedAsync(ProductsPermissions.ProductTypes.Default))
if (await context.IsGrantedAsync(ProductsPermissions.ProductTypes.Default))
{
productManagementMenuItem.AddItem(
new ApplicationMenuItem("ProductType", l["Menu:ProductType"], "/EShop/Products/ProductTypes/ProductType")
);
}
if (await authorizationService.IsGrantedAsync(ProductsPermissions.Categories.Default))
if (await context.IsGrantedAsync(ProductsPermissions.Categories.Default))
{
productManagementMenuItem.AddItem(
new ApplicationMenuItem("Category", l["Menu:Category"], "/EShop/Products/Categories/Category")
);
}
if (await authorizationService.IsGrantedAsync(ProductsPermissions.Products.Default))
if (await context.IsGrantedAsync(ProductsPermissions.Products.Default))
{
var storeAppService = context.ServiceProvider.GetRequiredService<IStoreAppService>();

2
modules/EasyAbp.EShop.Stores/common.props
View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>0.2.5</Version>
<Version>0.2.6</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>

4
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs
View File

@ -23,11 +23,9 @@ namespace EasyAbp.EShop.Stores.Web
{
var l = context.GetLocalizer<StoresResource>(); //Add main menu items.
var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
var storeManagementMenuItem = new ApplicationMenuItem("StoreManagement", l["Menu:StoreManagement"]);
if (await authorizationService.IsGrantedAsync(StoresPermissions.Stores.Default))
if (await context.IsGrantedAsync(StoresPermissions.Stores.Default))
{
storeManagementMenuItem.AddItem(
new ApplicationMenuItem("Store", l["Menu:Store"], "/EShop/Stores/Stores/Store")

4
samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.3.4" />
<PackageReference Include="Volo.Abp.ObjectExtending" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
View File

@ -14,8 +14,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Application" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.Application" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.3.4" />
<PackageReference Include="Volo.Abp.Account.Application" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.3.4" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="2.9.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="2.9.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.3.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
View File

@ -10,8 +10,8 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.EntityFrameworkCore\EasyAbp.EShop.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
<PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.3.4" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.9.0" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.3.4" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.3.4" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
View File

@ -45,8 +45,8 @@
<ProjectReference Include="..\EShopSample.Application\EShopSample.Application.csproj" />
<ProjectReference Include="..\EShopSample.HttpApi\EShopSample.HttpApi.csproj" />
<ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
<PackageReference Include="EasyAbp.PaymentService.Web" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.3.3" />
<PackageReference Include="EasyAbp.PaymentService.Web" Version="0.3.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.3.4" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.9.0" />

Write Preview
Loading…
Cancel
Save