Bläddra i källkod

升级Furion v4.2.2及调整接口变化

zuohuaijun 3 år sedan
förälder
incheckning
bf8acbce93

+ 1 - 0
.gitignore

@@ -28,3 +28,4 @@ bin-release/
 /App/MedicalPay/unpackage
 /Admin.NET/packages
 /Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+/Soybean

+ 1 - 1
Admin.NET/Admin.NET.Application/Service/JobTimer.cs

@@ -25,7 +25,7 @@ public class JobTimer : ISpareTimeWorker
             var db = services.GetService<ISqlSugarClient>();
 
             // 写日志文件
-            StringLoggingPart.Default().SetMessage("【定时器】" + DateTime.Now + "执行次数:" + count).LogInformation();
+            Log.Information("【定时器】" + DateTime.Now + "执行次数:" + count);
         });
     }
 }

+ 5 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -25,14 +25,14 @@
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
     <PackageReference Include="Caching.CSRedis" Version="3.8.3" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.2.1" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.2.1" />
-    <PackageReference Include="Furion.Pure" Version="4.2.1" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.2.2" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.2.2" />
+    <PackageReference Include="Furion.Pure" Version="4.2.2" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
     <PackageReference Include="NETCore.MailKit" Version="2.1.0" />
-    <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.7" />
-    <PackageReference Include="QuestPDF" Version="2022.6.3" />
+    <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.8" />
+    <PackageReference Include="QuestPDF" Version="2022.8.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.16.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.11.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.2.1" />

+ 4 - 4
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -7285,7 +7285,7 @@
             </summary>
             <param name="sqlSugarClient"></param>
         </member>
-        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.BeginTransaction(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Furion.DatabaseAccessor.UnitOfWorkAttribute)">
+        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.BeginTransaction(Microsoft.AspNetCore.Mvc.Filters.FilterContext,Furion.DatabaseAccessor.UnitOfWorkAttribute)">
             <summary>
             开启工作单元处理
             </summary>
@@ -7293,7 +7293,7 @@
             <param name="unitOfWork"></param>
             <exception cref="T:System.NotImplementedException"></exception>
         </member>
-        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.CommitTransaction(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext,Furion.DatabaseAccessor.UnitOfWorkAttribute)">
+        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.CommitTransaction(Microsoft.AspNetCore.Mvc.Filters.FilterContext,Furion.DatabaseAccessor.UnitOfWorkAttribute)">
             <summary>
             提交工作单元处理
             </summary>
@@ -7301,7 +7301,7 @@
             <param name="unitOfWork"></param>
             <exception cref="T:System.NotImplementedException"></exception>
         </member>
-        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.RollbackTransaction(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext,Furion.DatabaseAccessor.UnitOfWorkAttribute)">
+        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.RollbackTransaction(Microsoft.AspNetCore.Mvc.Filters.FilterContext,Furion.DatabaseAccessor.UnitOfWorkAttribute)">
             <summary>
             回滚工作单元处理
             </summary>
@@ -7309,7 +7309,7 @@
             <param name="unitOfWork"></param>
             <exception cref="T:System.NotImplementedException"></exception>
         </member>
-        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.OnCompleted(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext)">
+        <member name="M:Admin.NET.Core.SqlSugarUnitOfWork.OnCompleted(Microsoft.AspNetCore.Mvc.Filters.FilterContext,Microsoft.AspNetCore.Mvc.Filters.FilterContext)">
             <summary>
             执行完毕(无论成功失败)
             </summary>

+ 4 - 4
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarUnitOfWork.cs

@@ -25,7 +25,7 @@ public sealed class SqlSugarUnitOfWork : IUnitOfWork
     /// <param name="context"></param>
     /// <param name="unitOfWork"></param>
     /// <exception cref="NotImplementedException"></exception>
-    public void BeginTransaction(ActionExecutingContext context, UnitOfWorkAttribute unitOfWork)
+    public void BeginTransaction(FilterContext context, UnitOfWorkAttribute unitOfWork)
     {
         _sqlSugarClient.AsTenant().BeginTran();
     }
@@ -36,7 +36,7 @@ public sealed class SqlSugarUnitOfWork : IUnitOfWork
     /// <param name="resultContext"></param>
     /// <param name="unitOfWork"></param>
     /// <exception cref="NotImplementedException"></exception>
-    public void CommitTransaction(ActionExecutedContext resultContext, UnitOfWorkAttribute unitOfWork)
+    public void CommitTransaction(FilterContext resultContext, UnitOfWorkAttribute unitOfWork)
     {
         _sqlSugarClient.AsTenant().CommitTran();
     }
@@ -47,7 +47,7 @@ public sealed class SqlSugarUnitOfWork : IUnitOfWork
     /// <param name="resultContext"></param>
     /// <param name="unitOfWork"></param>
     /// <exception cref="NotImplementedException"></exception>
-    public void RollbackTransaction(ActionExecutedContext resultContext, UnitOfWorkAttribute unitOfWork)
+    public void RollbackTransaction(FilterContext resultContext, UnitOfWorkAttribute unitOfWork)
     {
         _sqlSugarClient.AsTenant().RollbackTran();
     }
@@ -58,7 +58,7 @@ public sealed class SqlSugarUnitOfWork : IUnitOfWork
     /// <param name="context"></param>
     /// <param name="resultContext"></param>
     /// <exception cref="NotImplementedException"></exception>
-    public void OnCompleted(ActionExecutingContext context, ActionExecutedContext resultContext)
+    public void OnCompleted(FilterContext context, FilterContext resultContext)
     {
         _sqlSugarClient.Dispose();
     }

+ 1 - 1
Admin.NET/Admin.NET.UnitTest/Admin.NET.UnitTest.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Pure.Xunit" Version="4.2.1" />
+    <PackageReference Include="Furion.Pure.Xunit" Version="4.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="xunit" Version="2.4.2" />