From b86f3df2bc0d37a2d517713fb54e41ad5fe7745d Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gmail.com>
Date: Sun, 13 Oct 2024 15:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs   | 7 +++++--
 src/0-core/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj  | 4 ++++
 .../Payment/WeChat/WeChatMiniProgram.cs                    | 3 ++-
 .../HuanMeng.MiaoYu.Model/HuanMeng.MiaoYu.Model.csproj     | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/0-core/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs b/src/0-core/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs
index 15b52f5..d3c8909 100644
--- a/src/0-core/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs
+++ b/src/0-core/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Caching.Memory;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,6 +13,9 @@ namespace XLib.DotNetCore.CacheHelper
     /// </summary>
     public class MemoryCacheHelper
     {
+        /// <summary>
+        /// 
+        /// </summary>
         public static MemoryCache cache = new MemoryCache(new MemoryCacheOptions());
 
         /// <summary>
@@ -22,8 +26,7 @@ namespace XLib.DotNetCore.CacheHelper
         /// <returns></returns>
         public static T? GetCache<T>(string cacheName) where T : class, new()
         {
-            
-            return cache.TryGetValue(cacheName, out var value) ? value as T : null;
+            return cache.TryGetValue<T?>(cacheName, out var value) ? value : null;
         }
 
         /// <summary>
diff --git a/src/0-core/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj b/src/0-core/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj
index 14d5c05..1aafa90 100644
--- a/src/0-core/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj
+++ b/src/0-core/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj
@@ -22,4 +22,8 @@
     <PackageReference Include="StackExchange.Redis" Version="2.8.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="JwtInfrastructure\Extend\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Payment/WeChat/WeChatMiniProgram.cs b/src/0-core/HuanMeng.MiaoYu.Code/Payment/WeChat/WeChatMiniProgram.cs
index 58f85fd..b8b208e 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Payment/WeChat/WeChatMiniProgram.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Payment/WeChat/WeChatMiniProgram.cs
@@ -66,7 +66,8 @@ namespace HuanMeng.MiaoYu.Code.Payment.WeChat
             var response = await client.ExecuteCreatePayTransactionJsapiAsync(request);
             if (response.IsSuccessful())
             {
-                var paramMap = client.GenerateParametersForAppPayRequest(request.AppId, response.PrepayId);
+                var paramMap = client.GenerateParametersForJsapiPayRequest(request.AppId, response.PrepayId);
+                
                 //Console.WriteLine("PrepayId：" + response.PrepayId);
                 return new(orderId, JsonConvert.SerializeObject(paramMap));
             }
diff --git a/src/0-core/HuanMeng.MiaoYu.Model/HuanMeng.MiaoYu.Model.csproj b/src/0-core/HuanMeng.MiaoYu.Model/HuanMeng.MiaoYu.Model.csproj
index a36070f..0633345 100644
--- a/src/0-core/HuanMeng.MiaoYu.Model/HuanMeng.MiaoYu.Model.csproj
+++ b/src/0-core/HuanMeng.MiaoYu.Model/HuanMeng.MiaoYu.Model.csproj
@@ -21,7 +21,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>