diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index 843813572..248060a76 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -89,8 +89,6 @@ - - diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs index 06851f87d..83255d47a 100644 --- a/IRaCIS.Core.API/Startup.cs +++ b/IRaCIS.Core.API/Startup.cs @@ -117,8 +117,7 @@ namespace IRaCIS.Core.API // hangfire 定时任务框架 有界面,更友好~ services.AddhangfireSetup(_configuration); - // QuartZ 定时任务框架 使用了hangfire 暂时不用,后续需要可以打开,已经配好 - services.AddQuartZSetup(_configuration); + // 保护上传文件 //services.AddStaticFileAuthorizationSetup(); diff --git a/IRaCIS.Core.API/_ServiceExtensions/QuartZSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/QuartZSetup.cs deleted file mode 100644 index 2f42e8f7c..000000000 --- a/IRaCIS.Core.API/_ServiceExtensions/QuartZSetup.cs +++ /dev/null @@ -1,45 +0,0 @@ -锘 -using IRaCIS.Application.Services.BackGroundJob; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Quartz; - -namespace IRaCIS.Core.API -{ - public static class QuartZSetup - { - public static void AddQuartZSetup(this IServiceCollection services, IConfiguration configuration) - { - services.AddTransient(); - - services.AddQuartz(q => - { - // base quartz scheduler, job and trigger configuration - - // as of 3.3.2 this also injects scoped services (like EF DbContext) without problems - q.UseMicrosoftDependencyInjectionJobFactory(); - - // 鍩烘湰Quartz璋冨害鍣ㄣ佷綔涓氬拰瑙﹀彂鍣ㄩ厤缃 - var jobKey = new JobKey("RegularTrialWork", "regularWorkGroup"); - q.AddJob(jobKey, j => j - .WithDescription("Trial regular work") - ); - q.AddTrigger(t => t - .WithIdentity("TrialStatusTrigger") - .ForJob(jobKey) - - .WithCronSchedule("0 0 * * * ?") - .WithDescription("My regular trial work trigger") - ); - }); - - // ASP.NET Core hosting - services.AddQuartzHostedService(options => - { - // when shutting down we want jobs to complete gracefully - options.WaitForJobsToComplete = true; - }); - - } - } -} diff --git a/IRaCIS.Core.Application/BackGroundJob/CacheTrialStatusQuartZJob.cs b/IRaCIS.Core.Application/BackGroundJob/CacheTrialStatusQuartZJob.cs deleted file mode 100644 index e3be27479..000000000 --- a/IRaCIS.Core.Application/BackGroundJob/CacheTrialStatusQuartZJob.cs +++ /dev/null @@ -1,72 +0,0 @@ -锘縰sing System; -using System.Linq; -using System.Threading.Tasks; -using EasyCaching.Core; -using IRaCIS.Core.Domain; -using IRaCIS.Core.Infra.EFCore; -using IRaCIS.Core.Domain.Models; -using Microsoft.Extensions.Logging; -using Quartz; -using IRaCIS.Core.Domain.Share; - -namespace IRaCIS.Application.Services.BackGroundJob -{ - - public class CacheTrialStatusQuartZJob: IJob - { - - private readonly IRepository _trialRepository; - private readonly IEasyCachingProvider _provider; - private readonly ILogger _logger; - private readonly IRepository _systemAnonymizationRepository; - - public CacheTrialStatusQuartZJob(IRepository trialRepository, IEasyCachingProvider provider,ILogger logger, IRepository systemAnonymizationRepository) - { - _trialRepository = trialRepository; - _provider = provider; - _logger = logger; - _systemAnonymizationRepository = systemAnonymizationRepository; - } - - public async Task Execute(IJobExecutionContext context) - - { - _logger.LogInformation($"寮濮嬫墽琛孮uartZ瀹氭椂浠诲姟浣滀笟"); - try - { - await MemoryCacheTrialStatus(); - - await MemoryCacheAnonymizeData(); - - } - catch (Exception e) - { - _logger.LogError($" 鏌ヨ鍜岀紦瀛樿繃绋嬪嚭鐜板紓甯"+e.Message); - } - _logger.LogInformation("QuartZ瀹氭椂浠诲姟浣滀笟缁撴潫"); - } - - - public async Task MemoryCacheTrialStatus() - { - var list = await _trialRepository.Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr }) - .ToListAsync(); - - list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(7))); - - } - - public async Task MemoryCacheAnonymizeData() - { - var systemAnonymizationList = await _systemAnonymizationRepository.Where(t => t.IsEnable).ToListAsync(); - - _provider.Set(StaticData.Anonymize.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7)); - _provider.Set(StaticData.Anonymize.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7)); - _provider.Set(StaticData.Anonymize.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7)); - _provider.Set(StaticData.Anonymize.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7)); - } - - - - } -} \ No newline at end of file