清理多余引用

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -1,43 +1,27 @@
-using System;
+using Amazon.SecurityToken;
-using System.Net.Http;
-using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
+using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Auth;
-using IRaCIS.Core.Application.Filter;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.AspNetCore.Http;
-using IRaCIS.Core.Application.Interfaces;
-using System.Threading.Tasks;
-using IRaCIS.Core.Application.Service;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Infrastructure;
-using System.Linq;
-using Microsoft.Extensions.Logging;
-using MassTransit;
-using Microsoft.AspNetCore.Hosting;
-using IRaCIS.Core.Application.Helper;
-using Microsoft.Extensions.Options;
 using IRaCIS.Core.Application.Contracts;
-using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
+using IRaCIS.Core.Application.Helper;
-using DocumentFormat.OpenXml.Spreadsheet;
+using IRaCIS.Core.Application.Service;
-using AutoMapper.QueryableExtensions;
+using IRaCIS.Core.Domain.Models;
-using NetTopologySuite.Algorithm;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Infrastructure.Extention;
+using MassTransit;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using ZiggyCreatures.Caching.Fusion;
-using AlibabaCloud.SDK.Sts20150401;
-using AlibabaCloud.SDK.Sts20150401.Models;
-using Org.BouncyCastle.Tls;
-using Amazon.SecurityToken.Model;
-using Amazon.SecurityToken;
-using Amazon;
 using AssumeRoleRequest = Amazon.SecurityToken.Model.AssumeRoleRequest;
