From 25602d80a2e21a521bcc65e5a81be9cd3144ee65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=96=87=E5=BC=BA?= <codelove1314@live.cn>
Date: Mon, 10 Dec 2018 13:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Localization/Admin/Admin-zh-CN.xml        |  2 +-
 src/unity/Magicodes.Pay/Magicodes.Pay.csproj  |  4 +--
 src/unity/Magicodes.Pay/Startup/PayStartup.cs |  9 +++---
 .../Magicodes.Pay/Startup/WeChatPayConfig.cs  | 29 -------------------
 4 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 src/unity/Magicodes.Pay/Startup/WeChatPayConfig.cs

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 00027f2a..75c943d7 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 @@
     <text name="TransInExistPleaseReplace">账户Id已存在请更换</text>
     <text name="CreateSuccessfully">创建成功</text>
     <text name="EditSuccessfully">修改成功</text>
-    <!--2018-12-7-->
+    <!--2018-12-7 小程序配置相关-->
     <text name="MiniProgramSetting" value="小程序配置" />
     <text name="WeChatMiniProgramSetting" value="微信小程序" />
   </texts>
diff --git a/src/unity/Magicodes.Pay/Magicodes.Pay.csproj b/src/unity/Magicodes.Pay/Magicodes.Pay.csproj
index 10c7e4bb..3a4a42a8 100644
--- a/src/unity/Magicodes.Pay/Magicodes.Pay.csproj
+++ b/src/unity/Magicodes.Pay/Magicodes.Pay.csproj
@@ -3,8 +3,8 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Magicodes.Alipay.Global" Version="0.0.5" />
-    <PackageReference Include="Magicodes.Pay.WeChat" Version="1.0.4" />
+    <PackageReference Include="Magicodes.Alipay.Global" Version="0.0.8" />
+    <PackageReference Include="Magicodes.Pay.WeChat" Version="1.0.5" />
     <PackageReference Include="Magicodes.PayNotify" Version="0.0.5" />
     <PackageReference Include="Magicodes.Alipay" Version="7.0.7" />
   </ItemGroup>
diff --git a/src/unity/Magicodes.Pay/Startup/PayStartup.cs b/src/unity/Magicodes.Pay/Startup/PayStartup.cs
index e8bc7dc8..2439fb99 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
         /// <param name="config"></param>
         /// <param name="settingManager"></param>
         /// <returns></returns>
-        private static async Task<WeChatPayConfig> WeChatPayConfig(Action<string, string> logAction, IIocManager iocManager, IConfigurationRoot config, ISettingManager settingManager)
+        private static async Task<DefaultWeChatPayConfig> WeChatPayConfig(Action<string, string> 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 3c058fd8..00000000
--- 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
-- 
Gitee