升级Furion v4.4.3和SqlSugar v5.1.2.9等nuget包

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

@@ -25,18 +25,18 @@
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
     <PackageReference Include="Caching.CSRedis" Version="3.8.668" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.4.2" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.4.2" />
-    <PackageReference Include="Furion.Pure" Version="4.4.2" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.4.3" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.4.3" />
+    <PackageReference Include="Furion.Pure" Version="4.4.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.6.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
     <PackageReference Include="NEST" Version="7.17.4" />
     <PackageReference Include="NETCore.MailKit" Version="2.1.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.8" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.17.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.13.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.2.8" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.13.1" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.2.9" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.20" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -104,7 +104,7 @@ public class SysFileService : IDynamicApiController, ITransient
         {
             var filePath = string.Concat(file.FilePath, "/", input.Id.ToString() + file.Suffix);
             var stream = await (await _OSSService.PresignedGetObjectAsync(file.BucketName.ToString(), filePath, 5)).GetAsStreamAsync();
-            return new FileStreamResult(stream, "application/octet-stream") { FileDownloadName = fileName };
+            return new FileStreamResult(stream.Stream, "application/octet-stream") { FileDownloadName = fileName };
         }
         else
         {

Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.SignalR;
+using Microsoft.AspNetCore.SignalR;
 
 namespace Admin.NET.Core.Service;
 
@@ -74,6 +74,7 @@ public class SysOnlineUserService : ISysOnlineUserService, IDynamicApiController
         {
             var loginUser = await _sysOnlineUerRep.GetFirstAsync(u => u.UserId == userId);
             if (loginUser == null) return;
+
             await ForceExist(loginUser);
         }
     }

Admin.NET/Admin.NET.Core/Service/WeChat/WeChatPayService.cs

@@ -58,7 +58,7 @@ public class WeChatPayService : IDynamicApiController, ITransient
     {
         var request = new CreatePayTransactionJsapiRequest()
         {
-            OutTradeNumber = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000), // YitIdHelper.NextId(), // 订单号
+            OutTradeNumber = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000), // 订单号
             AppId = _weChatPayOptions.AppId,
             Description = input.Description,
             Attachment = input.Attachment,
@@ -100,7 +100,7 @@ public class WeChatPayService : IDynamicApiController, ITransient
     {
         var request = new CreatePayPartnerTransactionJsapiRequest()
         {
-            OutTradeNumber = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000), // YitIdHelper.NextId(), // 订单号
+            OutTradeNumber = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000), // 订单号
             AppId = _weChatPayOptions.AppId,
             MerchantId = _weChatPayOptions.MerchantId,
             SubAppId = _weChatPayOptions.AppId,

Admin.NET/Admin.NET.Core/Util/ServerUtil.cs

@@ -167,7 +167,7 @@ public class ServerUtil
 
         var url = "http://whois.pconline.com.cn/ipJson.jsp";
         var stream = await url.GetAsStreamAsync();
-        var streamReader = new StreamReader(stream, Encoding.GetEncoding("GBK"));
+        var streamReader = new StreamReader(stream.Stream, stream.Encoding);
         var html = streamReader.ReadToEnd();
         var tmp = html[(html.IndexOf("({") + 2)..].Split(",");
         var ipAddr = tmp[0].Split(":")[1] + "【" + tmp[7].Split(":")[1] + "】";

Admin.NET/Admin.NET.UnitTest/Admin.NET.UnitTest.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Pure.Xunit" Version="4.4.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.8" />
+    <PackageReference Include="Furion.Pure.Xunit" Version="4.4.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.9" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -80,12 +80,14 @@ public class Startup : AppStartup
         services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
 
         // 事件总线
-        services.AddEventBus(builder =>
+        services.AddEventBus(options =>
         {
+            // 不启用事件日志
+            options.LogEnabled = false;
             // 订阅日志事件
-            builder.AddSubscriber<LogEventSubscriber>();
+            options.AddSubscriber<LogEventSubscriber>();
             // 事件执行器（失败重试）
-            builder.AddExecutor<RetryEventHandlerExecutor>();
+            options.AddExecutor<RetryEventHandlerExecutor>();
         });
 
         // OSS对象存储（必须一个个赋值）