-using AutoMapper;
+using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
 
 namespace IRaCIS.Api.Controllers
 {

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -1,18 +1,17 @@
-using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Application.Contracts;
-using System;
-using System.Collections.Generic;
 using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Authorization;
-using System.Threading.Tasks;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
-using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Application.Auth;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace IRaCIS.Core.API.Controllers.Special
 {
@@ -36,7 +35,7 @@ namespace IRaCIS.Core.API.Controllers.Special
 
         public async Task<IResponseOutput> AddOrUpdateTrialInspection(DataInspectionDto<TrialCommand> opt)
         {
-            var fun =await AddOrUpdateTrial(opt.Data);
+            var fun = await AddOrUpdateTrial(opt.Data);
 
             return fun;
         }
@@ -88,7 +87,7 @@ namespace IRaCIS.Core.API.Controllers.Special
         /// <returns></returns>
 
         [HttpPost, Route("doctorWorkload/workLoadAddOrUpdate")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> WorkLoadAddOrUpdate([FromServices] IDoctorWorkloadService _trialWorkloadService, WorkloadCommand workLoadAddOrUpdateModel)
         {
             var userId = Guid.Parse(User.FindFirst("id").Value);
@@ -110,7 +109,7 @@ namespace IRaCIS.Core.API.Controllers.Special
 
 
         [HttpDelete, Route("doctorWorkload/deleteWorkLoad/{id:guid}/{trialId:guid}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> DeleteWorkLoad([FromServices] IDoctorWorkloadService _trialWorkloadService, Guid id)
         {
             //先判断该工作量的费用是否被锁定，如果被锁定，则不能删除
@@ -177,7 +176,7 @@ namespace IRaCIS.Core.API.Controllers.Special
         {
             if (addOrUpdateModel.Id != Guid.Empty && addOrUpdateModel.Id != null)
             {
-                var needCalReviewerIds =await _reviewerPayInfoService.GetReviewerIdByRankId(Guid.Parse(addOrUpdateModel.Id.ToString()));
+                var needCalReviewerIds = await _reviewerPayInfoService.GetReviewerIdByRankId(Guid.Parse(addOrUpdateModel.Id.ToString()));
                 var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
 
                 foreach (var item in calcList)
@@ -209,7 +208,7 @@ namespace IRaCIS.Core.API.Controllers.Special
         public async Task<IResponseOutput> AddOrUpdateReviewerPayInfo([FromServices] IReviewerPayInfoService _doctorPayInfoService, ReviewerPayInfoCommand addOrUpdateModel)
         {
             var userId = Guid.Parse(User.FindFirst("id").Value);
-            var result =await _doctorPayInfoService.AddOrUpdateReviewerPayInfo(addOrUpdateModel, userId);
+            var result = await _doctorPayInfoService.AddOrUpdateReviewerPayInfo(addOrUpdateModel, userId);
             var calcList = await _calculateService.GetNeedCalculateReviewerList(addOrUpdateModel.DoctorId, string.Empty);
             foreach (var item in calcList)
             {
@@ -238,7 +237,7 @@ namespace IRaCIS.Core.API.Controllers.Special
         public async Task<IResponseOutput> AddOrUpdateTrialPaymentPrice([FromServices] ITrialPaymentPriceService _trialPaymentPriceService, TrialPaymentPriceCommand addOrUpdateModel)
         {
             var userId = Guid.Parse(User.FindFirst("id").Value);
-            var result =await _trialPaymentPriceService.AddOrUpdateTrialPaymentPrice(addOrUpdateModel);
+            var result = await _trialPaymentPriceService.AddOrUpdateTrialPaymentPrice(addOrUpdateModel);
             var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(addOrUpdateModel.TrialId);
             var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
 
@@ -267,7 +266,7 @@ namespace IRaCIS.Core.API.Controllers.Special
         public async Task<IResponseOutput> AddOrUpdateAwardPriceList([FromServices] IVolumeRewardService _volumeRewardService, IEnumerable<AwardPriceCommand> addOrUpdateModel)
         {
 
-            var result =await _volumeRewardService.AddOrUpdateVolumeRewardPriceList(addOrUpdateModel);
+            var result = await _volumeRewardService.AddOrUpdateVolumeRewardPriceList(addOrUpdateModel);
 
             var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
             foreach (var item in calcList)

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -1,24 +1,18 @@
 
-using System.Threading.Tasks;
-using AutoMapper;
-
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Image.QA;
-using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using IRaCIS.Core.Application.Service.Inspection.Interface;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.Service.Reading.Interface;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 
 
 namespace IRaCIS.Core.API.Controllers
@@ -313,7 +307,7 @@ namespace IRaCIS.Core.API.Controllers
         {
 
             opt.Data.IsTrialBasicLogicConfirmed = true;
-            var singid=  await _inspectionService.RecordSing(opt.SignInfo);
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
             var result = await _trialConfigService.ConfigTrialBasicInfo(opt.Data);
             await _inspectionService.CompletedSign(singid, result);
             return result;
@@ -355,7 +349,7 @@ namespace IRaCIS.Core.API.Controllers
         {
             opt.Data.IsTrialUrgentConfirmed = true;
             var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            var  result=  await _trialConfigService.ConfigTrialUrgentInfo(opt.Data);
+            var result = await _trialConfigService.ConfigTrialUrgentInfo(opt.Data);
             await _inspectionService.CompletedSign(singid, result);
             return result;
         }
@@ -379,7 +373,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost, Route("Inspection/configTrialBasicInfo/TrialConfigSignatureConfirm")]
         [UnitOfWork]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
 
         public async Task<IResponseOutput> TrialConfigSignatureConfirm(DataInspectionDto<SignConfirmDTO> opt)
         {
@@ -434,7 +428,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> QCPassedOrFailed(DataInspectionDto<QCPassedOrFailedDto> opt)
         {
             var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            var result= await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
+            var result = await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
             await _inspectionService.CompletedSign(singid, result);
             return result;
         }
@@ -528,7 +522,7 @@ namespace IRaCIS.Core.API.Controllers
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         [UnitOfWork]
 
-        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt , [FromServices] IVisitTaskHelpeService _visitTaskCommonService,[FromServices] IVisitTaskService _visitTaskService)
+        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt, [FromServices] IVisitTaskHelpeService _visitTaskCommonService, [FromServices] IVisitTaskService _visitTaskService)
         {
             var singId = await _inspectionService.RecordSing(opt.SignInfo);
             var result = await _visitTaskService.ConfirmReReading(opt.Data, _visitTaskCommonService);

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -1,9 +1,6 @@
 using AutoMapper;
-using DocumentFormat.OpenXml.Drawing;
 using ExcelDataReader;
-using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
-using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.Dicom;
 using IRaCIS.Core.Application.Contracts.Dicom.DTO;
@@ -11,21 +8,16 @@ using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Command;
 using IRaCIS.Core.Application.Service;
-using IRaCIS.Core.Application.Service.ImageAndDoc;
-using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
-using MassTransit;
 using MassTransit.Mediator;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.AspNetCore.WebUtilities;
@@ -40,12 +32,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Data;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using ZiggyCreatures.Caching.Fusion;
 using Path = System.IO.Path;
 
 namespace IRaCIS.Core.API.Controllers
@@ -451,7 +441,7 @@ namespace IRaCIS.Core.API.Controllers
 
                 IsSuccess = false,
                 UploadStartTime = DateTime.Now,
-                FileCount=preArchiveStudyCommand.FileCount,
+                FileCount = preArchiveStudyCommand.FileCount,
                 IsDicom = preArchiveStudyCommand.IsDicom,
                 IP = _userInfo.IP
             };

IRaCIS.Core.API/Progranm.cs

@@ -1,45 +1,27 @@
-using System;
+using IRaCIS.Core.API;
-using Autofac.Extensions.DependencyInjection;
+using IRaCIS.Core.Application.BusinessFilter;
-using Microsoft.AspNetCore.Hosting;
+using IRaCIS.Core.Application.Filter;
-using Microsoft.Extensions.Hosting;
+using IRaCIS.Core.Application.Service.BackGroundJob;
-using Microsoft.Extensions.Configuration;
+using IRaCIS.Core.Infra.EFCore;
-using Serilog;
+using IRaCIS.Core.Infrastructure.Extention;
-using System.Threading.Tasks;
+using LogDashboard;
 using MassTransit;
 using MassTransit.NewIdProviders;
-using System.IO;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Application.Helper;
-using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Builder;
-using IRaCIS.Core.API;
+using Microsoft.AspNetCore.Hosting;
-using Autofac;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.DependencyInjection;
-using IRaCIS.Core.Application.Filter;
-using Microsoft.AspNetCore.HttpOverrides;
-using IRaCIS.Core.Application.Service.BackGroundJob;
-using LogDashboard;
-using FellowOakDicom.Network;
-using IRaCIS.Core.Application.Service.ImageAndDoc;
-using IP2Region.Net.Abstractions;
-using IP2Region.Net.XDB;
-using IRaCIS.Core.Application.BusinessFilter;
 using Microsoft.AspNetCore.Http;
-using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
-using Microsoft.AspNetCore.Diagnostics;
+using Serilog;
-using IRaCIS.Core.Application.MassTransit.Command;
+using System;
-using IRaCIS.Core.Application.MassTransit.Consumer;
+using System.IO;
-using DocumentFormat.OpenXml.InkML;
+using System.Runtime.InteropServices;
-using IRaCIS.Core.Domain;
-using MassTransit.Internals;
-using IRaCIS.Core.Domain.BaseModel;
 
 AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
+
 #region 获取环境变量
 //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
 var config = new ConfigurationBuilder()
@@ -89,19 +71,26 @@ NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
 builder.Configuration.AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), "appsettings.json", false, true)
                      .AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), $"appsettings.{enviromentName}.json", false, true);
 
-builder.Host
+builder.Host.UseSerilog();
-            .UseServiceProviderFactory(new AutofacServiceProviderFactory())
+
-            .ConfigureContainer<ContainerBuilder>(containerBuilder =>
+
-            {
+#region Autofac 废弃
-                containerBuilder.RegisterModule<AutofacModuleSetup>();
+//builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory())
-            })
+//            .ConfigureContainer<ContainerBuilder>(containerBuilder =>
-            .UseWindowsService().UseSerilog();
+//            {
+//                containerBuilder.RegisterModule<AutofacModuleSetup>();
+//            }).UseWindowsService();
+#endregion
+
 #endregion
 
 
 #region 配置服务
 var _configuration = builder.Configuration;
 
+//手动注册服务
+builder.Services.ConfigureServices(_configuration);
+
 //健康检查
 builder.Services.AddHealthChecks();
 //本地化
@@ -121,16 +110,6 @@ builder.Services.AddControllers(options =>
 })
     .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
 
-builder.Services.AddOptions().Configure<SystemEmailSendConfig>(_configuration.GetSection("SystemEmailSendConfig"));
-builder.Services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
-builder.Services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
-builder.Services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
-builder.Services.AddOptions().Configure<IRCEncreptOption>(_configuration.GetSection("EncrypteResponseConfig"));
-builder.Services.AddOptions().Configure<SystemPacsConfig>(_configuration.GetSection("SystemPacsConfig"));
-
-builder.Services.Configure<IRaCISBasicConfigOption>(_configuration.GetSection("IRaCISBasicConfig"));
-
-
 //动态WebApi + UnifiedApiResultFilter  省掉控制器代码
 builder.Services.AddDynamicWebApiSetup();
 //AutoMapper
@@ -144,116 +123,29 @@ builder.Services.AddSwaggerSetup();
 //JWT Token 验证
 builder.Services.AddJWTAuthSetup(_configuration);
 
-// MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
+//MassTransit
-//builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
+builder.Services.AddMassTransitSetup();
-
-#region MassTransit
-//masstransit组件 也支持MediatR 中介者模式，但是支持分布式，考虑后续，所以在次替代MediatR
-//参考链接：https://masstransit.io/documentation/concepts/mediator#scoped-mediator
-builder.Services.AddMediator(cfg =>
-{
-    cfg.AddConsumers(typeof(UserSiteSurveySubmitedEventConsumer).Assembly);
-
-    //cfg.AddConsumer<ConsistencyCheckConsumer>();
-    //cfg.AddConsumer<AddSubjectTriggerConsumer>();
-    //cfg.AddConsumer<AddSubjectTriggerConsumer2>();
-    //cfg.ConfigureMediator((context, cfg) => cfg.UseHttpContextScopeFilter(context));
-});
-
-//添加 MassTransit 和 InMemory 传输
-builder.Services.AddMassTransit(cfg =>
-{
-    // 自动扫描程序集中的消费者并进行注册
-    cfg.AddConsumers(typeof(UserSiteSurveySubmitedEventConsumer).Assembly);
-
-    //// 注册消费者
-    //cfg.AddConsumer<AddSubjectTriggerConsumer>(); // 替换为你的消费者类
-    //cfg.AddConsumer<AddSubjectTriggerConsumer2>();
-
-    cfg.AddPublishMessageScheduler();
-    //cfg.AddHangfireConsumers();
-
-
-
-    // 使用 InMemory 作为消息传递机制
-    cfg.UsingInMemory((context, cfg) =>
-    {
-        //https://github.com/MassTransit/Sample-Hangfire/blob/master/src/Sample.Hangfire.Console/Program.cs
-        cfg.UsePublishMessageScheduler();
-
-        //使用 Hangfire 进行消息调度
-        cfg.UseHangfireScheduler();
-
-        cfg.UseConsumeFilter(typeof(CultureInfoFilter<>), context,
-              x => x.Include(type => type.IsAssignableTo(typeof(DomainEvent))));
-
-
-        // 这里可以进行额外的配置
-        cfg.ConfigureEndpoints(context); // 自动配置所有消费者的端点
-
-    });
-});
-
-//builder.Services.AddOptions<MassTransitHostOptions>().Configure(options =>
-//{
-//    options.WaitUntilStarted = true;
-//});
-#endregion
-
-
-#region FusionCache
 
+// FusionCache
 builder.Services.AddFusionCache();
 
-#endregion
-
-// EasyCaching 缓存
-//builder.Services.AddEasyCachingSetup(_configuration);
-
 // hangfire  定时任务框架  有界面，更友好~
 builder.Services.AddhangfireSetup(_configuration);
 
-
 //Serilog 日志可视化 LogDashboard日志
 builder.Services.AddLogDashboardSetup();
 
-
-builder.Services.AddJsonConfigSetup(_configuration);
-//转发头设置  获取真实IP 
-builder.Services.Configure<ForwardedHeadersOptions>(options =>
-{
-    options.ForwardedHeaders =
-        ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-});
 //Dicom影像渲染图片  跨平台
 builder.Services.AddDicomSetup();
 
 // 实时应用
 builder.Services.AddSignalR();
 
-builder.Services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
+//异常处理
-
-
-builder.Services.AddSingleton<ISearcher>(new Searcher(CachePolicy.Content, Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "ip2region.xdb")));
-
 //builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
 //builder.Services.AddProblemDetails();
 
 
-#region  历史废弃配置
-//builder.Services.AddMemoryCache();
-////上传限制 配置
-//builder.Services.Configure<FormOptions>(options =>
-//{
-//    options.MultipartBodyLengthLimit = int.MaxValue;
-//    options.ValueCountLimit = int.MaxValue;
-//    options.ValueLengthLimit = int.MaxValue;
-//});
-//IP 限流 可设置白名单 或者黑名单
-//services.AddIpPolicyRateLimitSetup(_configuration);
-// 用户类型 策略授权
-//services.AddAuthorizationPolicySetup(_configuration);
-#endregion
 
 #endregion
 

IRaCIS.Core.API/Utility/FileHelpers.cs

@@ -1,3 +1,7 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Net.Http.Headers;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -6,10 +10,6 @@ using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Net.Http.Headers;
 
 namespace IRaCIS.Core.API.Utility
 {

IRaCIS.Core.API/Utility/Jwt/CustomHSJWTService.cs

@@ -1,12 +1,9 @@
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using System;
-using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
 using System.Security.Claims;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt
 {

IRaCIS.Core.API/Utility/Jwt/CustomRSSJWTervice.cs

@@ -1,13 +1,10 @@
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using System;
-using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.IO;
-using System.Linq;
 using System.Security.Claims;
 using System.Security.Cryptography;
-using System.Threading.Tasks;
 
 namespace ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt
 {

IRaCIS.Core.API/Utility/Jwt/ICustomJWTService.cs

@@ -1,9 +1,4 @@
-using System;
+namespace ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt
 {
     public interface ICustomJWTService
     {

IRaCIS.Core.API/Utility/Jwt/JWTTokenOptions.cs

@@ -1,9 +1,4 @@
-using System;
+namespace ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt
 {
     public class JWTTokenOptions
     {

IRaCIS.Core.API/Utility/Jwt/RSAHelper.cs

@@ -1,10 +1,6 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Threading.Tasks;
 
 namespace ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt
 {

IRaCIS.Core.API/Utility/MultipartRequestHelper.cs

@@ -1,6 +1,6 @@
+using Microsoft.Net.Http.Headers;
 using System;
 using System.IO;
-using Microsoft.Net.Http.Headers;
 
 namespace IRaCIS.Core.API.Utility
 {

IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs

@@ -1,9 +1,6 @@
 using Hangfire;
 using Hangfire.Dashboard;
 using Hangfire.Dashboard.BasicAuthorization;
-using IRaCIS.Core.Application.Service.BackGroundJob;
-using IRaCIS.Core.API.Filter;
-using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 
@@ -39,7 +36,7 @@ namespace IRaCIS.Core.API
                       })
                 },
 
-                DashboardTitle ="后台任务管理",
+                DashboardTitle = "后台任务管理",
 
 
                 //Authorization = new BasicAuthAuthorizationFilter[] {

IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs

@@ -1,21 +1,12 @@
-using Azure;
+using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileProviders.Physical;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Hosting.Internal;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.VisualBasic;
 using Newtonsoft.Json;
-using SharpCompress.Common;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -110,7 +101,7 @@ namespace IRaCIS.Core.API
                 .Where(d => d.IsReady && d.DriveType == DriveType.Fixed)/*.Where(t => !t.Name.Contains("C") && !t.Name.Contains("c"))*/
                 .OrderBy(d => d.AvailableFreeSpace)
                 .Select(d => d.RootDirectory.FullName)
-                .ToArray().Where(t=>!t.Contains(defaultRoot));
+                .ToArray().Where(t => !t.Contains(defaultRoot));
 
 
                 foreach (var item in disks)
@@ -122,7 +113,7 @@ namespace IRaCIS.Core.API
                         continue;
                     }
 
-                    var otherFileProvider= new PhysicalFileProvider(otherFileStoreFolder);
+                    var otherFileProvider = new PhysicalFileProvider(otherFileStoreFolder);
 
 
 
@@ -132,7 +123,7 @@ namespace IRaCIS.Core.API
                         var actrualPath = otherFileProvider.GetFileInfo(path).PhysicalPath;
 
                         //方式一
-                        await context.Response.SendFileAsync( new PhysicalFileInfo(new FileInfo(actrualPath)));
+                        await context.Response.SendFileAsync(new PhysicalFileInfo(new FileInfo(actrualPath)));
 
                         #region 方式二  报错  otherFileProvider 应该还包含/{StaticData.Folder.IRaCISDataFolder} 这一层级
                         //var otherStaticFileOptions = new StaticFileOptions

IRaCIS.Core.API/_PipelineExtensions/LocalizationConfig.cs

@@ -1,6 +1,5 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Localization;
 using System.Collections.Generic;
 using System.Globalization;
 

IRaCIS.Core.API/_PipelineExtensions/Serilog/RequestResponseLoggingMiddleware.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Http;
-using Serilog;
 using Serilog.Context;
 using System;
 using System.IO;

IRaCIS.Core.API/_PipelineExtensions/Serilog/SerilogConfig.cs

@@ -1,6 +1,4 @@
-using Hangfire;
+using IRaCIS.Core.API._PipelineExtensions.Serilog;
-using Hangfire.Dashboard;
-using IRaCIS.Core.API._PipelineExtensions.Serilog;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Serilog;

IRaCIS.Core.API/_PipelineExtensions/Serilog/SerilogHelper.cs

@@ -1,11 +1,6 @@
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Http;
 using Serilog;
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.API
 {

IRaCIS.Core.API/_ServiceExtensions/Authorization/ApiResponseHandler.cs

@@ -39,7 +39,7 @@ namespace IRaCIS.Core.API
             Response.ContentType = "application/json";
             Response.StatusCode = StatusCodes.Status403Forbidden;
             //---您的权限不允许进行该操作
-            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["ApiResponse_Permission"],ApiResponseCodeEnum.HaveTokenNotAccess)));
+            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["ApiResponse_Permission"], ApiResponseCodeEnum.HaveTokenNotAccess)));
         }
 
     }

IRaCIS.Core.API/_ServiceExtensions/Authorization/AuthorizationPolicySetup.cs

@@ -54,7 +54,7 @@ namespace IRaCIS.Core.API
 
                 options.AddPolicy(IRaCISPolicy.PM_APM_CRC_QC, policyBuilder =>
                 {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(),((int)UserTypeEnum.ClinicalResearchCoordinator).ToString(), ((int)UserTypeEnum.APM).ToString(), ((int)UserTypeEnum.IQC).ToString());
+                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.ClinicalResearchCoordinator).ToString(), ((int)UserTypeEnum.APM).ToString(), ((int)UserTypeEnum.IQC).ToString());
                 });
 
                 options.AddPolicy(IRaCISPolicy.SPM_CPM, policyBuilder =>
@@ -64,7 +64,7 @@ namespace IRaCIS.Core.API
 
                 options.AddPolicy(IRaCISPolicy.PM_APM_SPM_CPM, policyBuilder =>
                 {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.APM).ToString(),((int)UserTypeEnum.SPM).ToString(), ((int)UserTypeEnum.CPM).ToString());
+                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.APM).ToString(), ((int)UserTypeEnum.SPM).ToString(), ((int)UserTypeEnum.CPM).ToString());
                 });
 
                 options.AddPolicy(IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM, policyBuilder =>

IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs

@@ -61,7 +61,7 @@ namespace IRaCIS.Core.API
 
                            //仅仅是访问文件的时候才会去取token认证  前端对cookie设置了有效期
 
-                           if (context.Request.Path.ToString().Contains("IRaCISData") || context.Request.Path.ToString().Contains("SystemData") )
+                           if (context.Request.Path.ToString().Contains("IRaCISData") || context.Request.Path.ToString().Contains("SystemData"))
                            {
                                var cookieToken = context.Request.Cookies["access_token"];
 

IRaCIS.Core.API/_ServiceExtensions/AutofacModuleSetup.cs

@@ -1,68 +0,0 @@
-using Autofac;
-using IRaCIS.Core.Application;
-using IRaCIS.Core.Application.BackGroundJob;
-using IRaCIS.Core.Infra.EFCore;
-using Microsoft.AspNetCore.Http;
-using Panda.DynamicWebApi;
-using System;
-using System.Linq;
-using System.Reflection;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Service;
-using IRaCIS.Application.Interfaces;
-using AutoMapper;
-
-namespace IRaCIS.Core.API
-{
-    // ReSharper disable once IdentifierTypo
-    public class AutofacModuleSetup : Autofac.Module
-    {
-        protected override void Load(ContainerBuilder containerBuilder)
-        {
-
-            #region  byzhouhang  20210917  此处注册泛型仓储 可以减少Domain层 和Infra.EFcore 两层 空的仓储接口定义和 仓储文件定义
-
-            containerBuilder.RegisterGeneric(typeof(Repository<>))
-                .As(typeof(IRepository<>)).InstancePerLifetimeScope();//注册泛型仓储
-
-            containerBuilder.RegisterType<Repository>().As<IRepository>().InstancePerLifetimeScope();
-
-
-            #endregion
-
-            #region 指定控制器也由autofac 来进行实例获取 https://www.cnblogs.com/xwhqwer/p/15320838.html
-
-            //获取所有控制器类型并使用属性注入
-            containerBuilder.RegisterAssemblyTypes(typeof(BaseService).Assembly)
-                .Where(type => typeof(IDynamicWebApi).IsAssignableFrom(type))
-                .PropertiesAutowired();
-
-
-
-            #endregion
-
-
-
-
-
-
-            Assembly application = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "IRaCIS.Core.Application.dll");
-            containerBuilder.RegisterAssemblyTypes(application).Where(t => t.FullName.Contains("Service"))
-                .PropertiesAutowired().AsImplementedInterfaces();
-
-
-
-            //containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
-            //containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
-
-
-           //注册hangfire任务  依赖注入
-            containerBuilder.RegisterType<ObtainTaskAutoCancelJob>().As<IObtainTaskAutoCancelJob>().InstancePerDependency();
-
-
-
-
-        }
-    }
-}

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -1,5 +1,4 @@
 using EntityFramework.Exceptions.SqlServer;
-using Hangfire.SqlServer;
 using IRaCIS.Core.Application.Triggers;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
@@ -12,14 +11,12 @@ using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using StackExchange.Redis;
 
 namespace IRaCIS.Core.API
 {
     public static class EFSetup
     {
-        public static void AddEFSetup( this IServiceCollection services, IConfiguration configuration,string envName)
+        public static void AddEFSetup(this IServiceCollection services, IConfiguration configuration, string envName)
         {
 
             services.AddHttpContextAccessor();
@@ -39,7 +36,7 @@ namespace IRaCIS.Core.API
                 //public static readonly ILoggerFactory MyLoggerFactory    = LoggerFactory.Create(builder => { builder.AddConsole(); });
                 var logFactory = LoggerFactory.Create(builder => { builder.AddDebug(); });
 
-                var dbType = configuration.GetSection("ConnectionStrings:Db_Type").Value ;
+                var dbType = configuration.GetSection("ConnectionStrings:Db_Type").Value;
                 if (!string.IsNullOrWhiteSpace(dbType) && dbType == "pgsql")
                 {
                     options.UseNpgsql(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());

IRaCIS.Core.API/_ServiceExtensions/IpPolicyRateLimitSetup.cs

@@ -1,8 +1,6 @@
 using AspNetCoreRateLimit;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace IRaCIS.Core.API
 {

IRaCIS.Core.API/_ServiceExtensions/JsonConfigSetup.cs

@@ -1,17 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace IRaCIS.Core.API
-{
-    public  static class JsonConfigSetup
-    {
-        public static void AddJsonConfigSetup(this IServiceCollection services, IConfiguration configuration)
-        {
-
-            services.Configure<ServiceVerifyConfigOption>(configuration.GetSection("BasicSystemConfig"));
-
-
-        }
-    }
-}

IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs

@@ -1,6 +1,5 @@
 
 using LogDashboard;
-using LogDashboard.Authorization.Filters;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace IRaCIS.Core.API

IRaCIS.Core.API/_ServiceExtensions/MassTransitSetup.cs

@@ -0,0 +1,66 @@
+using IRaCIS.Core.Application.MassTransit.Consumer;
+using IRaCIS.Core.Domain.BaseModel;
+using MassTransit;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace IRaCIS.Core.API
+{
+    public static class MassTransitSetup
+    {
+        public static void AddMassTransitSetup(this IServiceCollection services)
+        {
+
+
+            #region MassTransit
+            //masstransit组件 也支持MediatR 中介者模式，但是支持分布式，考虑后续，所以在次替代MediatR
+            //参考链接：https://masstransit.io/documentation/concepts/mediator#scoped-mediator
+            services.AddMediator(cfg =>
+            {
+                cfg.AddConsumers(typeof(UserSiteSurveySubmitedEventConsumer).Assembly);
+
+                //cfg.AddConsumer<ConsistencyCheckConsumer>();
+                //cfg.AddConsumer<AddSubjectTriggerConsumer>();
+                //cfg.AddConsumer<AddSubjectTriggerConsumer2>();
+                //cfg.ConfigureMediator((context, cfg) => cfg.UseHttpContextScopeFilter(context));
+            });
+
+            //添加 MassTransit 和 InMemory 传输
+            services.AddMassTransit(cfg =>
+            {
+                // 自动扫描程序集中的消费者并进行注册
+                cfg.AddConsumers(typeof(UserSiteSurveySubmitedEventConsumer).Assembly);
+
+                //// 注册消费者
+                //cfg.AddConsumer<AddSubjectTriggerConsumer>(); // 替换为你的消费者类
+                //cfg.AddConsumer<AddSubjectTriggerConsumer2>();
+
+                cfg.AddPublishMessageScheduler();
+                //cfg.AddHangfireConsumers();
+
+
+
+                // 使用 InMemory 作为消息传递机制
+                cfg.UsingInMemory((context, cfg) =>
+                {
+                    //https://github.com/MassTransit/Sample-Hangfire/blob/master/src/Sample.Hangfire.Console/Program.cs
+                    cfg.UsePublishMessageScheduler();
+
+                    //使用 Hangfire 进行消息调度
+                    cfg.UseHangfireScheduler();
+
+                    cfg.UseConsumeFilter(typeof(CultureInfoFilter<>), context,
+                          x => x.Include(type => type.IsAssignableTo(typeof(DomainEvent))));
+
+
+                    // 这里可以进行额外的配置
+                    cfg.ConfigureEndpoints(context); // 自动配置所有消费者的端点
+
+                });
+            });
+
+            #endregion
+
+
+        }
+    }
+}

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/JSONTimeZoneConverter.cs

@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using StackExchange.Redis;
 using System;
 using System.Globalization;
 
@@ -59,7 +58,7 @@ namespace IRaCIS.Core.API
 
 
             // 仅支持 DateTime 类型的转换
-            return objectType == typeof(DateTime)|| objectType == typeof(DateTime?);
+            return objectType == typeof(DateTime) || objectType == typeof(DateTime?);
 
         }
 

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/MyDateTimeConverter.cs

@@ -1,10 +1,7 @@
 using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using System;
 using System.Globalization;
-using System.Reflection;
 
 namespace IRaCIS.Core.API
 {

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs

@@ -1,16 +1,9 @@
 
 using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System;
-using System.Globalization;
-using System.Text.Json;
-using Newtonsoft.Json.Serialization;
 
 namespace IRaCIS.Core.API
 {

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NullToEmptyStringResolver.cs

@@ -35,7 +35,7 @@ namespace IRaCIS.Core.API
             // 检查类是否有 LowerCamelCaseJsonAttribute 标记  有的话，属性名小写
             if (type.GetCustomAttribute<LowerCamelCaseJsonAttribute>() != null)
             {
-                base.NamingStrategy= new LowerCamelCaseNamingStrategy();
+                base.NamingStrategy = new LowerCamelCaseNamingStrategy();
             }
             else
             {
@@ -46,7 +46,7 @@ namespace IRaCIS.Core.API
             IList<JsonProperty> properties = base.CreateProperties(type, memberSerialization);
 
 
-            var list= type.GetProperties()
+            var list = type.GetProperties()
                 .Select(p =>
                 {
                     var jp = base.CreateProperty(p, memberSerialization);

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NullToEmptyStringValueProvider.cs

@@ -1,6 +1,6 @@
-using System;
+using Newtonsoft.Json.Serialization;
+using System;
 using System.Reflection;
-using Newtonsoft.Json.Serialization;
 
 namespace IRaCIS.Core.API
 {
@@ -25,10 +25,10 @@ namespace IRaCIS.Core.API
         public void SetValue(object target, object value)
         {
 
-            if(_MemberInfo.PropertyType == typeof(string))
+            if (_MemberInfo.PropertyType == typeof(string))
             {
                 //去掉前后空格
-                _MemberInfo.SetValue(target, value==null?string.Empty: value.ToString()==string.Empty? value:value/*.ToString().Trim()*/);
+                _MemberInfo.SetValue(target, value == null ? string.Empty : value.ToString() == string.Empty ? value : value/*.ToString().Trim()*/);
 
             }
             else

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/ObjectStorePathConvert.cs

@@ -1,8 +1,5 @@
 using IRaCIS.Core.Application.Helper;
-using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -14,7 +11,7 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
         private readonly IOSSService _oSSService;
 
         // 构造函数
-        public ObjectStorePathConvert( IOSSService oSSService)
+        public ObjectStorePathConvert(IOSSService oSSService)
         {
             _oSSService = oSSService;
         }
@@ -41,9 +38,9 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
 
                 Regex guidRegex = new Regex(@"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
 
-                if (propertyName.IndexOf("Path") > -1 && value.IndexOf('.')>-1 && guidRegex.IsMatch(value))
+                if (propertyName.IndexOf("Path") > -1 && value.IndexOf('.') > -1 && guidRegex.IsMatch(value))
                 {
-                    var tt= _oSSService.GetSignedUrl(value);
+                    var tt = _oSSService.GetSignedUrl(value);
                     writer.WriteValue(tt);
                 }
                 else

IRaCIS.Core.API/_ServiceExtensions/Serilog/HttpContextEnricher.cs

@@ -1,14 +1,11 @@
-using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Serilog.Core;
 using Serilog.Events;
 using System;
 using System.IO;
-using System.Text;
 using System.Threading.Tasks;
-using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.API
 {
@@ -73,7 +70,7 @@ namespace IRaCIS.Core.API
 
             // Reset the request's body stream position for next middleware in the pipeline.
             request.Body.Position = 0;
-            return requestBody==null?String.Empty: requestBody.Trim();
+            return requestBody == null ? String.Empty : requestBody.Trim();
         }
 
         private async Task<string> ReadResponseBody(HttpResponse response)

IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs

@@ -1,9 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using Serilog;
-using Serilog;
 using Serilog.Events;
 //using Serilog.Sinks.Email;
 using System;
-using System.Net;
 
 namespace IRaCIS.Core.API
 {
@@ -22,7 +20,7 @@ namespace IRaCIS.Core.API
                    .MinimumLevel.Override("System.Net.Http.HttpClient.HttpReports", LogEventLevel.Warning)
                    .Enrich.WithClientIp()
                    .Enrich.FromLogContext()
-                   .Filter.ByExcluding(logEvent =>logEvent.Properties.ContainsKey("RequestPath") && logEvent.Properties["RequestPath"].ToString().Contains("/health"))
+                   .Filter.ByExcluding(logEvent => logEvent.Properties.ContainsKey("RequestPath") && logEvent.Properties["RequestPath"].ToString().Contains("/health"))
 
                    //控制台 方便调试 问题   我们显示记录日志 时 获取上下文的ip 和用户名 用户类型
                    .WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Warning,

IRaCIS.Core.API/_ServiceExtensions/ServiceCollectionSetup.cs

@@ -0,0 +1,139 @@
+using Autofac;
+using IP2Region.Net.Abstractions;
+using IP2Region.Net.XDB;
+using IRaCIS.Core.Application.BackGroundJob;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Application.Service.BackGroundJob;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Panda.DynamicWebApi;
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace IRaCIS.Core.API;
+
+
+public static class ServiceCollectionSetup
+{
+    public static void ConfigureServices(this IServiceCollection services, IConfiguration _configuration)
+    {
+        services.AddOptions().Configure<SystemEmailSendConfig>(_configuration.GetSection("SystemEmailSendConfig"));
+        services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
+        services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
+        services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
+        services.AddOptions().Configure<IRCEncreptOption>(_configuration.GetSection("EncrypteResponseConfig"));
+        services.AddOptions().Configure<SystemPacsConfig>(_configuration.GetSection("SystemPacsConfig"));
+        services.Configure<IRaCISBasicConfigOption>(_configuration.GetSection("IRaCISBasicConfig"));
+
+        services.Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
+
+        //转发头设置  获取真实IP 
+        services.Configure<ForwardedHeadersOptions>(options =>
+        {
+            options.ForwardedHeaders =
+                ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+        });
+
+        services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
+        services.AddSingleton<ISearcher>(new Searcher(CachePolicy.Content, Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "ip2region.xdb")));
+
+
+
+
+        services.AddScoped(typeof(IRepository<>), typeof(Repository<>));
+        services.AddScoped<IRepository, Repository>();
+
+        services.AddScoped<IObtainTaskAutoCancelJob, ObtainTaskAutoCancelJob>();
+        services.AddScoped<IIRaCISHangfireJob, IRaCISCHangfireJob>();
+
+        // 注册以Service 结尾的服务
+        services.Scan(scan => scan
+            .FromAssemblies(typeof(BaseService).Assembly)
+            .AddClasses(classes => classes.Where(t => t.Name.Contains("Service")))
+            .AsImplementedInterfaces()
+            .WithScopedLifetime());
+
+        #region Register Controllers
+
+        // Register all controllers in the assembly that implement IDynamicWebApi
+        services.Scan(scan => scan
+            .FromAssemblies(typeof(BaseService).Assembly)
+            .AddClasses(classes => classes.AssignableTo<IDynamicWebApi>())
+            .AsSelf()
+            .WithScopedLifetime());
+
+        #endregion
+
+
+        // MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
+        //builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
+
+
+
+        #region  历史废弃配置
+        //builder.Services.AddMemoryCache();
+        ////上传限制 配置
+        //builder.Services.Configure<FormOptions>(options =>
+        //{
+        //    options.MultipartBodyLengthLimit = int.MaxValue;
+        //    options.ValueCountLimit = int.MaxValue;
+        //    options.ValueLengthLimit = int.MaxValue;
+        //});
+        //IP 限流 可设置白名单 或者黑名单
+        //services.AddIpPolicyRateLimitSetup(_configuration);
+        // 用户类型 策略授权
+        //services.AddAuthorizationPolicySetup(_configuration);
+        #endregion
+    }
+
+
+}
+
+#region Autofac 废弃
+public class AutofacModuleSetup : Autofac.Module
+{
+    protected override void Load(ContainerBuilder containerBuilder)
+    {
+
+        #region  byzhouhang  20210917  此处注册泛型仓储 可以减少Domain层 和Infra.EFcore 两层 空的仓储接口定义和 仓储文件定义
+
+        containerBuilder.RegisterGeneric(typeof(Repository<>))
+            .As(typeof(IRepository<>)).InstancePerLifetimeScope();//注册泛型仓储
+
+        containerBuilder.RegisterType<Repository>().As<IRepository>().InstancePerLifetimeScope();
+
+
+        #endregion
+
+        #region 指定控制器也由autofac 来进行实例获取 https://www.cnblogs.com/xwhqwer/p/15320838.html
+
+        //获取所有控制器类型并使用属性注入
+        containerBuilder.RegisterAssemblyTypes(typeof(BaseService).Assembly)
+            .Where(type => typeof(IDynamicWebApi).IsAssignableFrom(type))
+            .PropertiesAutowired();
+
+        #endregion
+
+
+        Assembly application = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "IRaCIS.Core.Application.dll");
+        containerBuilder.RegisterAssemblyTypes(application).Where(t => t.FullName.Contains("Service"))
+            .PropertiesAutowired().AsImplementedInterfaces();
+
+        //containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
+        //containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
+
+
+        //注册hangfire任务  依赖注入
+        containerBuilder.RegisterType<ObtainTaskAutoCancelJob>().As<IObtainTaskAutoCancelJob>().InstancePerDependency();
+
+    }
+}
+#endregion

IRaCIS.Core.API/_ServiceExtensions/Swagger/SwaggerSetup.cs

@@ -1,5 +1,4 @@
-using IRaCIS.Core.Application.Contracts;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -24,7 +23,7 @@ namespace IRaCIS.Core.API
                 //此处的Name 是控制器上分组的名称     Title是界面的大标题
                 //分组
 
-                options.SwaggerDoc("Reviewer", new OpenApiInfo {Title = "医生模块",Version = "Reviewer", });
+                options.SwaggerDoc("Reviewer", new OpenApiInfo { Title = "医生模块", Version = "Reviewer", });
                 options.SwaggerDoc("Trial", new OpenApiInfo { Title = "项目模块", Version = "Trial" });
                 options.SwaggerDoc("Enroll", new OpenApiInfo { Title = "入组模块", Version = "Enroll" });
                 options.SwaggerDoc("Workload", new OpenApiInfo { Title = "工作量模块", Version = "Workload" });