Просмотр исходного кода

😎1、升级Furion v4.9.2.16 2、升级SqlSugar v5.1.4.152

zuohuaijun 2 лет назад
Родитель
Сommit
0e648f765b

+ 4 - 4
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.15" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.15" />
-    <PackageReference Include="Furion.Pure" Version="4.9.2.15" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.16" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.16" />
+    <PackageReference Include="Furion.Pure" Version="4.9.2.16" />
     <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" />
@@ -41,7 +41,7 @@
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.1" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.0.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.2.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.151" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.152" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.10" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 4 - 7
Admin.NET/Admin.NET.Core/Service/Job/SysJobService.cs

@@ -267,8 +267,7 @@ public class SysJobService : IDynamicApiController, ITransient
     [DisplayName("暂停作业")]
     public void PauseJob(JobDetailInput input)
     {
-        var scheduler = _schedulerFactory.GetJob(input.JobId);
-        scheduler?.Pause();
+        _schedulerFactory.TryPauseJob(input.JobId, out _);
     }
 
     /// <summary>
@@ -277,8 +276,7 @@ public class SysJobService : IDynamicApiController, ITransient
     [DisplayName("启动作业")]
     public void StartJob(JobDetailInput input)
     {
-        var scheduler = _schedulerFactory.GetJob(input.JobId);
-        scheduler?.Start();
+        _schedulerFactory.TryStartJob(input.JobId, out _);
     }
 
     /// <summary>
@@ -287,8 +285,7 @@ public class SysJobService : IDynamicApiController, ITransient
     [DisplayName("取消作业")]
     public void CancelJob(JobDetailInput input)
     {
-        var scheduler = _schedulerFactory.GetJob(input.JobId);
-        scheduler?.Cancel();
+        _schedulerFactory.TryCancelJob(input.JobId, out _);
     }
 
     /// <summary>
@@ -298,7 +295,7 @@ public class SysJobService : IDynamicApiController, ITransient
     [DisplayName("执行作业")]
     public void RunJob(JobDetailInput input)
     {
-        if (_schedulerFactory.TryRunJob(input.JobId) != ScheduleResult.Succeed)
+        if (_schedulerFactory.TryRunJob(input.JobId, out _) != ScheduleResult.Succeed)
             throw Oops.Oh(ErrorCodeEnum.D1705);
     }
 

+ 2 - 3
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -275,9 +275,8 @@ public static class SqlSugarSetup
                 Parameters = JSON.Serialize(u.Parameters),
                 Elapsed = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds
             };
-            //修复单独日志库没有差异日志问题
-            var _db = SqlSugarSetup.ITenant.IsAnyConnection(SqlSugarConst.LogConfigId) ? ITenant.GetConnectionScope(SqlSugarConst.LogConfigId) : db;
-            await _db.CopyNew().Insertable(logDiff).ExecuteCommandAsync();
+            var logDb = ITenant.IsAnyConnection(SqlSugarConst.LogConfigId) ? ITenant.GetConnectionScope(SqlSugarConst.LogConfigId) : db;
+            await logDb.CopyNew().Insertable(logDiff).ExecuteCommandAsync();
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine(DateTime.Now + $"\r\n*****开始差异日志*****\r\n{Environment.NewLine}{JSON.Serialize(logDiff)}{Environment.NewLine}*****结束差异日志*****\r\n");
         };