From 0ce8cdf92c740f1fa4b09eed913fdd986504446d Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 27 Nov 2024 16:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Code/CloudGaming.Code/Config/AppConfigBLL.cs | 2 +- .../Code/CloudGaming.Code/Payment/PaymentExtend.cs | 2 +- .../CloudGaming.AppConfigModel/AliPayConfig.cs | 13 +++++++++++++ .../CloudGaming.AppConfigModel/PaymentModel.cs | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 src/CloudGaming/Model/CloudGaming.AppConfigModel/AliPayConfig.cs diff --git a/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs b/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs index 8195fad..ea3c47a 100644 --- a/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs +++ b/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs @@ -32,7 +32,7 @@ namespace CloudGaming.Code.Config appConfigDto.SignKey = AppConfig.TenantId.ToString("N"); appConfigDto.NightCardTips = $"22点30分至次日7点畅玩无消耗"; appConfigDto.ChannelId = AppConfig.GameConfig.ChannelId; - appConfigDto.BsUrl = AppConfig.GameConfig.BsUrl; + appConfigDto.BsUrl = AppConfig.GameConfig.BsUrl.TrimEnd('/') + "/"; return appConfigDto; } diff --git a/src/CloudGaming/Code/CloudGaming.Code/Payment/PaymentExtend.cs b/src/CloudGaming/Code/CloudGaming.Code/Payment/PaymentExtend.cs index b111e78..1bb08eb 100644 --- a/src/CloudGaming/Code/CloudGaming.Code/Payment/PaymentExtend.cs +++ b/src/CloudGaming/Code/CloudGaming.Code/Payment/PaymentExtend.cs @@ -129,7 +129,7 @@ public static class PaymentExtend } var _weChatConfig = cloudGamingBase.AppConfig.Payment.WeChatConfig ?? weChatConfig; - var _wxClient = cloudGamingBase.AppConfig.Payment.WxClient ?? wxClient; + var _wxClient = cloudGamingBase.AppConfig.Payment.WxClientContext ?? wxClient; if (payment == "xcx") { if (cloudGamingBase._UserId == 0) diff --git a/src/CloudGaming/Model/CloudGaming.AppConfigModel/AliPayConfig.cs b/src/CloudGaming/Model/CloudGaming.AppConfigModel/AliPayConfig.cs new file mode 100644 index 0000000..8b9ed7c --- /dev/null +++ b/src/CloudGaming/Model/CloudGaming.AppConfigModel/AliPayConfig.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace CloudGaming.AppConfigModel +{ + /// + /// 支付宝 + /// + public class AliPayConfig : Alipay.EasySDK.Kernel.Config + { + } +} diff --git a/src/CloudGaming/Model/CloudGaming.AppConfigModel/PaymentModel.cs b/src/CloudGaming/Model/CloudGaming.AppConfigModel/PaymentModel.cs index fa4097b..f26767c 100644 --- a/src/CloudGaming/Model/CloudGaming.AppConfigModel/PaymentModel.cs +++ b/src/CloudGaming/Model/CloudGaming.AppConfigModel/PaymentModel.cs @@ -18,7 +18,7 @@ namespace CloudGaming.AppConfigModel /// /// 支付宝支付数据 /// - public Alipay.EasySDK.Kernel.Config? AlipayConfig { get; set; } + public AliPayConfig? AlipayConfig { get; set; } /// /// @@ -28,7 +28,7 @@ namespace CloudGaming.AppConfigModel /// 微信支付客户端 /// [JsonIgnore] - public WechatTenpayClient? WxClient + public WechatTenpayClient? WxClientContext { get {