修复 执行部分任务时 没使用await等待导致的数据库连接异常

VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs

@@ -69,11 +69,11 @@ namespace Learn.VideoAnalysis.Components.Pages
         /// 重试
         /// </summary>
         /// <param name="query"></param>
-        async void ReStart()
+        async Task ReStart()
         {
             await redisManager.ClearTaskError(reStartTask.Id);
-            _=Task.Run(() =>
-                redisManager.InsertChannel((RedisChannelEnum)selectEnum, reStartTask.Id)
+            await Task.Run(async () =>
+                await redisManager.InsertChannel((RedisChannelEnum)selectEnum, reStartTask.Id)
             );
             modalShow = false;
         }

VideoAnalysisCore/AICore/GPT/DeepSeek/DeepSeek_GPT.cs

@@ -554,12 +554,6 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
                     await videoKonwPointDB.InsertRangeAsync(insertData);
                     break;
                 }
-                else
-                {
-                    Console.WriteLine(DateTime.Now + $"=>{task} 得分过低/分段长度不匹配  得分{checkRes?.Score} ");
-                    Console.WriteLine(checkRes.Evaluation);
-                    Console.WriteLine();
-                }
                 if (questionRes.Any(s => s.KeepTime < 30))
                 {
                     Console.WriteLine(DateTime.Now + "=>视频分段过短!! 重新进行AI分析");
@@ -618,7 +612,7 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
         {
 
             var taskId = long.Parse(task);
-            var taskInfo = await videoTaskDB.AsQueryable()
+            var taskInfo = await videoTaskDB.CopyNew().AsQueryable()
                 .Where(s => s.Id == taskId)
                 .FirstAsync();
             if (taskInfo.VideoType != null&& taskInfo.VideoType!=AttachmentsInfoType.无)

VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs

@@ -76,7 +76,8 @@ namespace VideoAnalysisCore.Common.Expand
                     if (ex.Parametres == null) return;
                     //var originColor = Console.ForegroundColor;
                     //Console.ForegroundColor = ConsoleColor.DarkRed;
-                    Console.WriteLine($"【{DateTime.Now}——错误SQL  - [{config.ConfigId}]】\r\n"+ ex.Message + "\r\n" + UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\r\n");
+                    Console.WriteLine($"【{DateTime.Now}——错误SQL  - [{config.ConfigId}]】\r\n"+ ex.Message + "\r\n" 
+                        + UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\r\n");
                     Console.WriteLine();
                     //Console.ForegroundColor = originColor;
                 };

VideoAnalysisCore/Common/RedisExpand.cs

@@ -113,41 +113,40 @@ namespace VideoAnalysisCore.Common
         public void Init()
         {
             var SubscribeList = RedisManager.SubscribeList;
-            SubscribeList.Add(RedisChannelEnum.下载文件, (task) =>
+            SubscribeList.Add(RedisChannelEnum.下载文件, async (task) =>
             {
                 using var scope = AppCommon.Services?.CreateScope();
                 if (scope is null || scope.ServiceProvider.GetService<DownloadFile>() is null)
                     throw new Exception("DownloadFile 未注入");
                 else
-                    return scope.ServiceProvider.GetService<DownloadFile>()?.RunTask(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider.GetService<DownloadFile>()?.RunTask(task) ;
             });
             SubscribeList.Add(RedisChannelEnum.分离音频, FFMPGE.RunAsync);
             SubscribeList.Add(RedisChannelEnum.解析字幕, senseVoice.RunTask);
             //SubscribeList.Add(RedisChannelEnum.解析说话人,Speaker.Run);
-            SubscribeList.Add(RedisChannelEnum.AI课程类型,
-            (task) =>
+            SubscribeList.Add(RedisChannelEnum.AI课程类型, async (task) =>
             {
                 using var scope = AppCommon.Services?.CreateScope();
                 if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
                     throw new Exception("IBserGPT 未注入");
                 else
-                    return scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoType(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoType(task);
             });
-            SubscribeList.Add(RedisChannelEnum.AI模型分析, (task) =>
+            SubscribeList.Add(RedisChannelEnum.AI模型分析, async (task) =>
             {
                 using var scope = AppCommon.Services?.CreateScope();
                 if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
                     throw new Exception("IBserGPT 未注入");
                 else
-                    return scope.ServiceProvider.GetService<IBserGPT>()?.GetKnow(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider?.GetService<IBserGPT>()?.GetKnow(task);
             });
-            SubscribeList.Add(RedisChannelEnum.AI分析试题, (task) =>
+            SubscribeList.Add(RedisChannelEnum.AI分析试题, async (task) =>
             {
                 using var scope = AppCommon.Services?.CreateScope();
                 if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
                     throw new Exception("IBserGPT 未注入");
                 else
-                    return scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoQuestion(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider?.GetService<IBserGPT>()?.GetVideoQuestion(task);
             });
             SubscribeList.Add(RedisChannelEnum.结束任务, redisManager.TaskEnd);
 
@@ -291,7 +290,15 @@ namespace VideoAnalysisCore.Common
                     it.LastEnum,
                     it.EndTime
                 }).ExecuteCommandAsync();
+            try
+            {
+                ExpandFunction.DeleteTaskFile(tId);
+            }
+            catch (Exception)
+            {
 
+                throw;
+            }
             //NewTask();
         }
 
@@ -301,14 +308,13 @@ namespace VideoAnalysisCore.Common
         public async void InitChannel()
         {
             if (Redis is null) throw new Exception("redis未初始化");
-
-
             //处理之前程序结束前未能执行完的情况
             var oldTaskCount = Redis.LLen(RedisExpandKey.IDTask);
             if (oldTaskCount > 0)
             {
                 var oldTaskArr = Redis.LRange(RedisExpandKey.IDTask, 0, oldTaskCount);
-                Redis.LTrim(RedisExpandKey.IDTask, 1, 0);//删除 redis 列表
+                //不自动清理未完成任务 等待执行完毕/失败后自动清理
+                //Redis.LTrim(RedisExpandKey.IDTask, 1, 0);//删除 redis 列表   
                 foreach (var oldTask in oldTaskArr)
                 {
                     _ = Task.Run(async () =>
@@ -378,7 +384,7 @@ namespace VideoAnalysisCore.Common
                 Console.WriteLine($"{DateTime.Now} =>服务端不接收任务");
                 return;
             }
-            Task.Run(async () =>
+            Task.Run(() =>
             {
                 lock (Redis)
                 {
@@ -396,7 +402,6 @@ namespace VideoAnalysisCore.Common
                 }
 
             });
-
         }
 
         /// <summary>
@@ -437,8 +442,9 @@ namespace VideoAnalysisCore.Common
         /// <returns></returns>
         public async Task<bool> SetTaskError(long taskID, string? error)
         {
+            var vDB = AppCommon.Services.GetService<Repository<VideoTask>>();
             Redis.HMSet(RedisExpandKey.Task(taskID), "ErrorMessage", error);
-            return await videoTaskDB.AsUpdateable()
+            return await vDB.CopyNew().AsUpdateable()
                 .SetColumns(it => it.ErrorMessage == error)//SetColumns是可以叠加的 写2个就2个字段赋值
                 .Where(it => it.Id == taskID)
                 .ExecuteCommandAsync() == 1;
@@ -464,14 +470,11 @@ namespace VideoAnalysisCore.Common
                     {
                         Redis.HMSet(RedisExpandKey.Task(taskId), "LastEnum", key);
                         Redis.HMSet(RedisExpandKey.Task(taskId), "Progress", 0);
-                        lock (Redis)
-                        {
-                            videoTaskDB.AsUpdateable()
+                        var vDB = AppCommon.Services.GetService<Repository<VideoTask>>();
+                        await vDB.CopyNew().AsUpdateable()
                             .SetColumns(it => it.LastEnum == key)
                             .Where(it => it.Id == tID)
-                                .ExecuteCommand();
-
-                        }
+                            .ExecuteCommandAsync();
                         await action(taskId);
                         return;
                     }

VideoAnalysisCore/Common/Repository.cs

@@ -26,8 +26,9 @@ namespace VideoAnalysisCore.Common
                 base.Context = CID[t] != null
                     ? DbScoped.Sugar.GetConnectionScope(CID[t])
                     : DbScoped.Sugar;
-                return;
             }
+            else
+            {
                 var c = t.GetCustomAttribute<TenantAttribute>();
                 if (!CID.ContainsKey(t))
                     CID.Add(t, c?.configId);
@@ -35,5 +36,8 @@ namespace VideoAnalysisCore.Common
                     ? DbScoped.Sugar.GetConnectionScope(c.configId)
                      : DbScoped.Sugar;
             }
+            //这个变量也要保证是线程安全的，尽量CopyNew在方法中使用
+            base.Context = base.Context.CopyNew();
+        }
     }
 }

VideoAnalysisCore/VideoAnalysisCore.csproj

@@ -74,7 +74,7 @@
 		<PackageReference Include="org.k2fsa.sherpa.onnx" Version="1.10.32" />
 		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
 		<PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.205" />
 		<PackageReference Include="UserCenter.Model" Version="1.3.5" />
 		<PackageReference Include="Whisper.net" Version="1.5.0" />
 		<PackageReference Include="Whisper.net.Runtime" Version="1.5.0" />