From 5cc8f3479843522c1031d1a0b98ec8559ad5e894 Mon Sep 17 00:00:00 2001 From: gdlcf88 <47396430@qq.com> Date: Sat, 9 May 2020 16:35:21 +0800 Subject: [PATCH] Close #30: Check configuration "App:SelfUrl" is not null --- modules/EasyAbp.EShop.Baskets/common.props | 2 +- modules/EasyAbp.EShop.Orders/common.props | 2 +- modules/EasyAbp.EShop.Payments.WeChatPay/common.props | 2 +- .../Settings/WeChatPaySettingDefinitionProvider.cs | 4 ++-- modules/EasyAbp.EShop.Payments/common.props | 2 +- modules/EasyAbp.EShop.Products/common.props | 2 +- modules/EasyAbp.EShop.Stores/common.props | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/EasyAbp.EShop.Baskets/common.props b/modules/EasyAbp.EShop.Baskets/common.props index e601a915..9843ae7e 100644 --- a/modules/EasyAbp.EShop.Baskets/common.props +++ b/modules/EasyAbp.EShop.Baskets/common.props @@ -1,7 +1,7 @@ latest - 0.1.0 + 0.1.1 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/common.props b/modules/EasyAbp.EShop.Orders/common.props index e601a915..9843ae7e 100644 --- a/modules/EasyAbp.EShop.Orders/common.props +++ b/modules/EasyAbp.EShop.Orders/common.props @@ -1,7 +1,7 @@ latest - 0.1.0 + 0.1.1 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/common.props b/modules/EasyAbp.EShop.Payments.WeChatPay/common.props index 4adb69f0..cbc11eeb 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/common.props +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/common.props @@ -1,7 +1,7 @@ latest - 0.1.0 + 0.1.1 $(NoWarn);CS1591 diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettingDefinitionProvider.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettingDefinitionProvider.cs index 806ed84c..c1deba92 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettingDefinitionProvider.cs +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettingDefinitionProvider.cs @@ -24,9 +24,9 @@ namespace EasyAbp.EShop.Payments.WeChatPay.Settings new SettingDefinition(WeChatPaySettings.WeChatPayPaymentMethod.ApiKey), new SettingDefinition(WeChatPaySettings.WeChatPayPaymentMethod.IsSandBox, "false"), new SettingDefinition(WeChatPaySettings.WeChatPayPaymentMethod.NotifyUrl, - _configuration["App:SelfUrl"].EnsureEndsWith('/') + "WeChatPay/Notify"), + _configuration["App:SelfUrl"]?.EnsureEndsWith('/') + "WeChatPay/Notify"), new SettingDefinition(WeChatPaySettings.WeChatPayPaymentMethod.RefundNotifyUrl, - _configuration["App:SelfUrl"].EnsureEndsWith('/') + "WeChatPay/RefundNotify"), + _configuration["App:SelfUrl"]?.EnsureEndsWith('/') + "WeChatPay/RefundNotify"), new SettingDefinition(WeChatPaySettings.WeChatPayPaymentMethod.CertificatePath), new SettingDefinition(WeChatPaySettings.WeChatPayPaymentMethod.CertificateSecret) ); diff --git a/modules/EasyAbp.EShop.Payments/common.props b/modules/EasyAbp.EShop.Payments/common.props index e601a915..9843ae7e 100644 --- a/modules/EasyAbp.EShop.Payments/common.props +++ b/modules/EasyAbp.EShop.Payments/common.props @@ -1,7 +1,7 @@ latest - 0.1.0 + 0.1.1 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Products/common.props b/modules/EasyAbp.EShop.Products/common.props index e601a915..9843ae7e 100644 --- a/modules/EasyAbp.EShop.Products/common.props +++ b/modules/EasyAbp.EShop.Products/common.props @@ -1,7 +1,7 @@ latest - 0.1.0 + 0.1.1 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Stores/common.props b/modules/EasyAbp.EShop.Stores/common.props index e601a915..9843ae7e 100644 --- a/modules/EasyAbp.EShop.Stores/common.props +++ b/modules/EasyAbp.EShop.Stores/common.props @@ -1,7 +1,7 @@ latest - 0.1.0 + 0.1.1 $(NoWarn);CS1591 true EasyAbp Team