XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉hangfire 增加quartZ 方便部署，免得需要两个数据库

Uat_Study
hang 2023-06-27 17:04:14 +08:00
parent 4eb5c97725
commit 91a6f20dba
5 changed files with 89 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.API/IRaCIS.Core.API.csproj
View File

@ -86,6 +86,8 @@
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.6.2" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.6.2" />
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" /> <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.2.0" /> <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.2.0" />
<PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" /> <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />

4
IRaCIS.Core.API/Startup.cs
View File

@ -114,7 +114,7 @@ namespace IRaCIS.Core.API
//services.AddDistributedMemoryCache(); //services.AddDistributedMemoryCache();
// hangfire 定时任务框架 有界面，更友好~ // hangfire 定时任务框架 有界面，更友好~
services.AddhangfireSetup(_configuration); //services.AddhangfireSetup(_configuration);
// QuartZ 定时任务框架 使用了hangfire 暂时不用，后续需要可以打开，已经配好 // QuartZ 定时任务框架 使用了hangfire 暂时不用，后续需要可以打开，已经配好
services.AddQuartZSetup(_configuration); services.AddQuartZSetup(_configuration);
@ -181,7 +181,7 @@ namespace IRaCIS.Core.API
app.UseLogDashboard("/LogDashboard"); app.UseLogDashboard("/LogDashboard");
//hangfire //hangfire
app.UseHangfireConfig(env); //app.UseHangfireConfig(env);
////暂时废弃 ////暂时废弃
//app.UseHttpReports(); //app.UseHttpReports();

54
IRaCIS.Core.API/_ServiceExtensions/QuartZSetup.cs
View File

@ -1,6 +1,8 @@
 
using IRaCIS.Application.Services.BackGroundJob;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Quartz;
namespace IRaCIS.Core.API namespace IRaCIS.Core.API
{ {
@ -8,37 +10,35 @@ namespace IRaCIS.Core.API
{ {
public static void AddQuartZSetup(this IServiceCollection services, IConfiguration configuration) public static void AddQuartZSetup(this IServiceCollection services, IConfiguration configuration)
{ {
//services.AddTransient<CacheTrialStatusQuartZJob>(); services.AddTransient<CacheTrialStatusQuartZJob>();
//services.AddQuartz(q => services.AddQuartz(q =>
//{ {
// // base quartz scheduler, job and trigger configuration // base quartz scheduler, job and trigger configuration
// // as of 3.3.2 this also injects scoped services (like EF DbContext) without problems // as of 3.3.2 this also injects scoped services (like EF DbContext) without problems
// q.UseMicrosoftDependencyInjectionJobFactory(); q.UseMicrosoftDependencyInjectionJobFactory();
// // 基本Quartz调度器、作业和触发器配置 // 基本Quartz调度器、作业和触发器配置
// var jobKey = new JobKey("RegularTrialWork", "regularWorkGroup"); var jobKey = new JobKey("RegularTrialWork", "regularWorkGroup");
// q.AddJob<CacheTrialStatusQuartZJob>(jobKey, j => j q.AddJob<CacheTrialStatusQuartZJob>(jobKey, j => j
// .WithDescription("Trial regular work") .WithDescription("Trial regular work")
// ); );
// q.AddTrigger(t => t q.AddTrigger(t => t
// .WithIdentity("TrialStatusTrigger") .WithIdentity("TrialStatusTrigger")
// .ForJob(jobKey) .ForJob(jobKey)
// //.StartNow()
// //.WithSimpleSchedule(x => x.WithInterval(TimeSpan.FromSeconds(15))//开始秒数 15s .WithCronSchedule("0 0 * * * ?")
// // .RepeatForever())//持续工作 .WithDescription("My regular trial work trigger")
// .WithCronSchedule("0 0 0/2 * * ?")//每小时执行一次 );
// .WithDescription("My regular trial work trigger") });
// );
//});
//// ASP.NET Core hosting // ASP.NET Core hosting
//services.AddQuartzServer(options => services.AddQuartzHostedService(options =>
//{ {
// // when shutting down we want jobs to complete gracefully // when shutting down we want jobs to complete gracefully
// options.WaitForJobsToComplete = true; options.WaitForJobsToComplete = true;
//}); });
} }
} }

38
IRaCIS.Core.Application/BackGroundJob/CacheTrialStatusQuartZJob.cs
View File

@ -7,6 +7,7 @@ using IRaCIS.Core.Infra.EFCore;
using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Models;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Quartz; using Quartz;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Application.Services.BackGroundJob namespace IRaCIS.Application.Services.BackGroundJob
{ {
@ -17,36 +18,55 @@ namespace IRaCIS.Application.Services.BackGroundJob
private readonly IRepository<Trial> _trialRepository; private readonly IRepository<Trial> _trialRepository;
private readonly IEasyCachingProvider _provider; private readonly IEasyCachingProvider _provider;
private readonly ILogger<CacheTrialStatusQuartZJob> _logger; private readonly ILogger<CacheTrialStatusQuartZJob> _logger;
private readonly IRepository<SystemAnonymization> _systemAnonymizationRepository;
public CacheTrialStatusQuartZJob(IRepository<Trial> trialRepository, IEasyCachingProvider provider,ILogger<CacheTrialStatusQuartZJob> logger) public CacheTrialStatusQuartZJob(IRepository<Trial> trialRepository, IEasyCachingProvider provider,ILogger<CacheTrialStatusQuartZJob> logger, IRepository<SystemAnonymization> systemAnonymizationRepository)
{ {
_trialRepository = trialRepository; _trialRepository = trialRepository;
_provider = provider; _provider = provider;
_logger = logger; _logger = logger;
_systemAnonymizationRepository = systemAnonymizationRepository;
} }
public Task Execute(IJobExecutionContext context) public async Task Execute(IJobExecutionContext context)
{ {
_logger.LogInformation($"开始执行QuartZ定时任务作业"); _logger.LogInformation($"开始执行QuartZ定时任务作业");
try try
{ {
var list = _trialRepository.Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr }) await MemoryCacheTrialStatus();
.ToList();
await MemoryCacheAnonymizeData();
list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(1)));
} }
catch (Exception e) catch (Exception e)
{ {
_logger.LogError($" 查询和缓存过程出现异常"+e.Message); _logger.LogError($" 查询和缓存过程出现异常"+e.Message);
} }
_logger.LogInformation("QuartZ定时任务作业结束"); _logger.LogInformation("QuartZ定时任务作业结束");
return Task.CompletedTask;
} }
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));
}
} }
} }

