Browse Source

Fix XmlDocument usage.

pull/49/head
gdlcf88 6 years ago
parent
commit
78de0f5c0f
  1. 2
      modules/EasyAbp.EShop.Baskets/common.props
  2. 2
      modules/EasyAbp.EShop.Orders/common.props
  3. 2
      modules/EasyAbp.EShop.Payments.WeChatPay/common.props
  4. 8
      modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/EShopWeChatPayHandler.cs
  5. 18
      modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/WeChatPayPaymentServiceProvider.cs
  6. 2
      modules/EasyAbp.EShop.Payments/common.props
  7. 2
      modules/EasyAbp.EShop.Products/common.props
  8. 2
      modules/EasyAbp.EShop.Stores/common.props

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

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

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

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

2
modules/EasyAbp.EShop.Payments.WeChatPay/common.props

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

8
modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/EShopWeChatPayHandler.cs

@ -33,21 +33,21 @@ namespace EasyAbp.EShop.Payments.WeChatPay
var xml = xmlDocument.SelectSingleNode("xml") ??
throw new XmlDocumentMissingRequiredElementException("xml");
if (xml.SelectSingleNode("return_code")?.Value != "SUCCESS")
if (xml.SelectSingleNode("return_code")?.InnerText != "SUCCESS")
{
return;
}
// Todo: sign check
if (xml.SelectSingleNode("result_code")?.Value == "SUCCESS")
if (xml.SelectSingleNode("result_code")?.InnerText == "SUCCESS")
{
var orderId = Guid.Parse(xml.SelectSingleNode("out_trade_no")?.Value ??
var orderId = Guid.Parse(xml.SelectSingleNode("out_trade_no")?.InnerText ??
throw new XmlDocumentMissingRequiredElementException("out_trade_no"));
var payment = await _paymentRepository.GetAsync(orderId);
payment.SetExternalTradingCode(xml.SelectSingleNode("transaction_id")?.Value ??
payment.SetExternalTradingCode(xml.SelectSingleNode("transaction_id")?.InnerText ??
throw new XmlDocumentMissingRequiredElementException("transaction_id"));
payment.CompletePayment(_clock.Now);

18
modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/WeChatPayPaymentServiceProvider.cs

@ -81,21 +81,21 @@ namespace EasyAbp.EShop.Payments.WeChatPay
var xml = result.SelectSingleNode("xml") ?? throw new UnifiedOrderFailedException();
if (xml.SelectSingleNode("return_code")?.Value != "SUCCESS")
if (xml.SelectSingleNode("return_code")?.InnerText != "SUCCESS")
{
throw new UnifiedOrderFailedException(xml.SelectSingleNode("return_code")?.Value, xml.SelectSingleNode("return_msg")?.Value);
throw new UnifiedOrderFailedException(xml.SelectSingleNode("return_code")?.InnerText, xml.SelectSingleNode("return_msg")?.InnerText);
}
if (xml.SelectSingleNode("result_code")?.Value != "SUCCESS")
if (xml.SelectSingleNode("result_code")?.InnerText != "SUCCESS")
{
throw new UnifiedOrderFailedException(xml.SelectSingleNode("return_code")?.Value,
xml.SelectSingleNode("return_msg")?.Value, xml.SelectSingleNode("err_code_des")?.Value,
xml.SelectSingleNode("err_code")?.Value);
throw new UnifiedOrderFailedException(xml.SelectSingleNode("return_code")?.InnerText,
xml.SelectSingleNode("return_msg")?.InnerText, xml.SelectSingleNode("err_code_des")?.InnerText,
xml.SelectSingleNode("err_code")?.InnerText);
}
payment.SetProperty("trade_type", xml.SelectSingleNode("trade_type"));
payment.SetProperty("prepay_id", xml.SelectSingleNode("prepay_id"));
payment.SetProperty("code_url", xml.SelectSingleNode("code_url"));
payment.SetProperty("trade_type", xml.SelectSingleNode("trade_type")?.InnerText);
payment.SetProperty("prepay_id", xml.SelectSingleNode("prepay_id")?.InnerText);
payment.SetProperty("code_url", xml.SelectSingleNode("code_url")?.InnerText);
return await _paymentRepository.UpdateAsync(payment, true);
}

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

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

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

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

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

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

Loading…
Cancel
Save