diff --git a/src/admin/api/Admin.Host/wwwroot/Localization/Admin/Admin-zh-CN.xml b/src/admin/api/Admin.Host/wwwroot/Localization/Admin/Admin-zh-CN.xml
index 00027f2a1fcad77af6314a4553c17dd6da2d08c7..75c943d7c2f4fe0592c245d59f35a305367f20aa 100644
--- a/src/admin/api/Admin.Host/wwwroot/Localization/Admin/Admin-zh-CN.xml
+++ b/src/admin/api/Admin.Host/wwwroot/Localization/Admin/Admin-zh-CN.xml
@@ -880,7 +880,7 @@
账户Id已存在请更换
创建成功
修改成功
-
+
diff --git a/src/unity/Magicodes.Pay/Magicodes.Pay.csproj b/src/unity/Magicodes.Pay/Magicodes.Pay.csproj
index 10c7e4bbaf9660d16e7f68e485e25614816f0995..3a4a42a8a68fe0e9675bc053cb2ec60fff7e8b38 100644
--- a/src/unity/Magicodes.Pay/Magicodes.Pay.csproj
+++ b/src/unity/Magicodes.Pay/Magicodes.Pay.csproj
@@ -3,8 +3,8 @@
netcoreapp2.1
-
-
+
+
diff --git a/src/unity/Magicodes.Pay/Startup/PayStartup.cs b/src/unity/Magicodes.Pay/Startup/PayStartup.cs
index e8bc7dc8acb11db6db751aa2c12aae286c338012..2439fb99f72676d87f8d56bfe9f609d7dace448a 100644
--- a/src/unity/Magicodes.Pay/Startup/PayStartup.cs
+++ b/src/unity/Magicodes.Pay/Startup/PayStartup.cs
@@ -39,6 +39,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Magicodes.Alipay.Global.Dto;
+using Magicodes.Pay.WeChat.Config;
namespace Magicodes.Pay.Startup
{
@@ -233,15 +234,15 @@ namespace Magicodes.Pay.Startup
///
///
///
- private static async Task WeChatPayConfig(Action logAction, IIocManager iocManager, IConfigurationRoot config, ISettingManager settingManager)
+ private static async Task WeChatPayConfig(Action logAction, IIocManager iocManager, IConfigurationRoot config, ISettingManager settingManager)
{
#region 微信支付
- WeChatPayConfig weChatPayConfig = null;
+ DefaultWeChatPayConfig weChatPayConfig = null;
if (Convert.ToBoolean(await settingManager.GetSettingValueAsync(AppSettings.WeChatPayManagement.IsActive)))
{
- weChatPayConfig = new WeChatPayConfig()
+ weChatPayConfig = new DefaultWeChatPayConfig()
{
PayAppId = await settingManager.GetSettingValueAsync(AppSettings.WeChatPayManagement.AppId),
MchId = await settingManager.GetSettingValueAsync(AppSettings.WeChatPayManagement.MchId),
@@ -251,7 +252,7 @@ namespace Magicodes.Pay.Startup
}
else if (!config["WeChat:Pay:IsEnabled"].IsNullOrWhiteSpace() && Convert.ToBoolean(config["WeChat:Pay:IsEnabled"]))
{
- weChatPayConfig = new WeChatPayConfig
+ weChatPayConfig = new DefaultWeChatPayConfig
{
MchId = config["WeChat:Pay:MchId"],
PayNotifyUrl = config["WeChat:Pay:NotifyUrl"],
diff --git a/src/unity/Magicodes.Pay/Startup/WeChatPayConfig.cs b/src/unity/Magicodes.Pay/Startup/WeChatPayConfig.cs
deleted file mode 100644
index 3c058fd87cfba73201d5618ea378c96972aa298f..0000000000000000000000000000000000000000
--- a/src/unity/Magicodes.Pay/Startup/WeChatPayConfig.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// ======================================================================
-//
-// Copyright (C) 2018-2020 湖南心莱信息科技有限公司
-// All rights reserved
-//
-// filename : WeChatPayConfig.cs
-// description :
-//
-// created by 雪雁 at 2018-08-06 14:21
-// Mail: wenqiang.li@xin-lai.com
-// QQ群:85318032(技术交流)
-// Blog:http://www.cnblogs.com/codelove/
-// GitHub:https://github.com/xin-lai
-// Home:http://xin-lai.com
-//
-// ======================================================================
-
-using Magicodes.Pay.WeChat.Config;
-
-namespace Magicodes.Pay.Startup
-{
- public class WeChatPayConfig : IWeChatPayConfig
- {
- public string PayAppId { get; set; }
- public string MchId { get; set; }
- public string PayNotifyUrl { get; set; }
- public string TenPayKey { get; set; }
- }
-}
\ No newline at end of file