29
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -680,6 +680,11 @@
InternationalizationService InternationalizationService
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Service.PublishLogService">
<summary>
PublishLogService
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService"> <member name="T:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService">
<summary> <summary>
TrialEmailNoticeConfigService TrialEmailNoticeConfigService
@ -2663,6 +2668,16 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SubmitClinicalFormInDto.VisitId">
<summary>
VisitId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SubmitClinicalFormInDto.ReadingId">
<summary>
VisitId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.IsApply"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.IsApply">
<summary> <summary>
是否应用 是否应用
@ -7975,6 +7990,15 @@
<member name="T:IRaCIS.Core.Application.ViewModel.InternationalizationAddOrEdit"> <member name="T:IRaCIS.Core.Application.ViewModel.InternationalizationAddOrEdit">
<summary> InternationalizationAddOrEdit 列表查询参数模型</summary> <summary> InternationalizationAddOrEdit 列表查询参数模型</summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.ViewModel.PublishLogView">
<summary> PublishLogView 列表视图模型 </summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.PublishLogQuery">
<summary>PublishLogQuery 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.PublishLogAddOrEdit">
<summary> PublishLogAddOrEdit 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigView"> <member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigView">
<summary> TrialEmailNoticeConfigView 列表视图模型 </summary> <summary> TrialEmailNoticeConfigView 列表视图模型 </summary>
</member> </member>
@ -8840,6 +8864,11 @@
IInternationalizationService IInternationalizationService
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Interfaces.IPublishLogService">
<summary>
IPublishLogService
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Interfaces.ITrialEmailNoticeConfigService"> <member name="T:IRaCIS.Core.Application.Interfaces.ITrialEmailNoticeConfigService">
<summary> <summary>
ITrialEmailNoticeConfigService ITrialEmailNoticeConfigService