😎1、升级Furion v4.9.2.13 2、清理代码

Admin.NET/Admin.NET.Application/Configuration/Wechat.json

@@ -5,13 +5,13 @@
     // 公众号
     "WechatAppId": "",
     "WechatAppSecret": "",
-    "WechatToken": "", //微信公众号服务器配置中的令牌(Token)
-    "WechatEncodingAESKey": "", //微信公众号服务器配置中的消息加解密密钥(EncodingAESKey)
+    "WechatToken": "", // 微信公众号服务器配置中的令牌(Token)
+    "WechatEncodingAESKey": "", // 微信公众号服务器配置中的消息加解密密钥(EncodingAESKey)
     // 小程序
     "WxOpenAppId": "",
     "WxOpenAppSecret": "",
-    "WxToken": "", //小程序消息推送中的令牌(Token)
-    "WxEncodingAESKey": "" //小程序消息推送中的消息加解密密钥(EncodingAESKey)
+    "WxToken": "", // 小程序消息推送中的令牌(Token)
+    "WxEncodingAESKey": "" // 小程序消息推送中的消息加解密密钥(EncodingAESKey)
   },
   // 微信支付
   "WechatPay": {

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -21,9 +21,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.12" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.12" />
-    <PackageReference Include="Furion.Pure" Version="4.9.2.12" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.13" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.13" />
+    <PackageReference Include="Furion.Pure" Version="4.9.2.13" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />

Admin.NET/Admin.NET.Core/Option/WechatOptions.cs

@@ -13,33 +13,33 @@ namespace Admin.NET.Core;
 /// </summary>
 public sealed class WechatOptions : IConfigurableOptions
 {
-	//公众号
-	public string WechatAppId { get; set; }
+    // 公众号
+    public string WechatAppId { get; set; }
 
-	public string WechatAppSecret { get; set; }
+    public string WechatAppSecret { get; set; }
 
-	/// <summary>
-	/// 微信公众号服务器配置中的令牌(Token)
-	/// </summary>
-	public string WechatToken { get; set; }
+    /// <summary>
+    /// 微信公众号服务器配置中的令牌(Token)
+    /// </summary>
+    public string WechatToken { get; set; }
 
-	/// <summary>
-	/// 微信公众号服务器配置中的消息加解密密钥(EncodingAESKey)
-	/// </summary>
-	public string WechatEncodingAESKey { get; set; }
+    /// <summary>
+    /// 微信公众号服务器配置中的消息加解密密钥(EncodingAESKey)
+    /// </summary>
+    public string WechatEncodingAESKey { get; set; }
 
-	//小程序
-	public string WxOpenAppId { get; set; }
+    // 小程序
+    public string WxOpenAppId { get; set; }
 
-	public string WxOpenAppSecret { get; set; }
+    public string WxOpenAppSecret { get; set; }
 
-	/// <summary>
-	/// 小程序消息推送中的令牌(Token)
-	/// </summary>
-	public string WxToken { get; set; }
+    /// <summary>
+    /// 小程序消息推送中的令牌(Token)
+    /// </summary>
+    public string WxToken { get; set; }
 
-	/// <summary>
-	/// 小程序消息推送中的消息加解密密钥(EncodingAESKey)
-	/// </summary>
-	public string WxEncodingAESKey { get; set; }
+    /// <summary>
+    /// 小程序消息推送中的消息加解密密钥(EncodingAESKey)
+    /// </summary>
+    public string WxEncodingAESKey { get; set; }
 }

Admin.NET/Admin.NET.Core/Service/Wechat/WechatApiHttpClient.cs

@@ -40,8 +40,8 @@ public partial class WechatApiClientFactory : ISingleton
             PushToken = _wechatOptions.WechatToken,
             PushEncodingAESKey = _wechatOptions.WechatEncodingAESKey,
         })
-            .UseHttpClient(_httpClientFactory.CreateClient(), disposeClient: false) // 设置 HttpClient 不随客户端一同销毁
-            .Build();
+        .UseHttpClient(_httpClientFactory.CreateClient(), disposeClient: false) // 设置 HttpClient 不随客户端一同销毁
+        .Build();
 
         client.Configure(config =>
         {
@@ -67,9 +67,9 @@ public partial class WechatApiClientFactory : ISingleton
         {
             AppId = _wechatOptions.WxOpenAppId,
             AppSecret = _wechatOptions.WxOpenAppSecret,
-			PushToken = _wechatOptions.WxToken,
-			PushEncodingAESKey = _wechatOptions.WxEncodingAESKey,
-		})
+            PushToken = _wechatOptions.WxToken,
+            PushEncodingAESKey = _wechatOptions.WxEncodingAESKey,
+        })
         .UseHttpClient(_httpClientFactory.CreateClient(), disposeClient: false) // 设置 HttpClient 不随客户端一同销毁
         .Build();