优先级队列，增加hash去重，覆盖优先级测试

IRC.Core.SCP/HostConfig/SyncFileRecoveryService.cs

@@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using System;
 using System.Linq;
 using System.Threading;
@@ -20,40 +21,50 @@ public class SyncFileRecoveryService(IServiceScopeFactory _scopeFactory, FileSyn
 
     private readonly int _pageSize = 500;
 
+    /// <summary>
+    /// 多个程序，如果恢复同一份数据，造成重复同步，SCP服务不恢复任务
+    /// </summary>
+    /// <param name="stoppingToken"></param>
+    /// <returns></returns>
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        using var scope = _scopeFactory.CreateScope();
-        var fileUploadRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<FileUploadRecord>>();
 
-        // 延迟启动，保证主机快速启动
-        await Task.Delay(5000, stoppingToken);
+        await Task.CompletedTask;
 
-        int page = 0;
+        //using var scope = _scopeFactory.CreateScope();
+        //var fileUploadRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<FileUploadRecord>>();
+
+        //// 延迟启动，保证主机快速启动
+        //await Task.Delay(5000, stoppingToken);
+
+        //int page = 0;
 
 
-        while (!stoppingToken.IsCancellationRequested)
-        {
-            // 分页获取未入队任务
-            var pending = await fileUploadRecordRepository
-                .Where(x => x.IsNeedSync == true && (x.IsSync == false || x.IsSync == null))
-                .OrderByDescending(x => x.Priority)
-                .Select(t => new { t.Id, t.Priority })
-                .Skip(page * _pageSize)
-                .Take(_pageSize)
-                .ToListAsync(stoppingToken);
+        //while (!stoppingToken.IsCancellationRequested)
+        //{
+        //    // 分页获取未入队任务
+        //    var pending = await fileUploadRecordRepository
+        //        .Where(x => x.IsNeedSync == true && (x.IsSync == false || x.IsSync == null))
+        //        .OrderByDescending(x => x.Priority)
+        //        .Select(t => new { t.Id, t.Priority })
+        //        .Skip(page * _pageSize)
+        //        .Take(_pageSize)
+        //        .ToListAsync(stoppingToken);
 
-            if (!pending.Any())
-                break; // 扫描完毕，退出循环
+        //    if (!pending.Any())
+        //        break; // 扫描完毕，退出循环
+
+        //    foreach (var file in pending)
+        //    {
+        //        //file.IsQueued = true;      // 避免重复入队
+        //        _fileSyncQueue.Enqueue(file.Id, file.Priority ?? 0);  // 放入队列
+        //    }
+
+        //    page++;                       // 下一页
+        //    await Task.Delay(200, stoppingToken); // 缓解数据库压力
+        //}
 
-            foreach (var file in pending)
-            {
-                //file.IsQueued = true;      // 避免重复入队
-                _fileSyncQueue.Enqueue(file.Id, file.Priority ?? 0);  // 放入队列
-            }
 
-            page++;                       // 下一页
-            await Task.Delay(200, stoppingToken); // 缓解数据库压力
-        }
     }
 }
 
@@ -85,12 +96,29 @@ public class FileSyncWorker(IServiceScopeFactory _scopeFactory, ILogger<FileSync
                 using var scope = _scopeFactory.CreateScope();
                 var _fileUploadRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<FileUploadRecord>>();
                 var _uploadFileSyncRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<UploadFileSyncRecord>>();
+
+                var syncConfig = (scope.ServiceProvider.GetRequiredService<IOptionsMonitor<ObjectStoreServiceOptions>>()).CurrentValue;
+
                 var oss = scope.ServiceProvider.GetRequiredService<IOSSService>();
 
                 var file = await _fileUploadRecordRepository.FirstOrDefaultAsync(t => t.Id == id);
 
-                if (file == null || file.IsNeedSync != true)
+                // ✅ 不要 return
+                if (file == null || file.IsNeedSync != true || syncConfig.IsOpenStoreSync == false)
+                {
+                    continue;
+                }
+
+                if (syncConfig.SyncConfigList.Any(t => t.UploadRegion == file.UploadRegion && t.IsOpenSync == false))
+                {
+                    continue;
+                }
+
+                //如果发现系统配置某一边同步进行了关闭，那么就直接返回，不执行任务
+                if (syncConfig.SyncConfigList.Any(t => t.UploadRegion == file.UploadRegion && t.IsOpenSync == false))
+                {
                     return;
+                }
 
                 var log = new UploadFileSyncRecord
                 {
@@ -126,6 +154,11 @@ public class FileSyncWorker(IServiceScopeFactory _scopeFactory, ILogger<FileSync
             {
                 _logger.LogError(ex, "Sync failed {Id}", id);
             }
+            finally
+            {
+                // ⭐⭐⭐ 永远执行
+                _fileSyncQueue.Complete(id);
+            }
         }