修改审核时间修改

CRC 上传导表
质控增加字段
2024-08-02 15:41:29 +08:00 · 2024-08-02 11:48:09 +08:00 · 2024-08-02 11:29:41 +08:00 · 2024-08-01 17:22:10 +08:00 · 2024-08-01 17:06:17 +08:00 · 2024-07-31 14:34:30 +08:00
803 changed files with 44880 additions and 116498 deletions
@@ -1,4 +0,0 @@
-FROM registry.cn-shanghai.aliyuncs.com/extimaging/aspnetcore:v8.2
-WORKDIR /app 
-COPY publish . 
-ENTRYPOINT ["dotnet", "IRaCIS.Core.API.dll"]
@@ -1,37 +0,0 @@
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Localization;
-using Newtonsoft.Json;
-
-
-namespace IRaCIS.Core.SCP.Filter
-{
-
-
-    public class ModelActionFilter : ActionFilterAttribute, IActionFilter
-    {
-		public IStringLocalizer _localizer;
-		public ModelActionFilter(IStringLocalizer localizer)
-        {
-			_localizer = localizer;
-		}
-
-		public override void OnActionExecuting(ActionExecutingContext context)
-		{
-            if (!context.ModelState.IsValid)
-            {
-
-                var validationErrors = context.ModelState
-                                              .Keys
-                                              .SelectMany(k => context.ModelState[k]!.Errors)
-                                              .Select(e => e.ErrorMessage)
-                                              .ToArray();
-     
-                //---提供给接口的参数无效。
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ModelAction_InvalidAPIParameter"] + JsonConvert.SerializeObject( validationErrors)));
-            }
-        }
-    }
-
-}
@@ -1,28 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace IRaCIS.Core.SCP.Filter
-{
-    #region snippet_DisableFormValueModelBindingAttribute
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-    public class DisableFormValueModelBindingAttribute : Attribute, IResourceFilter
-    {
-        public void OnResourceExecuting(ResourceExecutingContext context)
-        {
-
-
-            var factories = context.ValueProviderFactories;
-            //factories.RemoveType<FormValueProviderFactory>();
-            factories.RemoveType<FormFileValueProviderFactory>();
-            factories.RemoveType<JQueryFormValueProviderFactory>();
-            context.HttpContext.Request.EnableBuffering();
-        }
-
-        public void OnResourceExecuted(ResourceExecutedContext context)
-        {
-        }
-    }
-    #endregion
-}
@@ -1,61 +0,0 @@
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
-
-namespace IRaCIS.Core.SCP.Filter
-{
-    public class ProjectExceptionFilter : Attribute, IExceptionFilter
-    {
-        private readonly ILogger<ProjectExceptionFilter> _logger;
-
-		public IStringLocalizer _localizer;
-
-		public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
-        {
-            _logger = logger;
-			_localizer = localizer;
-		}
-        public void OnException(ExceptionContext context)
-        {
-            //context.ExceptionHandled;//记录当前这个异常是否已经被处理过了
-
-            if (!context.ExceptionHandled)
-            {
-                if (context.Exception.GetType().Name == "DbUpdateConcurrencyException")
-                {
-                //---并发更新，当前不允许该操作
-                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ProjectException_ConcurrentUpdateNotAllowed"] + context.Exception.Message));
-                }
-
-                if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
-                {
-					var error = context.Exception as BusinessValidationFailedException;
-
-					context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, error!.Code));
-				}
-                else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
-                {
-                    context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message, ApiResponseCodeEnum.DataNotExist));
-                }
-                else
-                {
-                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["Project_ExceptionContactDeveloper"] + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/)
-                        : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)), ApiResponseCodeEnum.ProgramException));
-                }
-
-
-                _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message + context.Exception.StackTrace) : (context.Exception.InnerException?.Message + context.Exception.InnerException?.StackTrace));
-
-
-            }
-            else
-            {
-                //继续
-            }
-            context.ExceptionHandled = true;//标记当前异常已经被处理过了
-        }
-    }
-}
@@ -1,120 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Core.Application.Service.BusinessFilter
-{
-    /// <summary>
-    ///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
-    /// by zhouhang 2021.09.12 周末
-    /// </summary>
-    public class UnifiedApiResultFilter : Attribute, IAsyncResultFilter  
-    {             
-        /// <summary>
-        /// 异步版本
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="next"></param>
-        /// <returns></returns>
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
-        {
-
-            if (context.Result is ObjectResult objectResult)
-            {
-                var statusCode = objectResult.StatusCode ?? context.HttpContext.Response.StatusCode;
-
-                //是200 并且没有包装  那么包装结果
-                if (statusCode == 200 && !(objectResult.Value is IResponseOutput))
-                {
-                    //if (objectResult.Value == null)
-                    //{
-                    //    var apiResponse = ResponseOutput.DBNotExist();
-
-                    //    objectResult.Value = apiResponse;
-                    //    objectResult.DeclaredType = apiResponse.GetType();
-                    //}
-                    //else
-                    //{
-
-                    var type = objectResult.Value?.GetType();
-
-
-                    if (  type!=null&& type.IsGenericType&&(type.GetGenericTypeDefinition()==typeof(ValueTuple<,>)|| type.GetGenericTypeDefinition()==typeof(Tuple<,>)))
-                    {
-
-                        //报错
-                        //var tuple = (object, object))objectResult.Value;
-
-                        //var (val1, val2) = ((dynamic, dynamic))objectResult.Value;
-                        //var apiResponse = ResponseOutput.Ok(val1, val2);
-
-                        //OK
-                        var tuple = (dynamic)objectResult.Value;
-                        var apiResponse = ResponseOutput.Ok(tuple.Item1, tuple.Item2);
-
-
-                        objectResult.Value = apiResponse;
-                        objectResult.DeclaredType = apiResponse.GetType();
-                    }
-                    else
-                    {
-                        var apiResponse = ResponseOutput.Ok(objectResult.Value);
-
-                        objectResult.Value = apiResponse;
-                        objectResult.DeclaredType = apiResponse.GetType();
-                    }
-
-                      
-                    //}
-                   
-                }
-                //如果不是200  是IResponseOutput  不处理
-                else if (statusCode != 200 && (objectResult.Value is IResponseOutput))
-                {
-                }
-
-                else if(statusCode != 200&&!(objectResult.Value is IResponseOutput))
-                {
-                //---程序错误，请联系开发人员。
-                    var apiResponse = ResponseOutput.NotOk(StaticData.International("UnifiedAPI_ProgramError"));
-
-                    objectResult.Value = apiResponse;
-                    objectResult.DeclaredType = apiResponse.GetType();
-                }
-
-            }
-
-            await next.Invoke();
-
-        }
-
-        public static bool IsTupleType(Type type, bool checkBaseTypes = false)
-        {
-            if (type == null)
-                throw new ArgumentNullException(nameof(type));
-
-            if (type == typeof(Tuple))
-                return true;
-
-            while (type != null)
-            {
-                if (type.IsGenericType)
-                {
-                    var genType = type.GetGenericTypeDefinition();
-                    if (genType == typeof(Tuple<>)
-                        || genType == typeof(Tuple<,>)
-                        || genType == typeof(Tuple<,>))
-                        return true;
-                }
-
-                if (!checkBaseTypes)
-                    break;
-
-                type = type.BaseType;
-            }
-
-            return false;
-        }
-    }
-}
@@ -1,62 +0,0 @@
-
-using FellowOakDicom.Imaging;
-using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace IRaCIS.Core.Application.Helper;
-
-public static class ImageHelper
-{
-
-    // 采用ImageSharp组件  跨平台，不依赖windows 平台图像处理组件，这里大坑(net 6 下，之前由于Dicom处理最新组件 依赖了这个库的一个旧版本，导致缩略图bug，单独升级依赖组件才解决)
-    public static void ResizeSave(string filePath, string? fileStorePath)
-    {
-
-        fileStorePath = fileStorePath ?? filePath + ".preview.jpeg";
-
-        using (var image = SixLabors.ImageSharp.Image.Load(filePath))
-        {
-
-            image.Mutate(x => x.Resize(500, 500));
-
-            image.Save(fileStorePath);
-
-        }
-    }
-
-
-
-    public static Stream RenderPreviewJpeg(string filePath)
-    {
-        string jpegPath = filePath + ".preview.jpg";
-
-        if (!File.Exists(jpegPath))
-        {
-            using (Stream stream = new FileStream(jpegPath, FileMode.Create))
-            {
-                DicomImage image = new DicomImage(filePath);
-
-                var sharpimage = image.RenderImage().AsSharpImage();
-
-                sharpimage.Save(stream, new JpegEncoder());
-
-            }
-        }
-
-        return new FileStream(jpegPath, FileMode.Open);
-    }
-
-    public static void RemovePreviewJpeg(string filePath)
-    {
-        string jpegPath = filePath + ".preview.jpg";
-        if (File.Exists(jpegPath)) File.Delete(jpegPath);
-    }
-
-
-}
-
-
-
@@ -1,57 +0,0 @@
-using Autofac;
-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 AutoMapper;
-using IRaCIS.Core.SCP.Service;
-
-namespace IRaCIS.Core.SCP
-{
-    // 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 + typeof(BaseService).Assembly.GetName().Name+".dll");
-            containerBuilder.RegisterAssemblyTypes(application).Where(t => t.FullName.Contains("Service"))
-                .PropertiesAutowired().AsImplementedInterfaces();
-
-
-            //containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
-            //containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
-
-
-
-
-
-        }
-    }
-}
@@ -1,64 +0,0 @@
-using EntityFramework.Exceptions.SqlServer;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infra.EFCore;
-using Medallion.Threading;
-using Medallion.Threading.SqlServer;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace IRaCIS.Core.SCP
-{
-    public static class EFSetup
-    {
-        public static void AddEFSetup( this IServiceCollection services, IConfiguration configuration)
-        {
-            services.AddHttpContextAccessor();
-            services.AddScoped<IUserInfo, UserInfo>();
-            services.AddScoped<ISaveChangesInterceptor, AuditEntityInterceptor>();
-
-
-            //这个注入没有成功--注入是没问题的，构造函数也只是支持参数就好，错在注入的地方不能写DbContext
-            //Web程序中通过重用池中DbContext实例可提高高并发场景下的吞吐量， 这在概念上类似于ADO.NET Provider原生的连接池操作方式，具有节省DbContext实例化成本的优点
-            services.AddDbContext<IRaCISDBContext>((sp, options) =>
-            {
-                // 在控制台
-                //public static readonly ILoggerFactory MyLoggerFactory    = LoggerFactory.Create(builder => { builder.AddConsole(); });
-                var logFactory = LoggerFactory.Create(builder => { builder.AddDebug(); });
-
-                options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value,
-                    contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
-
-                options.UseLoggerFactory(logFactory);
-
-                options.UseExceptionProcessor();
-
-                options.EnableSensitiveDataLogging();
-
-                options.AddInterceptors(new QueryWithNoLockDbCommandInterceptor());
-                options.AddInterceptors(sp.GetServices<ISaveChangesInterceptor>());
-
-                options.UseProjectables();
-
-          
-
-            });
-
-            //// Register an additional context factory as a Scoped service, which gets a pooled context from the Singleton factory we registered above,
-            //services.AddScoped<IRaCISDBScopedFactory>();
-
-            //// Finally, arrange for a context to get injected from our Scoped factory:
-            //services.AddScoped(sp => sp.GetRequiredService<IRaCISDBScopedFactory>().CreateDbContext());
-
-            //注意区分 easy caching 也有  IDistributedLockProvider
-            services.AddSingleton<IDistributedLockProvider>(sp =>
-            {
-                //var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
-
-                return new SqlDistributedSynchronizationProvider(configuration.GetSection("ConnectionStrings:RemoteNew").Value);
-            });
-
-        }
-    }
-}
@@ -1,59 +0,0 @@
-
-
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System;
-
-namespace IRaCIS.Core.SCP
-{
-    public static class NewtonsoftJsonSetup
-    {
-        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder, IServiceCollection services)
-        {
-            services.AddHttpContextAccessor();
-            services.AddScoped<IOSSService,OSSService>();
-
-            builder.AddNewtonsoftJson(options =>
-             {
-                 //options.SerializerSettings.PreserveReferencesHandling = PreserveReferencesHandling.Objects;
-                 // 忽略循环引用
-                 options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
-                 //options.SerializerSettings.TypeNameHandling = TypeNameHandling.All;
-
-                 //处理返回给前端  可空类型 给出默认值 比如in? 为null 设置 默认值0
-                 options.SerializerSettings.ContractResolver = new NullToEmptyStringResolver(); //new DefaultContractResolver();// new NullToEmptyStringResolver();
-                                                                                                // 设置时间格式
-                 options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
-
-                 options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
-
-                 //options.SerializerSettings.Converters.Add(new JSONCustomDateConverter()) ;
-
-                 //options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<JSONTimeZoneConverter>());
-
-
-
-             })
-                .AddControllersAsServices()//动态webApi属性注入需要
-               .ConfigureApiBehaviorOptions(o =>
-                {
-                    o.SuppressModelStateInvalidFilter = true; //自己写验证
-                 
-                });
-
-
-            Newtonsoft.Json.JsonSerializerSettings setting = new Newtonsoft.Json.JsonSerializerSettings();
-            JsonConvert.DefaultSettings = new Func<JsonSerializerSettings>(() =>
-            {
-                //日期类型默认格式化处理
-                setting.DateFormatString = "yyyy-MM-dd HH:mm:ss";
-                setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
-
-                return setting;
-            });
-
-
-        }
-    }
-}
@@ -1,36 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace IRaCIS.Core.SCP
-{
-    public class NullToEmptyStringResolver : DefaultContractResolver
-    {
-
-
-        protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
-        {
-            IList<JsonProperty> properties = base.CreateProperties(type, memberSerialization);
-
-            var list= type.GetProperties()
-                .Select(p =>
-                {
-                    var jp = base.CreateProperty(p, memberSerialization);
-                    jp.ValueProvider = new NullToEmptyStringValueProvider(p);
-                    return jp;
-                }).ToList();
-
-            var uu = list.Select(t => t.PropertyName).ToList();
-
-            //获取复杂对象属性
-          properties =   properties.TakeWhile(t => !uu.Contains(t.PropertyName)).ToList();
-
-          list.AddRange(properties);
-          return list;
-        }
-
-
-    }
-}
@@ -1,42 +0,0 @@
-using System;
-using System.Reflection;
-using Newtonsoft.Json.Serialization;
-
-namespace IRaCIS.Core.SCP
-{
-
-    public class NullToEmptyStringValueProvider : IValueProvider
-    {
-        PropertyInfo _MemberInfo;
-        public NullToEmptyStringValueProvider(PropertyInfo memberInfo)
-        {
-            _MemberInfo = memberInfo;
-        }
-        public object GetValue(object target)
-        {
-            object result = _MemberInfo.GetValue(target);
-            if (_MemberInfo.PropertyType == typeof(string) && result == null) result = "";
-            else if (_MemberInfo.PropertyType == typeof(String[]) && result == null) result = new string[] { };
-            //else if (_MemberInfo.PropertyType == typeof(Nullable<Int32>) && result == null) result = 0;
-            else if (_MemberInfo.PropertyType == typeof(Nullable<Decimal>) && result == null) result = 0.00M;
-
-            return result;
-        }
-        public void SetValue(object target, object value)
-        {
-
-            if(_MemberInfo.PropertyType == typeof(string))
-            {
-                //去掉前后空格
-                _MemberInfo.SetValue(target, value==null?string.Empty: value.ToString()==string.Empty? value:value.ToString().Trim());
-              
-            }
-            else
-            {
-                _MemberInfo.SetValue(target, value);
-            }
-          
-        }
-    }
-
-}
@@ -1,39 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
-	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
-	  <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-	  <PackageReference Include="AWSSDK.S3" Version="3.7.402.7" />
-	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.16" />
-	  <PackageReference Include="DistributedLock.Core" Version="1.0.7" />
-	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
-	  <PackageReference Include="fo-dicom" Version="5.1.3" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.14.5" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
-	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
-	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Minio" Version="6.0.3" />
-	  <PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
-		  <TreatAsUsed>true</TreatAsUsed>
-	  </PackageReference>
-	  <PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
-	  <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.1" />
-	  <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-	  <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-	  <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-	  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\IRaCIS.Core.Domain\IRaCIS.Core.Domain.csproj" />
-    <ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,219 +0,0 @@
-
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
-using AutoMapper.EquivalencyExpression;
-using FellowOakDicom;
-using FellowOakDicom.Imaging;
-using FellowOakDicom.Imaging.NativeCodec;
-using FellowOakDicom.Network;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.SCP;
-using IRaCIS.Core.SCP.Filter;
-using IRaCIS.Core.SCP.Service;
-using MassTransit;
-using MassTransit.NewIdProviders;
-using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.Extensions.DependencyInjection;
-using Panda.DynamicWebApi;
-using Serilog;
-using Serilog.Events;
-using System.Runtime.InteropServices;
-
-
-//以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
-var config = new ConfigurationBuilder()
-            .AddEnvironmentVariables()
-            .Build();
-
-var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
-
-var builder = WebApplication.CreateBuilder(new WebApplicationOptions
-{
-    EnvironmentName = enviromentName
-});
-
-#region 兼容windows 服务命令行的方式
-
-int urlsIndex = Array.FindIndex(args, arg => arg != null && arg.StartsWith("--port"));
-
-if (urlsIndex > -1)
-{
-    var port = args[urlsIndex].Substring("--port=".Length);
-    Console.WriteLine(port);
-    builder.WebHost.UseUrls($"http://0.0.0.0:{port}");
-}
-
-#endregion
-
-#region 主机配置
-
-NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
-
-builder.Configuration.AddJsonFile("appsettings.json", false, true)
-                     .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
-builder.Host
-            .UseServiceProviderFactory(new AutofacServiceProviderFactory())
-            .ConfigureContainer<ContainerBuilder>(containerBuilder =>
-            {
-                containerBuilder.RegisterModule<AutofacModuleSetup>();
-            })
-            .UseSerilog();
-#endregion
-
-#region 配置服务
-var _configuration = builder.Configuration;
-
-//健康检查
-builder.Services.AddHealthChecks();
-
-//本地化
-builder.Services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
-
-
-// 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
-builder.Services.AddControllers(options =>
-{
-    options.Filters.Add<ModelActionFilter>();
-    options.Filters.Add<ProjectExceptionFilter>();
-    options.Filters.Add<UnitOfWorkFilter>();
-
-
-})
-    .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
-
-
-builder.Services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
-builder.Services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
-builder.Services.AddOptions().Configure<DicomSCPServiceOption>(_configuration.GetSection("DicomSCPServiceConfig"));
-
-
-//动态WebApi + UnifiedApiResultFilter  省掉控制器代码
-//动态webApi     目前存在的唯一小坑是生成api上服务上的动态代理AOP失效    间接掉用不影响
-builder.Services
-           .AddDynamicWebApi(dynamicWebApiOption =>
-            {
-                //默认是 api
-                dynamicWebApiOption.DefaultApiPrefix = "";
-                //首字母小写
-                dynamicWebApiOption.GetRestFulActionName = (actionName) => char.ToLower(actionName[0]) + actionName.Substring(1);
-                //删除 Service后缀
-                dynamicWebApiOption.RemoveControllerPostfixes.Add("Service");
-
-            });
-
-//AutoMapper
-builder.Services.AddAutoMapper(automapper =>
-{
-
-    automapper.AddCollectionMappers();
-
-
-}, typeof(BaseService).Assembly);
-
-//EF ORM  QueryWithNoLock
-builder.Services.AddEFSetup(_configuration);
-
-builder.Services.AddMediator(cfg =>
-{
-
-});
-
-
-//转发头设置  获取真实IP 
-builder.Services.Configure<ForwardedHeadersOptions>(options =>
-{
-    options.ForwardedHeaders =
-        ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-});
-
-//Dicom影像渲染图片  跨平台
-//builder.Services.AddDicomSetup();
-new DicomSetupBuilder()
-       .RegisterServices(s =>
-            s.AddFellowOakDicom()
-              .AddTranscoderManager<NativeTranscoderManager>()
-              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
-              .AddImageManager<ImageSharpImageManager>())
-       .SkipValidation()
-       .Build();
-
-
-
-#endregion
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-//if (app.Environment.IsDevelopment())
-//{
-app.UseSwagger();
-app.UseSwaggerUI();
-//}
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-#region 日志
-
-//Log.Logger = new LoggerConfiguration()
-//                 .MinimumLevel.Information()
-//                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
-//                 // Filter out ASP.NET Core infrastructre logs that are Information and below  日志太多了 一个请求 记录好几条
-//                 .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
-//                 .MinimumLevel.Override("Hangfire", LogEventLevel.Warning)
-//                 .MinimumLevel.Override("System.Net.Http.HttpClient.HttpReports", LogEventLevel.Warning)
-//                 .Enrich.WithClientIp()
-
-//                 .Enrich.FromLogContext()
-
-//                 //控制台 方便调试 问题   我们显示记录日志 时 获取上下文的ip 和用户名 用户类型
-//                 .WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Warning,
-//                                  outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext:l} || {Message} || {Exception} ||end {NewLine}")
-
-//                 .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day,
-//                                  outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext:l} || {Message} || {Exception} ||end {NewLine}")
-//                 .CreateLogger();
-
-Log.Logger = new LoggerConfiguration()
-     //.MinimumLevel.Information()
-     .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-    .WriteTo.Console()
-    .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day)
-    .CreateLogger();
-
-#endregion
-
-
-#region 运行环境 部署平台
-
-Log.Logger.Warning($"当前环境：{enviromentName}");
-
-if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-{
-    Log.Logger.Warning($"当前部署平台环境：windows");
-}
-else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-{
-    Log.Logger.Warning($"当前部署平台环境：linux");
-}
-else
-{
-    Log.Logger.Warning($"当前部署平台环境：OSX  or FreeBSD");
-}
-
-#endregion
-
-var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
-
-var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services,logger: logger);
-
-
-app.Run();
@@ -1,25 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "Test_IRC_SCP": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:6200",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Test_IRC_SCP"
-      }
-    },
-    "Uat_IRC_SCP": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:6200",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Uat_IRC_SCP"
-      }
-    }
-  }
-}
@@ -1,111 +0,0 @@
-using AutoMapper;
-using IRaCIS.Core.Application.Service.BusinessFilter;
-using IRaCIS.Core.Infra.EFCore;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Localization;
-using Panda.DynamicWebApi;
-using Panda.DynamicWebApi.Attributes;
-using System.Diagnostics.CodeAnalysis;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
-using IRaCIS.Core.Domain.Models;
-
-namespace IRaCIS.Core.SCP.Service
-{
-
-#pragma warning disable CS8618
-
-
-    #region 非泛型版本
-
-    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
-    public class BaseService : IBaseService, IDynamicWebApi
-    {
-        public IMapper _mapper { get; set; }
-
-        public IUserInfo _userInfo { get; set; }
-
-
-        public IStringLocalizer _localizer { get; set; }
-
-        public IWebHostEnvironment _hostEnvironment { get; set; }
-
-
-
-
-        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
-        {
-            return new ResponseOutput<string>()
-            .NotOk($"The query object {typeof(TEntity).Name} does not exist , or was deleted by someone else, or an incorrect parameter query caused", code: ApiResponseCodeEnum.DataNotExist);
-        }
-    }
-
-
-    public interface IBaseService
-    {
-        [MemberNotNull(nameof(_mapper))]
-        public IMapper _mapper { get; set; }
-
-        [MemberNotNull(nameof(_userInfo))]
-        public IUserInfo _userInfo { get; set; }
-
-        [MemberNotNull(nameof(_localizer))]
-        public IStringLocalizer _localizer { get; set; }
-
-        [MemberNotNull(nameof(_hostEnvironment))]
-        public IWebHostEnvironment _hostEnvironment { get; set; }
-
-    }
-    #endregion
-
-
-    #region 泛型版本测试
-
-
-    public interface IBaseServiceTest<T> where T : Entity
-    {
-        [MemberNotNull(nameof(_mapper))]
-        public IMapper _mapper { get; set; }
-
-        [MemberNotNull(nameof(_userInfo))]
-        public IUserInfo _userInfo { get; set; }
-
-
-
-        [MemberNotNull(nameof(_localizer))]
-        public IStringLocalizer _localizer { get; set; }
-
-
-
-    }
-
-
-    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
-    public class BaseServiceTest<T> : IBaseServiceTest<T>, IDynamicWebApi where T : Entity
-    {
-        public IMapper _mapper { get; set; }
-
-        public IUserInfo _userInfo { get; set; }
-
-        public IStringLocalizer _localizer { get; set; }
-
-        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
-        {
-            return new ResponseOutput<string>()
-            .NotOk($"The query object {typeof(TEntity).Name} does not exist , or was deleted by someone else, or an incorrect parameter query caused", code: ApiResponseCodeEnum.DataNotExist);
-        }
-
-
-    }
-
-
-    #endregion
-
-
-
-
-
-
-
-}
@@ -1,377 +0,0 @@
-using FellowOakDicom.Network;
-using FellowOakDicom;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using IRaCIS.Core.SCP.Service;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Infra.EFCore;
-using Medallion.Threading;
-using IRaCIS.Core.Domain.Share;
-using Serilog;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
-using Microsoft.Extensions.Options;
-using System.Data;
-using FellowOakDicom.Imaging;
-using SharpCompress.Common;
-using SixLabors.ImageSharp.Formats.Jpeg;
-using IRaCIS.Core.Infrastructure;
-
-namespace IRaCIS.Core.SCP.Service
-{
-
-    public class DicomSCPServiceOption
-    {
-        public List<string> CalledAEList { get; set; }
-
-        public string ServerPort { get; set; }
-    }
-
-
-
-
-    public class CStoreSCPService : DicomService, IDicomServiceProvider, IDicomCStoreProvider, IDicomCEchoProvider
-    {
-        private IServiceProvider _serviceProvider { get; set; }
-
-        private List<Guid> _SCPStudyIdList { get; set; } = new List<Guid>();
-
-        private SCPImageUpload _upload { get; set; }
-
-        private Guid _trialId { get; set; }
-
-        private Guid _trialSiteId { get; set; }
-
-
-
-        private static readonly DicomTransferSyntax[] _acceptedTransferSyntaxes = new DicomTransferSyntax[]
-        {
-               DicomTransferSyntax.ExplicitVRLittleEndian,
-               DicomTransferSyntax.ExplicitVRBigEndian,
-               DicomTransferSyntax.ImplicitVRLittleEndian
-        };
-
-        private static readonly DicomTransferSyntax[] _acceptedImageTransferSyntaxes = new DicomTransferSyntax[]
-        {
-                // Lossless
-               DicomTransferSyntax.JPEGLSLossless,   //1.2.840.10008.1.2.4.80
-               DicomTransferSyntax.JPEG2000Lossless, //1.2.840.10008.1.2.4.90
-               DicomTransferSyntax.JPEGProcess14SV1, //1.2.840.10008.1.2.4.70
-               DicomTransferSyntax.JPEGProcess14,    //1.2.840.10008.1.2.4.57 JPEG Lossless, Non-Hierarchical (Process 14)
-               DicomTransferSyntax.RLELossless,      //1.2.840.10008.1.2.5
-               // Lossy
-               DicomTransferSyntax.JPEGLSNearLossless,//1.2.840.10008.1.2.4.81"
-               DicomTransferSyntax.JPEG2000Lossy,     //1.2.840.10008.1.2.4.91
-               DicomTransferSyntax.JPEGProcess1,      //1.2.840.10008.1.2.4.50
-               DicomTransferSyntax.JPEGProcess2_4,    //1.2.840.10008.1.2.4.51
-               // Uncompressed
-               DicomTransferSyntax.ExplicitVRLittleEndian, //1.2.840.10008.1.2.1
-               DicomTransferSyntax.ExplicitVRBigEndian,    //1.2.840.10008.1.2.2
-               DicomTransferSyntax.ImplicitVRLittleEndian  //1.2.840.10008.1.2
-        };
-
-
-        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies)
-            : base(stream, fallbackEncoding, log, dependencies)
-        {
-        }
-
-
-
-
-        public Task OnReceiveAssociationRequestAsync(DicomAssociation association)
-        {
-
-            _upload = new SCPImageUpload() { StartTime = DateTime.Now, CallingAE = association.CallingAE, CalledAE = association.CalledAE, CallingAEIP = association.RemoteHost };
-
-
-            Log.Logger.Warning($"接收到来自{association.CallingAE}的连接");
-
-            _serviceProvider = (IServiceProvider)this.UserState;
-
-
-
-            var _trialDicomAERepository = _serviceProvider.GetService<IRepository<TrialDicomAE>>();
-
-
-            var trialDicomAEList = _trialDicomAERepository.Select(t => new { t.CalledAE, t.TrialId }).ToList();
-            var trialCalledAEList = trialDicomAEList.Select(t => t.CalledAE).ToList();
-
-            Log.Logger.Information("当前系统配置：", string.Join('|', trialDicomAEList));
-
-            var findCalledAE = trialDicomAEList.Where(t => t.CalledAE == association.CalledAE).FirstOrDefault();
-
-            var isCanReceiveIamge = false;
-
-            if (findCalledAE != null)
-            {
-                _trialId = findCalledAE.TrialId;
-
-                var _trialSiteDicomAERepository = _serviceProvider.GetService<IRepository<TrialSiteDicomAE>>();
-
-
-                var findTrialSiteAE = _trialSiteDicomAERepository.Where(t => t.CallingAE == association.CallingAE && t.TrialId==_trialId).FirstOrDefault();
-
-                if (findTrialSiteAE != null)
-                {
-                    _trialSiteId = findTrialSiteAE.TrialSiteId;
-
-                    isCanReceiveIamge = true;
-                }
-
-               
-            }
-
-            if (association.CallingAE == "test-callingAE")
-            {
-                isCanReceiveIamge = true;
-            }
-
-            if (!trialCalledAEList.Contains(association.CalledAE) || isCanReceiveIamge == false)
-            {
-
-                Log.Logger.Warning($"拒绝CallingAE:{association.CallingAE}  CalledAE:{association.CalledAE}的连接");
-
-                return SendAssociationRejectAsync(
-                    DicomRejectResult.Permanent,
-                    DicomRejectSource.ServiceUser,
-                    DicomRejectReason.CalledAENotRecognized);
-            }
-
-            foreach (var pc in association.PresentationContexts)
-            {
-                if (pc.AbstractSyntax == DicomUID.Verification)
-                {
-                    pc.AcceptTransferSyntaxes(_acceptedTransferSyntaxes);
-                }
-                else if (pc.AbstractSyntax.StorageCategory != DicomStorageCategory.None)
-                {
-                    pc.AcceptTransferSyntaxes(_acceptedImageTransferSyntaxes);
-                }
-            }
-
-
-
-            return SendAssociationAcceptAsync(association);
-        }
-
-
-        public async Task OnReceiveAssociationReleaseRequestAsync()
-        {
-            await DataMaintenanceAsaync();
-
-            //记录监控
-
-            var _SCPImageUploadRepository = _serviceProvider.GetService<IRepository<SCPImageUpload>>();
-
-            _upload.EndTime = DateTime.Now;
-            _upload.StudyCount = _SCPStudyIdList.Count;
-            _upload.TrialId = _trialId;
-            _upload.TrialSiteId = _trialSiteId;
-
-            await _SCPImageUploadRepository.AddAsync(_upload, true);
-
-
-            var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
-            //将检查设置为传输结束
-            await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
-
-            await _studyRepository.SaveChangesAndClearAllTrackingAsync();
-
-            await SendAssociationReleaseResponseAsync();
-        }
-
-
-        private async Task DataMaintenanceAsaync()
-        {
-            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}传输结束：开始维护数据，处理检查Modality");
-
-
-
-            //处理检查Modality
-            var _dictionaryRepository = _serviceProvider.GetService<IRepository<Dictionary>>();
-            var _seriesRepository = _serviceProvider.GetService<IRepository<SCPSeries>>();
-            var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
-
-            var dicModalityList = _dictionaryRepository.Where(t => t.Code == "Modality").SelectMany(t => t.ChildList.Select(c => c.Value)).ToList();
-            var seriesModalityList = _seriesRepository.Where(t => _SCPStudyIdList.Contains(t.StudyId)).Select(t => new { SCPStudyId = t.StudyId, t.Modality }).ToList();
-
-            foreach (var g in seriesModalityList.GroupBy(t => t.SCPStudyId))
-            {
-                var modality = string.Join('、', g.Select(t => t.Modality).Distinct().ToList());
-
-                //特殊逻辑
-                var modalityForEdit = dicModalityList.Contains(modality) ? modality : String.Empty;
-
-                if (modality == "MR")
-                {
-                    modalityForEdit = "MRI";
-                }
-
-                if (modality == "PT")
-                {
-                    modalityForEdit = "PET";
-                }
-                if (modality == "PT、CT" || modality == "CT、PT")
-                {
-                    modalityForEdit = "PET-CT";
-                }
-
-                await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == g.Key, u => new SCPStudy() { Modalities = modality, ModalityForEdit = modalityForEdit });
-
-            }
-
-            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}维护数据结束");
-        }
-
-        public void OnReceiveAbort(DicomAbortSource source, DicomAbortReason reason)
-        {
-            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}接收中断，中断原因：{source.ToString() + reason.ToString()}");
-            /* nothing to do here */
-        }
-
-
-        public async void OnConnectionClosed(Exception exception)
-        {
-            /* nothing to do here */
-
-            //奇怪的bug  上传的时候，用王捷修改的影像，会关闭，重新连接，导致检查id 丢失，然后状态不一致
-            if (exception == null)
-            {
-                //var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
-                ////将检查设置为传输结束
-                //await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
-
-                //await _studyRepository.SaveChangesAndClearAllTrackingAsync();
-            }
-
-            Log.Logger.Warning($"连接关闭 {exception?.Message} {exception?.InnerException?.Message}");
-        }
-
-
-
-
-        public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request)
-        {
-
-            string studyInstanceUid = request.Dataset.GetString(DicomTag.StudyInstanceUID);
-            string seriesInstanceUid = request.Dataset.GetString(DicomTag.SeriesInstanceUID);
-            string sopInstanceUid = request.Dataset.GetString(DicomTag.SOPInstanceUID);
-
-            //Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString());
-            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString());
-            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, _trialId.ToString());
-
-
-            var ossService = _serviceProvider.GetService<IOSSService>();
-            var dicomArchiveService = _serviceProvider.GetService<IDicomArchiveService>();
-            var _seriesRepository = _serviceProvider.GetService<IRepository<SCPSeries>>();
-
-            var _distributedLockProvider = _serviceProvider.GetService<IDistributedLockProvider>();
-
-            var storeRelativePath = string.Empty;
-            var ossFolderPath = $"{_trialId}/Image/PACS/{_trialSiteId}{studyInstanceUid}";
-
-
-            long fileSize = 0;
-            try
-            {
-
-                using (MemoryStream ms = new MemoryStream())
-                {
-                    await request.File.SaveAsync(ms);
-
-                    //irc 从路径最后一截取Guid
-                    storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false);
-
-                    fileSize = ms.Length;
-                }
-
-                Log.Logger.Information($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} {request.SOPInstanceUID} 上传完成 ");
-
-            }
-            catch (Exception ec)
-            {
-                Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} 上传异常 {ec.Message}");
-            }
-
-
-
-            var @lock = _distributedLockProvider.CreateLock($"{studyInstanceUid}");
-
-            using (await @lock.AcquireAsync())
-            {
-                try
-                {
-                    var scpStudyId = await dicomArchiveService.ArchiveDicomFileAsync(request.Dataset, _trialId, _trialSiteId, storeRelativePath, Association.CallingAE, Association.CalledAE,fileSize);
-
-                    if (!_SCPStudyIdList.Contains(scpStudyId))
-                    {
-                        _SCPStudyIdList.Add(scpStudyId);
-                    }
-
-                    var series = await _seriesRepository.FindAsync(seriesId);
-
-                    //没有缩略图
-                    if (series != null && string.IsNullOrEmpty(series.ImageResizePath))
-                    {
-
-                        // 生成缩略图
-                        using (var memoryStream = new MemoryStream())
-                        {
-                            DicomImage image = new DicomImage(request.Dataset);
-
-                            var sharpimage = image.RenderImage().AsSharpImage();
-                            sharpimage.Save(memoryStream, new JpegEncoder());
-
-                            // 上传缩略图到 OSS
-
-                            var seriesPath = await ossService.UploadToOSSAsync(memoryStream, ossFolderPath, seriesId.ToString() + ".preview.jpg", false);
-
-                            Console.WriteLine(seriesPath + "  Id:  " + seriesId);
-
-                            series.ImageResizePath = seriesPath;
-
-                        }
-                    }
-
-
-                    await _seriesRepository.SaveChangesAsync();
-                }
-                catch (Exception ex)
-                {
-
-                    Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} 传输处理异常：{ex.ToString()}");
-
-                }
-
-            }
-
-
-
-            //监控信息设置
-            _upload.FileCount++;
-            _upload.FileSize = _upload.FileSize + fileSize;
-            return new DicomCStoreResponse(request, DicomStatus.Success);
-        }
-
-
-        public Task OnCStoreRequestExceptionAsync(string tempFileName, Exception e)
-        {
-            // let library handle logging and error response
-            return Task.CompletedTask;
-        }
-
-
-        public Task<DicomCEchoResponse> OnCEchoRequestAsync(DicomCEchoRequest request)
-        {
-            return Task.FromResult(new DicomCEchoResponse(request, DicomStatus.Success));
-        }
-
-    }
-}
@@ -1,356 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using System.Text;
-using Microsoft.AspNetCore.Hosting;
-using IRaCIS.Core.Infrastructure;
-using Medallion.Threading;
-using FellowOakDicom;
-using FellowOakDicom.Imaging.Codec;
-using System.Data;
-using IRaCIS.Core.Domain.Models;
-using FellowOakDicom.Network;
-using IRaCIS.Core.SCP.Service;
-using IRaCIS.Core.Infra.EFCore;
-using MassTransit;
-using System.Runtime.Intrinsics.X86;
-using Serilog.Sinks.File;
-
-namespace IRaCIS.Core.SCP.Service
-{
-    public class DicomArchiveService : BaseService, IDicomArchiveService
-    {
-        private readonly IRepository<SCPPatient> _patientRepository;
-        private readonly IRepository<SCPStudy> _studyRepository;
-        private readonly IRepository<SCPSeries> _seriesRepository;
-        private readonly IRepository<SCPInstance> _instanceRepository;
-        private readonly IRepository<Dictionary> _dictionaryRepository;
-        private readonly IDistributedLockProvider _distributedLockProvider;
-
-
-        private List<Guid> _instanceIdList = new List<Guid>();
-
-        public DicomArchiveService(IRepository<SCPPatient> patientRepository, IRepository<SCPStudy> studyRepository,
-            IRepository<SCPSeries> seriesRepository,
-            IRepository<SCPInstance> instanceRepository,
-            IRepository<Dictionary> dictionaryRepository,
-            IDistributedLockProvider distributedLockProvider)
-        {
-            _distributedLockProvider = distributedLockProvider;
-            _studyRepository = studyRepository;
-            _patientRepository = patientRepository;
-            _seriesRepository = seriesRepository;
-            _instanceRepository = instanceRepository;
-            _dictionaryRepository = dictionaryRepository;
-
-        }
-
-
-
-
-        /// <summary>
-        /// 单个文件接收 归档
-        /// </summary>
-        /// <param name="dataset"></param>
-        /// <returns></returns>
-        /// <exception cref="NotImplementedException"></exception>
-        public async Task<Guid> ArchiveDicomFileAsync(DicomDataset dataset, Guid trialId, Guid trialSiteId, string fileRelativePath, string callingAE, string calledAE,long fileSize)
-        {
-            string studyInstanceUid = dataset.GetString(DicomTag.StudyInstanceUID);
-            string seriesInstanceUid = dataset.GetString(DicomTag.SeriesInstanceUID);
-            string sopInstanceUid = dataset.GetString(DicomTag.SOPInstanceUID);
-
-            string patientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID,string.Empty);
-
-            //Guid patientId= IdentifierHelper.CreateGuid(patientIdStr);
-            Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid,trialId.ToString());
-            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, trialId.ToString());
-            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, trialId.ToString());
-
-            var isStudyNeedAdd = false;
-            var isSeriesNeedAdd = false;
-            var isInstanceNeedAdd = false;
-            var isPatientNeedAdd = false;
-
-            //var @lock = _distributedLockProvider.CreateLock($"{studyInstanceUid}");
-
-            //using (@lock.Acquire())
-            {
-                var findPatient = await _patientRepository.FirstOrDefaultAsync(t => t.PatientIdStr == patientIdStr && t.TrialSiteId==trialSiteId );
-                var findStudy = await _studyRepository.FindAsync(studyId);
-                var findSerice = await _seriesRepository.FindAsync(seriesId);
-                var findInstance = await _instanceRepository.FindAsync(instanceId);
-
-                DateTime? studyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.StudyDate).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.StudyTime).TimeOfDay);
-
-                //先传输了修改了患者编号的，又传输了没有修改患者编号的，导致后传输的没有修改患者编号的下面的检查为0
-                if (findPatient == null && findStudy==null)
-                {
-                    isPatientNeedAdd = true;
-
-
-                    findPatient = new SCPPatient()
-                    {
-                        Id = NewId.NextSequentialGuid(),
-                        TrialId=trialId,
-                        TrialSiteId=trialSiteId,
-                        PatientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
-                        PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
-                        PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty),
-                        PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
-                        PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
-
-                        EarliestStudyTime = studyTime,
-                        LatestStudyTime = studyTime,
-                        LatestPushTime = DateTime.Now,
-                    };
-
-                    if (findPatient.PatientBirthDate.Length == 8)
-                    {
-                        var birthDateStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}-{findPatient.PatientBirthDate[4]}{findPatient.PatientBirthDate[5]}-{findPatient.PatientBirthDate[6]}{findPatient.PatientBirthDate[7]}";
-
-                        var yearStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}";
-
-                        int year = 0;
-
-                        var canParse = int.TryParse(yearStr, out year);
-
-                        if (canParse && year > 1900)
-                        {
-                            findPatient.PatientBirthDate = birthDateStr;
-
-                            DateTime birthDate;
-
-                            if (findPatient.PatientAge == string.Empty && studyTime.HasValue && DateTime.TryParse(findPatient.PatientBirthDate,out birthDate))
-                            {
-                                var patientAge = studyTime.Value.Year - birthDate.Year;
-                                // 如果生日还未到，年龄减去一岁
-                                if (studyTime.Value < birthDate.AddYears(patientAge))
-                                {
-                                    patientAge--;
-                                }
-
-                                findPatient.PatientAge = patientAge.ToString();
-                            }
-
-                        }
-                        else
-                        {
-                            findPatient.PatientBirthDate = string.Empty;
-                        }
-
-                    }
-                }
-                else
-                {
-                    if (studyTime < findPatient.EarliestStudyTime)
-                    {
-                        findPatient.EarliestStudyTime = studyTime;
-                    }
-                    if (studyTime > findPatient.LatestStudyTime)
-                    {
-                        findPatient.LatestStudyTime = studyTime;
-                    }
-
-                    findPatient.LatestPushTime = DateTime.Now;
-                }
-
-                if (findStudy == null)
-                {
-                    isStudyNeedAdd = true;
-                    findStudy = new SCPStudy
-                    {
-                        CalledAE = calledAE,
-                        CallingAE = callingAE,
-
-                        PatientId = findPatient.Id,
-                        Id = studyId,
-                        TrialId = trialId,
-                        TrialSiteId = trialSiteId,
-                        StudyInstanceUid = studyInstanceUid,
-                        StudyTime = studyTime,
-                        Modalities = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
-                        //ModalityForEdit = modalityForEdit,
-                        Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
-                        InstitutionName = dataset.GetSingleValueOrDefault(DicomTag.InstitutionName, string.Empty),
-                        PatientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
-                        PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
-                        PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty),
-                        PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
-                        BodyPartExamined = dataset.GetSingleValueOrDefault(DicomTag.BodyPartExamined, string.Empty),
-
-                        StudyId = dataset.GetSingleValueOrDefault(DicomTag.StudyID, string.Empty),
-                        AccessionNumber = dataset.GetSingleValueOrDefault(DicomTag.AccessionNumber, string.Empty),
-
-                        //需要特殊处理
-                        PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
-
-
-                        AcquisitionTime = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionTime, string.Empty),
-                        AcquisitionNumber = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionNumber, string.Empty),
-                        TriggerTime = dataset.GetSingleValueOrDefault(DicomTag.TriggerTime, string.Empty),
-
-
-
-                        //IsDoubleReview = addtionalInfo.IsDoubleReview,
-                        SeriesCount = 0,
-                        InstanceCount = 0
-                    };
-
-
-                    if (findStudy.PatientBirthDate.Length == 8)
-                    {
-                        findStudy.PatientBirthDate = $"{findStudy.PatientBirthDate[0]}{findStudy.PatientBirthDate[1]}{findStudy.PatientBirthDate[2]}{findStudy.PatientBirthDate[3]}-{findStudy.PatientBirthDate[4]}{findStudy.PatientBirthDate[5]}-{findStudy.PatientBirthDate[6]}{findStudy.PatientBirthDate[7]}";
-                    }
-                }
-
-
-                if (findSerice == null)
-                {
-                    isSeriesNeedAdd = true;
-
-                    findSerice = new SCPSeries
-                    {
-                        Id = seriesId,
-                        StudyId = findStudy.Id,
-
-                        StudyInstanceUid = findStudy.StudyInstanceUid,
-                        SeriesInstanceUid = seriesInstanceUid,
-                        SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1),
-                        //SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay),
-                        //SeriesTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.SeriesDate) + dataset.GetSingleValue<string>(DicomTag.SeriesTime), out DateTime dt) ? dt : null,
-                        SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.SeriesDate).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.SeriesTime).TimeOfDay),
-                        Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
-                        Description = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
-                        SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
-
-                        ImagePositionPatient = dataset.GetSingleValueOrDefault(DicomTag.ImagePositionPatient, string.Empty),
-                        ImageOrientationPatient = dataset.GetSingleValueOrDefault(DicomTag.ImageOrientationPatient, string.Empty),
-                        BodyPartExamined = dataset.GetSingleValueOrDefault(DicomTag.BodyPartExamined, string.Empty),
-                        SequenceName = dataset.GetSingleValueOrDefault(DicomTag.SequenceName, string.Empty),
-                        ProtocolName = dataset.GetSingleValueOrDefault(DicomTag.ProtocolName, string.Empty),
-                        ImagerPixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.ImagerPixelSpacing, string.Empty),
-
-                        AcquisitionTime = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionTime, string.Empty),
-                        AcquisitionNumber = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionNumber, string.Empty),
-                        TriggerTime = dataset.GetSingleValueOrDefault(DicomTag.TriggerTime, string.Empty),
-
-
-                        InstanceCount = 0
-                    };
-
-                    ++findStudy.SeriesCount;
-                }
-
-
-                if (findInstance == null)
-                {
-                    isInstanceNeedAdd = true;
-                    findInstance = new SCPInstance
-                    {
-                        Id = instanceId,
-                        StudyId = findStudy.Id,
-                        SeriesId = findSerice.Id,
-                        StudyInstanceUid = findStudy.StudyInstanceUid,
-                        SeriesInstanceUid = findSerice.SeriesInstanceUid,
-
-                        SopInstanceUid = sopInstanceUid,
-                        InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
-                        InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.ContentDate).Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.ContentTime).TimeOfDay),
-                        //InstanceTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.ContentDate) + dataset.GetSingleValue<string>(DicomTag.ContentTime), out DateTime dt) ? dt : null,
-                        //InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate,(DateTime?)null)?.Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, TimeSpan.Zero)),
-                        //dataset.GetSingleValueOrDefault(DicomTag.ContentDate,DateTime.Now);//, DicomTag.ContentTime)
-                        CPIStatus = false,
-                        ImageRows = dataset.GetSingleValueOrDefault(DicomTag.Rows, 0),
-                        ImageColumns = dataset.GetSingleValueOrDefault(DicomTag.Columns, 0),
-                        SliceLocation = dataset.GetSingleValueOrDefault(DicomTag.SliceLocation, 0),
-
-                        SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
-                        NumberOfFrames = dataset.GetSingleValueOrDefault(DicomTag.NumberOfFrames, 0),
-                        PixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.PixelSpacing, string.Empty),
-                        ImagerPixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.ImagerPixelSpacing, string.Empty),
-                        FrameOfReferenceUID = dataset.GetSingleValueOrDefault(DicomTag.FrameOfReferenceUID, string.Empty),
-                        WindowCenter = dataset.GetSingleValueOrDefault(DicomTag.WindowCenter, string.Empty),
-                        WindowWidth = dataset.GetSingleValueOrDefault(DicomTag.WindowWidth, string.Empty),
-
-                        Path = fileRelativePath,
-
-                        FileSize= fileSize,
-
-                    };
-
-                    ++findStudy.InstanceCount;
-                    ++findSerice.InstanceCount;
-                }
-
-                if (isPatientNeedAdd)
-                {
-                    var ss = await _patientRepository.AddAsync(findPatient);
-                }
-                if (isStudyNeedAdd)
-                {
-                    var dd = await _studyRepository.AddAsync(findStudy);
-                }
-                else
-                {
-                    await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == findStudy.Id, t => new SCPStudy() { IsUploadFinished = false });
-                }
-
-                if (isSeriesNeedAdd)
-                {
-                    await _seriesRepository.AddAsync(findSerice);
-                }
-                if (isInstanceNeedAdd)
-                {
-                    await _instanceRepository.AddAsync(findInstance);
-                }
-                else
-                {
-                    await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == instanceId, u => new SCPInstance() { Path = fileRelativePath,FileSize=fileSize });
-                }
-
-                //await _studyRepository.SaveChangesAsync();
-
-                return findStudy.Id;
-            }
-
-        }
-
-
-        // 从DICOM文件中获取使用的字符集
-        private string GetEncodingVaulueFromDicomFile(DicomDataset dataset, DicomTag dicomTag)
-        {
-
-            // 获取DICOM文件的特定元素，通常用于指示使用的字符集
-            var charset = dataset.GetSingleValueOrDefault(DicomTag.SpecificCharacterSet, string.Empty);
-
-            var dicomEncoding = DicomEncoding.GetEncoding(charset);
-
-
-            var dicomStringElement = dataset.GetDicomItem<DicomStringElement>(dicomTag);
-
-            var bytes = dicomStringElement.Buffer.Data;
-
-
-            return dicomEncoding.GetString(bytes);
-
-
-            //// 从DICOM文件中获取使用的字符集
-            //string filePath = "C:\\Users\\hang\\Documents\\WeChat Files\\wxid_r2imdzb7j3q922\\FileStorage\\File\\2024-05\\1.2.840.113619.2.80.169103990.5390.1271401378.4.dcm";
-            //DicomFile dicomFile = DicomFile.Open(filePath);
-
-            //// 获取DICOM文件的特定元素，通常用于指示使用的字符集
-            //var charset = dicomFile.Dataset.GetSingleValueOrDefault(DicomTag.SpecificCharacterSet, string.Empty);
-
-            //var dicomEncoding = DicomEncoding.GetEncoding(charset);
-
-            //var value = dicomFile.Dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
-
-            //var dicomStringElement = dicomFile.Dataset.GetDicomItem<DicomStringElement>(DicomTag.PatientName);
-
-            //var bytes = dicomStringElement.Buffer.Data;
-
-            //var aa= dicomEncoding.GetString(bytes);
-
-
-        }
-    }
-}
@@ -1,11 +0,0 @@
-using FellowOakDicom;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
-
-namespace IRaCIS.Core.SCP.Service
-{
-    public interface IDicomArchiveService
-    {
-        Task<Guid> ArchiveDicomFileAsync(DicomDataset dicomDataset,Guid trialId,Guid trialSiteId, string fileRelativePath,string callingAE,string calledAE,long fileSize);
-
-    }
-}
@@ -1,770 +0,0 @@
-using AlibabaCloud.SDK.Sts20150401;
-using Aliyun.OSS;
-using Amazon;
-using Amazon.Runtime;
-using Amazon.S3;
-using Amazon.S3.Model;
-using Amazon.SecurityToken;
-using Amazon.SecurityToken.Model;
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Infrastructure.NewtonsoftJson;
-using MassTransit;
-using Microsoft.Extensions.Options;
-using Minio;
-using Minio.DataModel.Args;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
-
-namespace IRaCIS.Core.SCP;
-
-#region 绑定和返回模型
-
-[LowerCamelCaseJson]
-public class MinIOOptions : AWSOptions
-{
-    public int Port { get; set; }
-
-}
-
-
-public class AWSOptions
-{
-    public string EndPoint { get; set; }
-    public bool UseSSL { get; set; }
-    public string AccessKeyId { get; set; }
-    public string RoleArn { get; set; }
-    public string SecretAccessKey { get; set; }
-    public string BucketName { get; set; }
-    public string ViewEndpoint { get; set; }
-    public int DurationSeconds { get; set; }
-    public string Region { get; set; }
-}
-
-public class AliyunOSSOptions
-{
-    public string RegionId { get; set; }
-    public string AccessKeyId { get; set; }
-    public string AccessKeySecret { get; set; }
-
-    public string InternalEndpoint { get; set; }
-
-    public string EndPoint { get; set; }
-    public string BucketName { get; set; }
-
-    public string RoleArn { get; set; }
-
-    public string Region { get; set; }
-
-    public string ViewEndpoint { get; set; }
-
-    public int DurationSeconds { get; set; }
-
-
-
-}
-
-public class ObjectStoreServiceOptions
-{
-    public string ObjectStoreUse { get; set; }
-
-    public AliyunOSSOptions AliyunOSS { get; set; }
-
-
-    public MinIOOptions MinIO { get; set; }
-
-    public AWSOptions AWS { get; set; }
-
-}
-
-public class ObjectStoreDTO
-{
-    public string ObjectStoreUse { get; set; }
-
-
-    public AliyunOSSTempToken AliyunOSS { get; set; }
-
-    public MinIOOptions MinIO { get; set; }
-
-    public AWSTempToken AWS { get; set; }
-
-}
-
-[LowerCamelCaseJson]
-public class AliyunOSSTempToken
-{
-    public string AccessKeyId { get; set; }
-    public string AccessKeySecret { get; set; }
-
-    public string EndPoint { get; set; }
-    public string BucketName { get; set; }
-
-    public string Region { get; set; }
-
-    public string ViewEndpoint { get; set; }
-
-    public string SecurityToken { get; set; }
-    public DateTime Expiration { get; set; }
-
-
-}
-
-[LowerCamelCaseJson]
-public class AWSTempToken
-{
-    public string Region { get; set; }
-    public string SessionToken { get; set; }
-    public string EndPoint { get; set; }
-    public string AccessKeyId { get; set; }
-    public string SecretAccessKey { get; set; }
-    public string BucketName { get; set; }
-    public string ViewEndpoint { get; set; }
-    public DateTime Expiration { get; set; }
-}
-
-public enum ObjectStoreUse
-{
-    AliyunOSS = 0,
-    MinIO = 1,
-    AWS = 2,
-}
-
-#endregion
-
-// aws 参考链接 https://github.com/awsdocs/aws-doc-sdk-examples/tree/main/dotnetv3/S3/S3_Basics
-
-public interface IOSSService
-{
-    public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true);
-    public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true);
-
-    public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
-
-    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
-
-    public Task<string> GetSignedUrl(string ossRelativePath);
-
-    public Task DeleteFromPrefix(string prefix);
-
-    public ObjectStoreDTO GetObjectStoreTempToken();
-}
-
-
-public class OSSService : IOSSService
-{
-    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
-
-    private AliyunOSSTempToken AliyunOSSTempToken { get; set; }
-
-    private AWSTempToken AWSTempToken { get; set; }
-
-
-    public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
-    {
-        ObjectStoreServiceOptions = options.CurrentValue;
-
-    }
-
-
-
-    /// <summary>
-    ///  oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
-    /// </summary>
-    /// <param name="fileStream"></param>
-    /// <param name="oosFolderPath"></param>
-    /// <param name="fileRealName"></param>
-    /// <param name="isFileNameAddGuid"></param>
-    /// <returns></returns>
-    public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
-    {
-        GetObjectStoreTempToken();
-
-        var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
-
-        try
-        {
-            using (var memoryStream = new MemoryStream())
-            {
-                fileStream.Seek(0, SeekOrigin.Begin);
-
-                fileStream.CopyTo(memoryStream);
-
-                memoryStream.Seek(0, SeekOrigin.Begin);
-
-
-                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-                {
-                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-
-
-                    // 上传文件
-                    var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, memoryStream);
-
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-                {
-                    var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-
-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                        .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                        .Build();
-
-                    var putObjectArgs = new PutObjectArgs()
-                           .WithBucket(minIOConfig.BucketName)
-                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream)
-                           .WithObjectSize(memoryStream.Length);
-
-                    await minioClient.PutObjectAsync(putObjectArgs);
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-                {
-                    var awsConfig = ObjectStoreServiceOptions.AWS;
-
-                    var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-
-
-                    //提供awsEndPoint（域名）进行访问配置
-                    var clientConfig = new AmazonS3Config
-                    {
-                        RegionEndpoint = RegionEndpoint.USEast1,
-                        UseHttp = true,
-                    };
-
-                    var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-                    var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
-                    {
-                        BucketName = awsConfig.BucketName,
-                        InputStream = memoryStream,
-                        Key = ossRelativePath,
-                    };
-
-                    await amazonS3Client.PutObjectAsync(putObjectRequest);
-                }
-                else
-                {
-                    throw new BusinessValidationFailedException("未定义的存储介质类型");
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-
-            throw new BusinessValidationFailedException($"上传发生异常：{ex.Message}");
-        }
-
-
-
-
-        return "/" + ossRelativePath;
-
-    }
-
-
-
-    /// <summary>
-    /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
-    /// </summary>
-    /// <param name="localFilePath"></param>
-    /// <param name="oosFolderPath"></param>
-    /// <param name="isFileNameAddGuid"></param>
-    /// <returns></returns>
-    /// <exception cref="BusinessValidationFailedException"></exception>
-    public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
-    {
-        GetObjectStoreTempToken();
-
-        var localFileName = Path.GetFileName(localFilePath);
-
-        var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}";
-
-
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-        {
-            var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-            var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-            // 上传文件
-            var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, localFilePath);
-
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-        {
-            var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-
-            var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                .Build();
-
-            var putObjectArgs = new PutObjectArgs()
-                   .WithBucket(minIOConfig.BucketName)
-                   .WithObject(ossRelativePath)
-                   .WithFileName(localFilePath);
-
-            await minioClient.PutObjectAsync(putObjectArgs);
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-        {
-            var awsConfig = ObjectStoreServiceOptions.AWS;
-
-            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-            //提供awsEndPoint（域名）进行访问配置
-            var clientConfig = new AmazonS3Config
-            {
-                RegionEndpoint = RegionEndpoint.USEast1,
-                UseHttp = true,
-            };
-
-            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-            var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
-            {
-                BucketName = awsConfig.BucketName,
-                FilePath = localFilePath,
-                Key = ossRelativePath,
-            };
-
-            await amazonS3Client.PutObjectAsync(putObjectRequest);
-
-        }
-        else
-        {
-            throw new BusinessValidationFailedException("未定义的存储介质类型");
-        }
-        return "/" + ossRelativePath;
-
-    }
-
-
-    public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
-    {
-        GetObjectStoreTempToken();
-
-        ossRelativePath = ossRelativePath.TrimStart('/');
-        try
-        {
-
-
-            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-            {
-                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-                // 上传文件
-                var result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
-
-                // 将下载的文件流保存到本地文件
-                using (var fs = File.OpenWrite(localFilePath))
-                {
-                    result.Content.CopyTo(fs);
-                    fs.Close();
-                }
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-            {
-                var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                    .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                    .Build();
-
-                var getObjectArgs = new GetObjectArgs()
-                .WithBucket(minIOConfig.BucketName)
-                .WithObject(ossRelativePath)
-                .WithFile(localFilePath);
-
-                await minioClient.GetObjectAsync(getObjectArgs);
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-            {
-                var awsConfig = ObjectStoreServiceOptions.AWS;
-
-                // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-                var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-                //提供awsEndPoint（域名）进行访问配置
-                var clientConfig = new AmazonS3Config
-                {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
-                };
-
-                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-                var getObjectArgs = new Amazon.S3.Model.GetObjectRequest()
-                {
-                    BucketName = awsConfig.BucketName,
-                    Key = ossRelativePath,
-                };
-
-
-                await (await amazonS3Client.GetObjectAsync(getObjectArgs)).WriteResponseStreamToFileAsync(localFilePath, true, CancellationToken.None);
-
-
-            }
-            else
-            {
-                throw new BusinessValidationFailedException("未定义的存储介质类型");
-            }
-        }
-        catch (Exception ex)
-        {
-
-            throw new BusinessValidationFailedException("oss下载失败!" + ex.Message);
-        }
-
-
-
-
-
-    }
-
-    public async Task<string> GetSignedUrl(string ossRelativePath)
-    {
-        GetObjectStoreTempToken();
-
-        ossRelativePath = ossRelativePath.TrimStart('/');
-        try
-        {
-
-
-            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-            {
-                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-                // 生成签名URL。
-                var req = new GeneratePresignedUriRequest(aliConfig.BucketName, ossRelativePath, SignHttpMethod.Get)
-                {
-                    // 设置签名URL过期时间，默认值为3600秒。
-                    Expiration = DateTime.Now.AddHours(1),
-                };
-                var uri = _ossClient.GeneratePresignedUri(req);
-
-                return uri.PathAndQuery;
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-            {
-                var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                    .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                    .Build();
-
-
-                var args = new PresignedGetObjectArgs()
-                    .WithBucket(minIOConfig.BucketName)
-                    .WithObject(ossRelativePath)
-                    .WithExpiry(3600)
-                    /*.WithHeaders(reqParams)*/;
-
-                var presignedUrl = await minioClient.PresignedGetObjectAsync(args);
-
-                Uri uri = new Uri(presignedUrl);
-
-                string relativePath = uri.PathAndQuery;
-
-
-                return relativePath;
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-            {
-                var awsConfig = ObjectStoreServiceOptions.AWS;
-
-
-                // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-                var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-                //提供awsEndPoint（域名）进行访问配置
-                var clientConfig = new AmazonS3Config
-                {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
-                };
-
-                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-                var presignedUrl = await amazonS3Client.GetPreSignedURLAsync(new GetPreSignedUrlRequest()
-                {
-                    BucketName = awsConfig.BucketName,
-                    Key = ossRelativePath,
-                    Expires = DateTime.UtcNow.AddMinutes(120)
-                });
-
-                Uri uri = new Uri(presignedUrl);
-
-                string relativePath = uri.PathAndQuery;
-
-
-                return relativePath;
-            }
-            else
-            {
-                throw new BusinessValidationFailedException("未定义的存储介质类型");
-            }
-        }
-        catch (Exception ex)
-        {
-
-            throw new BusinessValidationFailedException("oss授权url失败!" + ex.Message);
-        }
-
-    }
-
-    /// <summary>
-    /// 删除某个目录的文件
-    /// </summary>
-    /// <param name="prefix"></param>
-    /// <returns></returns>
-    public async Task DeleteFromPrefix(string prefix)
-    {
-        GetObjectStoreTempToken();
-
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-        {
-            var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-            var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-
-            try
-            {
-                ObjectListing objectListing = null;
-                string nextMarker = null;
-                do
-                {
-                    // 使用 prefix 模拟目录结构，设置 MaxKeys 和 NextMarker
-                    objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
-                    {
-                        Prefix = prefix,
-                        MaxKeys = 1000,
-                        Marker = nextMarker
-                    });
-
-                    List<string> keys = objectListing.ObjectSummaries.Select(t => t.Key).ToList();
-
-                    // 删除获取到的文件
-                    if (keys.Count > 0)
-                    {
-                        _ossClient.DeleteObjects(new Aliyun.OSS.DeleteObjectsRequest(aliConfig.BucketName, keys, false));
-                    }
-
-                    // 设置 NextMarker 以获取下一页的数据
-                    nextMarker = objectListing.NextMarker;
-
-                } while (objectListing.IsTruncated);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Error: {ex.Message}");
-            }
-
-
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-        {
-            var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-
-            var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                .Build();
-
-
-            var listArgs = new ListObjectsArgs().WithBucket(minIOConfig.BucketName).WithPrefix(prefix).WithRecursive(true);
-
-
-
-            // 创建一个空列表用于存储对象键
-            var objects = new List<string>();
-
-            // 使用 await foreach 来异步迭代对象列表
-            await foreach (var item in minioClient.ListObjectsEnumAsync(listArgs))
-            {
-                objects.Add(item.Key);
-            }
-
-
-            if (objects.Count > 0)
-            {
-                var objArgs = new RemoveObjectsArgs()
-              .WithBucket(minIOConfig.BucketName)
-              .WithObjects(objects);
-
-                // 删除对象
-                await minioClient.RemoveObjectsAsync(objArgs);
-            }
-
-
-
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-        {
-
-            var awsConfig = ObjectStoreServiceOptions.AWS;
-
-
-            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-            //提供awsEndPoint（域名）进行访问配置
-            var clientConfig = new AmazonS3Config
-            {
-                RegionEndpoint = RegionEndpoint.USEast1,
-                UseHttp = true,
-            };
-
-            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-            // 列出指定前缀下的所有对象
-            var listObjectsRequest = new ListObjectsV2Request
-            {
-                BucketName = awsConfig.BucketName,
-                Prefix = prefix
-            };
-
-            var listObjectsResponse = await amazonS3Client.ListObjectsV2Async(listObjectsRequest);
-
-            if (listObjectsResponse.S3Objects.Count > 0)
-            {
-                // 准备删除请求
-                var deleteObjectsRequest = new Amazon.S3.Model.DeleteObjectsRequest
-                {
-                    BucketName = awsConfig.BucketName,
-                    Objects = new List<KeyVersion>()
-                };
-
-                foreach (var s3Object in listObjectsResponse.S3Objects)
-                {
-                    deleteObjectsRequest.Objects.Add(new KeyVersion
-                    {
-                        Key = s3Object.Key
-                    });
-                }
-
-                // 批量删除对象
-                var deleteObjectsResponse = await amazonS3Client.DeleteObjectsAsync(deleteObjectsRequest);
-            }
-
-
-
-        }
-        else
-        {
-            throw new BusinessValidationFailedException("未定义的存储介质类型");
-        }
-    }
-
-
-    public ObjectStoreDTO GetObjectStoreTempToken()
-    {
-
-        var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
-
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-        {
-            var client = new Client(new AlibabaCloud.OpenApiClient.Models.Config()
-            {
-                AccessKeyId = ossOptions.AccessKeyId,
-                AccessKeySecret = ossOptions.AccessKeySecret,
-                //AccessKeyId = "LTAI5tJV76pYX5yPg1N9QVE8",
-                //AccessKeySecret = "roRNLa9YG1of4pYruJGCNKBXEWTAWa",
-
-                Endpoint = "sts.cn-hangzhou.aliyuncs.com"
-            });
-
-            var assumeRoleRequest = new AlibabaCloud.SDK.Sts20150401.Models.AssumeRoleRequest();
-            // 将<YOUR_ROLE_SESSION_NAME>设置为自定义的会话名称，例如oss-role-session。
-            assumeRoleRequest.RoleSessionName = $"session-name-{NewId.NextGuid()}";
-            // 将<YOUR_ROLE_ARN>替换为拥有上传文件到指定OSS Bucket权限的RAM角色的ARN。
-            assumeRoleRequest.RoleArn = ossOptions.RoleArn;
-            //assumeRoleRequest.RoleArn = "acs:ram::1899121822495495:role/webdirect";
-            assumeRoleRequest.DurationSeconds = ossOptions.DurationSeconds;
-            var runtime = new AlibabaCloud.TeaUtil.Models.RuntimeOptions();
-            var response = client.AssumeRoleWithOptions(assumeRoleRequest, runtime);
-            var credentials = response.Body.Credentials;
-
-            var tempToken = new AliyunOSSTempToken()
-            {
-                AccessKeyId = credentials.AccessKeyId,
-                AccessKeySecret = credentials.AccessKeySecret,
-
-                //转为服务器时区，最后统一转为客户端时区
-                Expiration = TimeZoneInfo.ConvertTimeFromUtc(DateTime.Parse(credentials.Expiration), TimeZoneInfo.Local),
-                SecurityToken = credentials.SecurityToken,
-
-
-                Region = ossOptions.Region,
-                BucketName = ossOptions.BucketName,
-                EndPoint = ossOptions.EndPoint,
-                ViewEndpoint = ossOptions.ViewEndpoint,
-
-            };
-
-            AliyunOSSTempToken = tempToken;
-
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AliyunOSS = tempToken };
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-        {
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, MinIO = ObjectStoreServiceOptions.MinIO };
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-        {
-            var awsOptions = ObjectStoreServiceOptions.AWS;
-
-            //aws 临时凭证
-            // 创建 STS 客户端
-            var stsClient = new AmazonSecurityTokenServiceClient(awsOptions.AccessKeyId, awsOptions.SecretAccessKey);
-
-            // 使用 AssumeRole 请求临时凭证
-            var assumeRoleRequest = new AssumeRoleRequest
-            {
-
-                RoleArn = awsOptions.RoleArn, // 角色 ARN
-                RoleSessionName = $"session-name-{NewId.NextGuid()}",
-                DurationSeconds = awsOptions.DurationSeconds          // 临时凭证有效期
-            };
-
-            var assumeRoleResponse = stsClient.AssumeRoleAsync(assumeRoleRequest).Result;
-
-            var credentials = assumeRoleResponse.Credentials;
-
-            var tempToken = new AWSTempToken()
-            {
-                AccessKeyId = credentials.AccessKeyId,
-                SecretAccessKey = credentials.SecretAccessKey,
-                SessionToken = credentials.SessionToken,
-                Expiration = credentials.Expiration,
-                Region = awsOptions.Region,
-                BucketName = awsOptions.BucketName,
-                EndPoint = awsOptions.EndPoint,
-                ViewEndpoint = awsOptions.ViewEndpoint,
-
-            };
-
-            AWSTempToken = tempToken;
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AWS = tempToken };
-        }
-        else
-        {
-            throw new BusinessValidationFailedException("未定义的存储介质类型");
-        }
-    }
-
-}
@@ -1,37 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
-      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
-      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
-      "BucketName": "zy-irc-store",
-      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    }
-  },
-
-  "ConnectionStrings": {
-    "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
-  },
-
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}
@@ -1,48 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      "BucketName": "zy-irc-test-store",
-      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    },
-
-    "MinIO": {
-      "endPoint": "106.14.89.110",
-      "port": "9001",
-      "useSSL": false,
-      "accessKey": "fbStsVYCIPKHQneeqMwD",
-      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      "bucketName": "hir-test",
-      "viewEndpoint": "http://106.14.89.110:9001/hir-test/"
-    }
-
-  },
-
-  "ConnectionStrings": {
-    "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}
@@ -1,34 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AWS",
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=us-prod-mssql-service,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-prod-mssql-service,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}
@@ -1,34 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AWS",
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/",
-      "DurationSeconds": 7200
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=us-mssql-service,1433;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-mssql-service,1433;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}
@@ -1,35 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      "BucketName": "zy-irc-uat-store",
-      "ViewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=47.117.164.182,1434;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=47.117.164.182,1434;Database=Uat_IRC.Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infra.EFCore",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infrastructure", "IRaCIS.Core.Infrastructure\IRaCIS.Core.Infrastructure.csproj", "{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRC.Core.SCP", "IRC.Core.SCP\IRC.Core.SCP.csproj", "{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,10 +51,6 @@ Global
 		{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -0,0 +1,99 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+
+namespace EFSaving.Concurrency
+{
+    public class Sample
+    {
+        public static void Run()
+        {
+            // Ensure database is created and has a person in it
+            using (var setupContext = new PersonContext())
+            {
+                setupContext.Database.EnsureDeleted();
+                setupContext.Database.EnsureCreated();
+
+                setupContext.People.Add(new Person { FirstName = "John", LastName = "Doe" });
+                setupContext.SaveChanges();
+            }
+
+            #region ConcurrencyHandlingCode
+            using var context = new PersonContext();
+            // Fetch a person from database and change phone number
+            var person = context.People.Single(p => p.PersonId == 1);
+            person.PhoneNumber = "555-555-5555";
+
+            // Change the person's name in the database to simulate a concurrency conflict
+            context.Database.ExecuteSqlRaw(
+                "UPDATE dbo.People SET FirstName = 'Jane' WHERE PersonId = 1");
+
+            var saved = false;
+            while (!saved)
+            {
+                try
+                {
+                    // Attempt to save changes to the database
+                    context.SaveChanges();
+                    saved = true;
+                }
+                catch (DbUpdateConcurrencyException ex)
+                {
+                    foreach (var entry in ex.Entries)
+                    {
+                        if (entry.Entity is Person)
+                        {
+                            var proposedValues = entry.CurrentValues;
+                            var databaseValues = entry.GetDatabaseValues();
+
+                            foreach (var property in proposedValues.Properties)
+                            {
+                                var proposedValue = proposedValues[property];
+                                var databaseValue = databaseValues[property];
+
+                                // TODO: decide which value should be written to database
+                                // proposedValues[property] = <value to be saved>;
+                            }
+
+                            // Refresh original values to bypass next concurrency check
+                            entry.OriginalValues.SetValues(databaseValues);
+                        }
+                        else
+                        {
+                            throw new NotSupportedException(
+                                "Don't know how to handle concurrency conflicts for "
+                                + entry.Metadata.Name);
+                        }
+                    }
+                }
+            }
+            #endregion
+        }
+
+        public class PersonContext : DbContext
+        {
+            public DbSet<Person> People { get; set; }
+
+            protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+            {
+                // Requires NuGet package Microsoft.EntityFrameworkCore.SqlServer
+                optionsBuilder.UseSqlServer(
+                    @"Server=(localdb)\mssqllocaldb;Database=EFSaving.Concurrency;Trusted_Connection=True");
+            }
+        }
+
+        public class Person
+        {
+            public int PersonId { get; set; }
+
+            [ConcurrencyCheck]
+            public string FirstName { get; set; }
+
+            [ConcurrencyCheck]
+            public string LastName { get; set; }
+
+            public string PhoneNumber { get; set; }
+        }
+    }
+}
@@ -1,5 +1,6 @@
 using System;
 using System.Net.Http;
+using EasyCaching.Core;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
@@ -14,7 +15,7 @@ using System.Text;
 using Microsoft.AspNetCore.Http;
 using IRaCIS.Core.Application.Interfaces;
 using System.Threading.Tasks;
-using IRaCIS.Core.Application.Service;
+using IRaCIS.Application.Services;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Infrastructure;
@@ -22,6 +23,9 @@ using System.Linq;
 using Microsoft.Extensions.Logging;
 using MassTransit;
 using Microsoft.AspNetCore.Hosting;
+using Aliyun.Acs.Core.Profile;
+using Aliyun.Acs.Core.Auth.Sts;
+using Aliyun.Acs.Core;
 using IRaCIS.Core.Application.Helper;
 using Microsoft.Extensions.Options;
 using IRaCIS.Core.Application.Contracts;
@@ -29,15 +33,6 @@ using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
 using DocumentFormat.OpenXml.Spreadsheet;
 using AutoMapper.QueryableExtensions;
 using NetTopologySuite.Algorithm;
-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;

 namespace IRaCIS.Api.Controllers
 {
@@ -105,17 +100,13 @@ namespace IRaCIS.Api.Controllers
        [HttpPost, Route("user/login")]
        [AllowAnonymous]
        public async Task<IResponseOutput> Login(UserLoginDTO loginUser,
-            [FromServices] IFusionCache _fusionCache,
+            [FromServices] IEasyCachingProvider provider,
            [FromServices] IUserService _userService,
-            [FromServices] ITokenService _tokenService,
-            [FromServices] IReadingImageTaskService readingImageTaskService,
-            [FromServices] IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
-            [FromServices] IOptionsMonitor<SystemEmailSendConfig> _emailConfig,
-
-            [FromServices] IMailVerificationService _mailVerificationService)
+             [FromServices] ITokenService _tokenService,
+             [FromServices] IReadingImageTaskService readingImageTaskService,
+             IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
+              IMailVerificationService _mailVerificationService)
        {
-            var emailConfig = _emailConfig.CurrentValue;
-            var companyInfo = new SystemEmailSendConfigView() { CompanyName = emailConfig.CompanyName, CompanyNameCN = emailConfig.CompanyNameCN, CompanyShortName = emailConfig.CompanyShortName, CompanyShortNameCN = emailConfig.CompanyShortNameCN };

            //MFA 邮箱验证  前端传递用户Id  和MFACode
            if (loginUser.UserId != null && _verifyConfig.CurrentValue.OpenLoginMFA)
@@ -148,11 +139,10 @@ namespace IRaCIS.Api.Controllers
                // 验证阅片休息时间
                await readingImageTaskService.ResetReadingRestTime(userId);

-                await _fusionCache.SetAsync(CacheKeys.UserToken(userId), loginReturn.JWTStr, TimeSpan.FromDays(7));
+                await provider.SetAsync(userId.ToString(), loginReturn.JWTStr, TimeSpan.FromDays(7));

-                await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(userId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
+                await provider.SetAsync($"{userId.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));

-                loginReturn.CompanyInfo = companyInfo;
                return ResponseOutput.Ok(loginReturn);

            }
@@ -227,9 +217,9 @@ namespace IRaCIS.Api.Controllers

                    if (_verifyConfig.CurrentValue.OpenLoginMFA)
                    {
+                        //发版屏蔽

-
-
+                        //returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));

                        //MFA 发送邮件

@@ -237,21 +227,11 @@ namespace IRaCIS.Api.Controllers

                        var email = returnModel.Data.BasicInfo.EMail;

-                        var hiddenEmail = IRCEmailPasswordHelper.MaskEmail(email);
+                        var hiddenEmail = EmailMaskHelper.MaskEmail(email);

                        returnModel.Data.BasicInfo.EMail = hiddenEmail;

-                        //修改密码
-                        if (returnModel.Data.BasicInfo.IsFirstAdd || returnModel.Data.BasicInfo.LoginState == 1)
-                        {
-                            returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
-                        }
-                        else
-                        {
-                            //正常登录才发送邮件
-                            await _userService.SendMFAEmail(userId);
-
-                        }
+                        await _userService.SendMFAEmail(userId);

                    }
                    else
@@ -274,14 +254,12 @@ namespace IRaCIS.Api.Controllers
                        // 验证阅片休息时间
                        await readingImageTaskService.ResetReadingRestTime(returnModel.Data.BasicInfo.Id);

-                        await _fusionCache.SetAsync(CacheKeys.UserToken(userId), returnModel.Data.JWTStr, TimeSpan.FromDays(7));
+                        await provider.SetAsync(userId.ToString(), returnModel.Data.JWTStr, TimeSpan.FromDays(7));

-                        await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(userId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
+                        await provider.SetAsync($"{userId.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
                    }

                }
-
-                returnModel.Data.CompanyInfo = companyInfo;
                return returnModel;

            }
@@ -291,14 +269,8 @@ namespace IRaCIS.Api.Controllers

        }

-        [AllowAnonymous]
-        [HttpGet, Route("user/getPublicKey")]
-        public IResponseOutput GetPublicKey([FromServices] IOptionsMonitor<IRCEncreptOption> _IRCEncreptOption)
-        {
-            //var pemPublicKey = Encoding.UTF8.GetString(Convert.FromBase64String(_IRCEncreptOption.CurrentValue.Base64RSAPublicKey));

-            return ResponseOutput.Ok(_IRCEncreptOption.CurrentValue.Base64RSAPublicKey);
-        }
+


        [HttpGet, Route("imageShare/ShareImage")]
@@ -321,100 +293,107 @@ namespace IRaCIS.Api.Controllers
        }

        [HttpGet("user/GetObjectStoreToken")]
-        public async Task<IResponseOutput> GetObjectStoreTokenAsync([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options, [FromServices] IOSSService _oSSService)
+        public IResponseOutput GetObjectStoreToken([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options)
        {
+            var serviceOption = options.CurrentValue;

-            var result = _oSSService.GetObjectStoreTempToken();
+            if (Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedEnum) && parsedEnum == ObjectStoreUse.AliyunOSS)
+            {

-            //result.AWS = await GetAWSTemToken(options.CurrentValue);
+                var ossOptions = serviceOption.AliyunOSS;

-            return ResponseOutput.Ok(result);
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AliyunOSS = serviceOption.AliyunOSS, AWS = serviceOption.AWS });
+
+                #region 临时token 屏蔽
+                //IClientProfile profile = DefaultProfile.GetProfile(ossOptions.RegionId, ossOptions.AccessKeyId, ossOptions.AccessKeySecret);
+                //DefaultAcsClient client = new DefaultAcsClient(profile);
+
+
+                //// 创建一个STS请求
+                //AssumeRoleRequest request = new AssumeRoleRequest
+                //{
+                //    RoleArn = ossOptions.RoleArn, // 角色ARN，需要替换为你的角色ARN
+                //    RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
+                //    DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
+                //};
+
+
+                //AssumeRoleResponse response = client.GetAcsResponse(request);
+
+                //// 返回STS令牌信息给前端
+                //var stsToken = new ObjectStoreDTO()
+                //{
+                //    ObjectStoreUse = serviceOption.ObjectStoreUse,
+                //    AliyunOSS = new AliyunOSSTempToken()
+                //    {
+                //        AccessKeyId = response.Credentials.AccessKeyId,
+                //        AccessKeySecret = response.Credentials.AccessKeySecret,
+                //        SecurityToken = response.Credentials.SecurityToken,
+                //        Expiration = response.Credentials.Expiration,
+
+                //        Region = ossOptions.Region,
+                //        BucketName = ossOptions.BucketName,
+                //        ViewEndpoint = ossOptions.ViewEndpoint,
+
+                //    },
+                //    MinIO = serviceOption.MinIO
+                //};
+                //return ResponseOutput.Ok(stsToken);
+
+                #endregion
+
+            }
+            else if (Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedValue) && parsedValue == ObjectStoreUse.MinIO)
+            {
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AWS = serviceOption.AWS });
+            }
+            else
+            {
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AWS = serviceOption.AWS });
+            }

        }

-
-        private async Task<AWSTempToken> GetAWSTemToken(ObjectStoreServiceOptions serviceOption)
+        [HttpGet("user/GenerateSTS")]
+        public IResponseOutput GenerateSTS([FromServices] IOptionsMonitor<AliyunOSSOptions> options)
        {
-            var awsOptions = serviceOption.AWS;
+            var ossOptions = options.CurrentValue;

-            //aws 临时凭证
-            // 创建 STS 客户端
-            var stsClient = new AmazonSecurityTokenServiceClient(awsOptions.AccessKeyId, awsOptions.SecretAccessKey);

-            // 使用 AssumeRole 请求临时凭证
-            var assumeRoleRequest = new AssumeRoleRequest
+            IClientProfile profile = DefaultProfile.GetProfile(ossOptions.regionId, ossOptions.accessKeyId, ossOptions.accessKeySecret);
+            DefaultAcsClient client = new DefaultAcsClient(profile);
+
+
+            // 创建一个STS请求
+            AssumeRoleRequest request = new AssumeRoleRequest
            {
-
-                RoleArn = awsOptions.RoleArn, // 角色 ARN
-                RoleSessionName = $"session-name-{NewId.NextGuid()}",
-                DurationSeconds = awsOptions.DurationSeconds          // 临时凭证有效期
+                RoleArn = ossOptions.roleArn, // 角色ARN，需要替换为你的角色ARN
+                RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
+                DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
            };

-            var assumeRoleResponse = await stsClient.AssumeRoleAsync(assumeRoleRequest);

-            var credentials = assumeRoleResponse.Credentials;
+            AssumeRoleResponse response = client.GetAcsResponse(request);

-            var tempToken = new AWSTempToken()
+            // 返回STS令牌信息给前端
+            var stsToken = new
            {
-                AccessKeyId = credentials.AccessKeyId,
-                SecretAccessKey = credentials.SecretAccessKey,
-                SessionToken = credentials.SessionToken,
-                Expiration = credentials.Expiration,
-                Region = awsOptions.Region,
-                BucketName = awsOptions.BucketName,
-                EndPoint = awsOptions.EndPoint,
-                ViewEndpoint = awsOptions.ViewEndpoint,
+                AccessKeyId = response.Credentials.AccessKeyId,
+                AccessKeySecret = response.Credentials.AccessKeySecret,
+                SecurityToken = response.Credentials.SecurityToken,
+                Expiration = response.Credentials.Expiration,
+
+                Region = ossOptions.region,
+                BucketName = ossOptions.bucketName,
+                ViewEndpoint = ossOptions.viewEndpoint,

            };

-            return tempToken;
+            return ResponseOutput.Ok(stsToken);
+
        }


-        #region aliyun-net-sdk-sts  之前
-        //[HttpGet("user/GenerateSTS")]
-        //public IResponseOutput GenerateSTS([FromServices] IOptionsMonitor<AliyunOSSOptions> options)
-        //{
-        //    var ossOptions = options.CurrentValue;
-
-
-        //    IClientProfile profile = DefaultProfile.GetProfile(ossOptions.regionId, ossOptions.accessKeyId, ossOptions.accessKeySecret);
-        //    DefaultAcsClient client = new DefaultAcsClient(profile);
-
-
-        //    // 创建一个STS请求
-        //    AssumeRoleRequest request = new AssumeRoleRequest
-        //    {
-        //        RoleArn = ossOptions.roleArn, // 角色ARN，需要替换为你的角色ARN
-        //        RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
-        //        DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
-        //    };
-
-
-        //    AssumeRoleResponse response = client.GetAcsResponse(request);
-
-        //    // 返回STS令牌信息给前端
-        //    var stsToken = new
-        //    {
-        //        AccessKeyId = response.Credentials.AccessKeyId,
-        //        AccessKeySecret = response.Credentials.AccessKeySecret,
-        //        SecurityToken = response.Credentials.SecurityToken,
-        //        Expiration = response.Credentials.Expiration,
-
-        //        Region = ossOptions.region,
-        //        BucketName = ossOptions.bucketName,
-        //        ViewEndpoint = ossOptions.viewEndpoint,
-
-        //    };
-
-        //    return ResponseOutput.Ok(stsToken);
-
-        //}
-        #endregion
-
-
-
-

        [HttpGet("User/UserRedirect")]
        [AllowAnonymous]
@@ -448,7 +427,7 @@ namespace IRaCIS.Api.Controllers

        [HttpGet, Route("ip")]
        [AllowAnonymous]
-        public IResponseOutput Get([FromServices] IHttpContextAccessor _context)
+        public IResponseOutput Get([FromServices] IHttpContextAccessor _context/*, [FromServices] IUserService _userService*/)
        {

            StringBuilder sb = new StringBuilder();
@@ -469,7 +448,7 @@ namespace IRaCIS.Api.Controllers

        [HttpGet, Route("ip2")]
        [AllowAnonymous]
-        public IResponseOutput Get2([FromServices] IHttpContextAccessor _context)
+        public IResponseOutput Get2([FromServices] IHttpContextAccessor _context, [FromServices] IRepository _userService)
        {

            StringBuilder sb = new StringBuilder();
@@ -7,7 +7,7 @@ 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.Application.Services;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Models;
@@ -19,12 +19,18 @@ namespace IRaCIS.Core.API.Controllers.Special
    //谨慎修改 涉及到财务模块

    [ApiController, Authorize, ApiExplorerSettings(GroupName = "Financial")]
-    public class FinancialChangeController(
-        ITrialService _trialService,
-        ICalculateService _calculateService,
-        IStringLocalizer _localizer) : ControllerBase
+    public class FinancialChangeController : ControllerBase
    {
-       
+        private readonly ITrialService _trialService;
+        private readonly ICalculateService _calculateService;
+		private  IStringLocalizer _localizer { get; set; }
+		public FinancialChangeController(ITrialService trialService, ICalculateService calculateService, IStringLocalizer localizer
+			)
+        {
+            _localizer = localizer;
+			_trialService = trialService;
+            _calculateService = calculateService;
+        }


        //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
@@ -26,19 +26,78 @@ namespace IRaCIS.Core.API.Controllers

    [ApiController, ApiExplorerSettings(GroupName = "Reviewer")]
    [UnitOfWork]
-    public class InspectionController(
-        ITrialDocumentService _trialDocumentService,
-        IReadingImageTaskService _iReadingImageTaskService,
-        ITrialConfigService _trialConfigService,
-        IClinicalAnswerService _clinicalAnswerService,
-        IReadingClinicalDataService _readingClinicalDataService,
-        IQCOperationService _qCOperationService,
-        IInspectionService _inspectionService,
-        IReadingMedicalReviewService _readingMedicalReviewService,
-        IReadingMedicineQuestionService _readingMedicineQuestionService
-        ) : ControllerBase
+    public class InspectionController : ControllerBase
    {
-       
+        private readonly IRepository _repository;
+        private readonly IMapper _mapper;
+        private readonly IUserInfo _userInfo;
+        private readonly ITrialDocumentService _trialDocumentService;
+        private readonly IQCListService _qCListService;
+        private readonly IReadingImageTaskService _iReadingImageTaskService;
+        private readonly IHttpContextAccessor _httpContext;
+        private readonly ITrialConfigService _trialConfigService;
+        private readonly INoneDicomStudyService _noneDicomStudyService;
+        private readonly IClinicalAnswerService _clinicalAnswerService;
+        private readonly ISubjectService _subjectService;
+        private readonly IReadingClinicalDataService _readingClinicalDataService;
+        private readonly ISubjectVisitService _subjectVisitService;
+        private readonly IQCOperationService _qCOperationService;
+        private readonly IClinicalDataService _clinicalDataService;
+        private readonly IVisitPlanService _visitPlanService;
+     
+        private readonly IInspectionService _inspectionService;
+        private readonly IReadingMedicalReviewService _readingMedicalReviewService;
+        private readonly IReadingMedicineQuestionService _readingMedicineQuestionService;
+        private readonly IRepository<DataInspection> _dataInspectionRepository;
+        private delegate Task<IResponseOutput> executionFun(dynamic data);
+
+        public InspectionController(IRepository repository,
+            IRepository<DataInspection> _repositoryDataInspection,
+            IMapper mapper, IUserInfo userInfo,
+            ITrialDocumentService trialDocumentService,
+            IRepository<DataInspection> dataInspectionRepository,
+            IQCListService _qCListService,
+              IReadingImageTaskService _iReadingImageTaskService,
+            IHttpContextAccessor httpContext,
+            IInspectionService sinspectionService,
+              IReadingMedicalReviewService readingMedicalReviewService,
+             IReadingMedicineQuestionService readingMedicineQuestionService,
+            ITrialConfigService _trialConfigService,
+            INoneDicomStudyService noneDicomStudyService,
+            IClinicalAnswerService clinicalAnswerService,
+            ISubjectService _subjectService,
+            IReadingClinicalDataService _readingClinicalDataService,
+            ISubjectVisitService subjectVisitService,
+            IQCOperationService qCOperationService,
+            IClinicalDataService clinicalDataService,
+            IVisitPlanService visitPlanService
+            )
+        {
+            this._repository = repository;
+            this._mapper = mapper;
+            this._userInfo = userInfo;
+            this._inspectionService = sinspectionService;
+            this._readingMedicalReviewService = readingMedicalReviewService;
+            this._readingMedicineQuestionService = readingMedicineQuestionService;
+            this._trialDocumentService = trialDocumentService;
+            this._qCListService = _qCListService;
+            this._iReadingImageTaskService = _iReadingImageTaskService;
+            this._httpContext = httpContext;
+            this._trialConfigService = _trialConfigService;
+            this._noneDicomStudyService = noneDicomStudyService;
+            this._clinicalAnswerService = clinicalAnswerService;
+            this._subjectService = _subjectService;
+            this._readingClinicalDataService = _readingClinicalDataService;
+            this._subjectVisitService = subjectVisitService;
+            this._qCOperationService = qCOperationService;
+            this._clinicalDataService = clinicalDataService;
+            this._visitPlanService = visitPlanService;
+            this._dataInspectionRepository = dataInspectionRepository;
+        }
+
+
+
+
        #region 获取稽查数据
        /// <summary>
        /// 获取稽查数据
@@ -249,28 +308,11 @@ namespace IRaCIS.Core.API.Controllers
        }


-        /// <summary>
-        /// PM签名一致性分析临床数据
-        /// </summary>
-        /// <param name="opt"></param>
-        /// <returns></returns>
-        [HttpPost, Route("Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-
-        [UnitOfWork]
-        public async Task<IResponseOutput> SignConsistencyAnalysisReadingClinicalData(DataInspectionDto<SignConsistencyAnalysisReadingClinicalDataInDto> opt)
-        {
-            var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _readingClinicalDataService.SignConsistencyAnalysisReadingClinicalData(opt.Data);
-            await _inspectionService.CompletedSign(singid, result);
-            return result;
-        }
-
-        /// <summary>
-        /// 提交结构化录入并签名
-        /// </summary>
-        /// <param name="opt"></param>
-        /// <returns></returns>
+         /// <summary>
+         /// 提交结构化录入并签名
+         /// </summary>
+         /// <param name="opt"></param>
+         /// <returns></returns>
        [HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]

@@ -360,19 +402,6 @@ namespace IRaCIS.Core.API.Controllers
            return result;
        }

-
-        [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialPACSInfoConfirm")]
-        [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt" })]
-        public async Task<IResponseOutput> ConfigTrialPACSInfoConfirm(DataInspectionDto<TrialPACSConfig> opt)
-        {
-            opt.Data.IsTrialPACSConfirmed = true;
-            var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _trialConfigService.ConfigTrialPACSInfo(opt.Data);
-            await _inspectionService.CompletedSign(singid, result);
-            return result;
-        }
-
        /// <summary>
        /// 签名确认
        /// </summary>
@@ -1,5 +1,6 @@
 using AutoMapper;
 using DocumentFormat.OpenXml.Drawing;
+using EasyCaching.Core;
 using ExcelDataReader;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
@@ -9,7 +10,8 @@ using IRaCIS.Core.Application.Contracts.Dicom;
 using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Application.MassTransit.Command;
+using IRaCIS.Core.Application.MediatR.CommandAndQueries;
+using IRaCIS.Core.Application.MediatR.Handlers;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.ImageAndDoc;
 using IRaCIS.Core.Application.Service.Reading.Dto;
@@ -19,7 +21,7 @@ using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
 using MassTransit;
-using MassTransit.Mediator;
+using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
@@ -38,14 +40,12 @@ using Newtonsoft.Json;
 using SharpCompress.Archives;
 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
@@ -228,17 +228,69 @@ namespace IRaCIS.Core.API.Controllers

    [ApiExplorerSettings(GroupName = "Image")]
    [ApiController]
-    public class StudyController(
-        IMediator _mediator,
-        QCCommon _qCCommon,
-        IUserInfo _userInfo,
-        IRepository<SubjectVisit> _subjectVisitRepository,
-        IStringLocalizer _localizer) : UploadBaseController
+    public class StudyController : UploadBaseController
    {
+        public IMapper _mapper { get; set; }
+        public IUserInfo _userInfo { get; set; }
+        private readonly IMediator _mediator;


+        public IStringLocalizer _localizer { get; set; }


+        private readonly IWebHostEnvironment _hostEnvironment;
+
+        private readonly IRepository _repository;
+
+        private readonly IEasyCachingProvider _provider;
+        private readonly QCCommon _qCCommon;
+        public StudyController(IMapper mapper, IStringLocalizer localizer, IUserInfo userInfo, IWebHostEnvironment hostEnvironment, IMediator mediator, IEasyCachingProvider provider,
+             QCCommon qCCommon,
+            IRepository repository)
+        {
+            _qCCommon = qCCommon;
+            _provider = provider;
+            _hostEnvironment = hostEnvironment;
+            _mediator = mediator;
+            _localizer = localizer;
+            _mapper = mapper;
+            _userInfo = userInfo;
+            _repository = repository;
+        }
+
+
+        [HttpPost, Route("Study/PreArchiveStudy")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
+             [FromServices] IStudyService _studyService,
+             [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
+        {
+
+            if (_provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddFixedFiled).Value == null)
+            {
+                await _mediator.Send(new AnonymizeCacheRequest());
+            }
+
+            var savedInfo = _studyService.GetSaveToDicomInfo(preArchiveStudyCommand.SubjectVisitId);
+
+            var studyMonitor = new StudyMonitor()
+            {
+                TrialId = savedInfo.TrialId,
+                SubjectId = savedInfo.SubjectId,
+                SubjectVisitId = savedInfo.SubjectVisitId,
+
+                IsSuccess = false,
+                UploadStartTime = DateTime.Now,
+                IsDicom = preArchiveStudyCommand.IsDicom,
+                IP = _userInfo.IP
+            };
+
+
+            var addEntity = await _studyMonitorRepository.AddAsync(studyMonitor, true);
+
+            return ResponseOutput.Ok(addEntity.Id);
+
+        }


        /// <summary>Dicom 归档</summary>
@@ -246,8 +298,9 @@ namespace IRaCIS.Core.API.Controllers
        [DisableFormValueModelBinding]
        [DisableRequestSizeLimit]
        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        public async Task<IResponseOutput> ArchiveStudyNew(Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId, Guid studyMonitorId,
+        public async Task<IResponseOutput> ArchiveStudyNew(/*[FromForm] ArchiveStudyCommand archiveStudyCommand,*/ Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId, Guid studyMonitorId,
             [FromServices] ILogger<UploadDownLoadController> _logger,
+             [FromServices] IEasyCachingProvider _provider,
             [FromServices] IStudyService _studyService,
             [FromServices] IHubContext<UploadHub, IUploadClient> _uploadHub,
             [FromServices] IDicomArchiveService _dicomArchiveService,
@@ -272,6 +325,22 @@ namespace IRaCIS.Core.API.Controllers
            var startTime = DateTime.Now;


+            if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}") && _provider.Get<Guid>($"StudyUid_{trialId}_{studyInstanceUid}").Value == _userInfo.Id)
+            {
+                _provider.Set($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}", _userInfo.Id, TimeSpan.FromMinutes(30));
+            }
+
+
+
+            //if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}"))
+            //{
+            //    //---当前已有人正在上传和归档该检查!
+            //    return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress"));
+            //}
+            //else
+            //{
+            //    _provider.Set($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}", _userInfo.Id, TimeSpan.FromMinutes(30));
+            //}

            //到了接口，代表上传结束了

@@ -337,12 +406,13 @@ namespace IRaCIS.Core.API.Controllers
            }
            catch (Exception)
            {
+                _provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}");

                //---请求异常,请重试！
                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_RequestError"]);
            }

-            studyMonitor.FileSize = (long)HttpContext.Request.ContentLength;
+            studyMonitor.FileSize = (decimal)HttpContext.Request.ContentLength;
            studyMonitor.FileCount = archiveResult.ReceivedFileCount;
            studyMonitor.FailedFileCount = archiveResult.ErrorFiles.Count;
            studyMonitor.IsDicomReUpload = archiveStudyCommand.AbandonStudyId != null;
@@ -375,6 +445,7 @@ namespace IRaCIS.Core.API.Controllers
            }
            finally
            {
+                _provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}");

                studyMonitor.StudyId = archiveResult.ArchivedDicomStudies.FirstOrDefault()?.Id ?? Guid.Empty;
                studyMonitor.StudyCode = archiveResult.ArchivedDicomStudies.FirstOrDefault()?.StudyCode;
@@ -394,26 +465,12 @@ namespace IRaCIS.Core.API.Controllers

        public class UploadNoneDicomFileCommand
        {
-            [NotDefault]
+            public Guid TrialId { get; set; }
            public Guid SubjectVisitId { get; set; }
-
-
-            [NotDefault]
+            public Guid NoneDicomStudyId { get; set; }
            public Guid StudyMonitorId { get; set; }


-            public Guid? NoneDicomStudyId { get; set; }
-
-            //IR 上传的时候跟任务绑定
-            public Guid? VisitTaskId { get; set; }
-
-            public string RecordPath { get; set; }
-
-            public int FailedFileCount { get; set; }
-
-            public long FileSize { get; set; }
-
-
            public List<OSSFileDTO> UploadedFileList { get; set; } = new List<OSSFileDTO>();


@@ -427,56 +484,18 @@ namespace IRaCIS.Core.API.Controllers
            }
        }

-        /// <summary>
-        /// 非dicom 上传预上传接口
-        /// </summary>
-        /// <param name="preArchiveStudyCommand"></param>
-        /// <param name="_studyService"></param>
-        /// <param name="_studyMonitorRepository"></param>
-        /// <returns></returns>
-        [HttpPost, Route("Study/PreArchiveStudy")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
-     [FromServices] IStudyService _studyService,
-     [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
-        {
-
-            var savedInfo = _studyService.GetSaveToDicomInfo(preArchiveStudyCommand.SubjectVisitId);
-
-            var studyMonitor = new StudyMonitor()
-            {
-                TrialId = savedInfo.TrialId,
-                SubjectId = savedInfo.SubjectId,
-                SubjectVisitId = savedInfo.SubjectVisitId,
-
-                IsSuccess = false,
-                UploadStartTime = DateTime.Now,
-                FileCount=preArchiveStudyCommand.FileCount,
-                IsDicom = preArchiveStudyCommand.IsDicom,
-                IP = _userInfo.IP
-            };
-
-
-            var addEntity = await _studyMonitorRepository.AddAsync(studyMonitor, true);
-
-            return ResponseOutput.Ok(addEntity.Id);
-
-        }
        /// <summary>
        /// 上传非Dicom 文件 支持压缩包 多文件上传
        /// </summary>
        /// <param name="incommand"></param>
        /// <param name="_noneDicomStudyRepository"></param>
        /// <param name="_studyMonitorRepository"></param>
-        /// <param name="_noneDicomStudyFileRepository"></param>
        /// <returns></returns>
        [HttpPost("NoneDicomStudy/UploadNoneDicomFile")]
        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]

        public async Task<IResponseOutput> UploadNoneDicomFile(UploadNoneDicomFileCommand incommand,
-            [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository,
-            [FromServices] IRepository<StudyMonitor> _studyMonitorRepository,
-            [FromServices] IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository)
+            [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository, [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
        {

            var subjectVisitId = incommand.SubjectVisitId;
@@ -484,9 +503,9 @@ namespace IRaCIS.Core.API.Controllers
            var noneDicomStudyId = incommand.NoneDicomStudyId;


-            await _qCCommon.VerifyIsCRCSubmmitAsync(_subjectVisitRepository, _userInfo, subjectVisitId);
+            await _qCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId);

-            var sv = (await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.TrialSiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException();
+            var sv = (await _repository.Where<SubjectVisit>(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.TrialSiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException();

            var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == studyMonitorId);

@@ -494,39 +513,26 @@ namespace IRaCIS.Core.API.Controllers

            foreach (var item in incommand.UploadedFileList)
            {
-                //如果是跟任务绑，那么NoneDicomStudyId 设置为空，不影响之前的检查，同时设置 OriginNoneDicomStudyId 保证关系
-
-                if (incommand.VisitTaskId != null && incommand.VisitTaskId != Guid.Empty)
-                {
-                    await _noneDicomStudyFileRepository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, OriginNoneDicomStudyId = noneDicomStudyId.Value, VisitTaskId = incommand.VisitTaskId, FileType = item.FileType, FileSize = item.FileFize });
-
-                }
-                else
-                {
-                    await _noneDicomStudyFileRepository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId.Value, FileType = item.FileType, FileSize = item.FileFize });
-
-                }
-
+                await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId,FileType=item.FileType });

            }
            var uploadFinishedTime = DateTime.Now;

            var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync((t => t.Id == noneDicomStudyId));

-            noneDicomStudy.FileCount = noneDicomStudy.FileCount + (incommand.VisitTaskId != null ? 0 : incommand.UploadedFileList.Count);
+            noneDicomStudy.FileCount = noneDicomStudy.FileCount + incommand.UploadedFileList.Count;

-            studyMonitor.RecordPath = incommand.RecordPath;
-            studyMonitor.FailedFileCount = incommand.FailedFileCount;
-            studyMonitor.IsSuccess = incommand.FailedFileCount == 0;
+            studyMonitor.FileCount = incommand.UploadedFileList.Count;
            studyMonitor.FileSize = incommand.UploadedFileList.Sum(t => t.FileFize);
            studyMonitor.IsDicom = false;
            studyMonitor.IsDicomReUpload = false;
-            studyMonitor.StudyId = noneDicomStudyId.Value;
+            studyMonitor.StudyId = noneDicomStudyId;
            studyMonitor.StudyCode = noneDicomStudy.StudyCode;
            studyMonitor.ArchiveFinishedTime = DateTime.Now;
            studyMonitor.IP = _userInfo.IP;
+            studyMonitor.IsSuccess = true;

-            await _noneDicomStudyRepository.SaveChangesAsync();
+            await _repository.SaveChangesAsync();

            return ResponseOutput.Ok();
        }
@@ -540,13 +546,12 @@ namespace IRaCIS.Core.API.Controllers
        /// </summary>
        /// <param name="trialId"></param>
        /// <param name="oSSService"></param>
-        /// <param name="_inspectionFileRepository"></param>
        /// <returns></returns>
        /// <exception cref="BusinessValidationFailedException"></exception>
        [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")]
        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]

-        public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService, [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
+        public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService)
        {

            var fileName = string.Empty;
@@ -556,9 +561,9 @@ namespace IRaCIS.Core.API.Controllers
            {
                fileName = realFileName;

-                if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".xls"))
+                if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".csv") && !fileName.EndsWith(".xls"))
                {
-                    //---支持.xlsx、.xls格式的文件上传。
+                    //---支持.xlsx、.xls、.csv格式的文件上传。
                    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_SupportedFormats"]);
                }

@@ -568,7 +573,7 @@ namespace IRaCIS.Core.API.Controllers

                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/Check", realFileName);

-                await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
+                await _repository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });

                return ossRelativePath;

@@ -738,16 +743,11 @@ namespace IRaCIS.Core.API.Controllers
                    //---请保证上传数据符合模板文件中的样式，且存在有效数据。
                    return ResponseOutput.NotOk(_localizer["UploadDownLoad_InvalidData"]);
                }
+
            }


-
-            // 适合获取结果的
-            //var client = _mediator.CreateRequestClient<ConsistenCheckCommand>();
-            //await client.GetResponse<ConsistenCheckResult>(new ConsistenCheckCommand() { ETCList = etcCheckList, TrialId = trialId });
-
-            //不获取结果，不用定义返回类型
-            await _mediator.Send(new ConsistenCheckCommand() { ETCList = etcCheckList, TrialId = trialId });
+            await _mediator.Send(new ConsistencyVerificationRequest() { ETCList = etcCheckList, TrialId = trialId });

            return ResponseOutput.Ok();

@@ -889,6 +889,89 @@ namespace IRaCIS.Core.API.Controllers



+        #region 废弃
+
+        /// <summary>
+        /// 下载多个医生的所有附件
+        /// </summary>
+        /// <param name="doctorIds"></param>
+        /// <returns></returns>
+        [Obsolete]
+        [HttpPost, Route("file/downloadDoctorAttachments")]
+        public async Task<IResponseOutput<UploadFileInfoDTO>> DownloadAttachment(Guid[] doctorIds)
+        {
+
+            var path = await _fileService.CreateDoctorsAllAttachmentZip(doctorIds);
+
+            return ResponseOutput.Ok(new UploadFileInfoDTO
+            {
+                FilePath = path,
+                FullFilePath = path + "?access_token=" + HttpContext.Request.Headers["Authorization"].ToString().Substring(7)
+
+            });
+        }
+
+        /// <summary>
+        /// 下载指定医生的指定附件
+        /// </summary>
+        /// <param name="doctorId">医生Id</param>
+        /// <param name="attachmentIds">要下载的附件Id</param>
+        /// <returns></returns>
+        [HttpPost, Route("file/downloadByAttachmentId/{doctorId}")]
+        [Obsolete]
+        public async Task<IResponseOutput<UploadFileInfoDTO>> DownloadAttachmentById(Guid doctorId, Guid[] attachmentIds)
+        {
+            var path = await _fileService.CreateZipPackageByAttachment(doctorId, attachmentIds);
+            return ResponseOutput.Ok(new UploadFileInfoDTO
+            {
+                FilePath = await _fileService.CreateZipPackageByAttachment(doctorId, attachmentIds),
+                FullFilePath = path + "?access_token=" + HttpContext.Request.Headers["Authorization"].ToString().Substring(7)
+            });
+        }
+
+
+        /// <summary>
+        /// 下载医生官方简历   首页 区分 中文和英文
+        /// </summary>
+        /// <param name="language"></param>
+        /// <param name="doctorIds"></param>
+        /// <returns></returns>
+        [HttpPost, Route("file/downloadOfficialCV/{language}")]
+        [Obsolete]
+        public async Task<IResponseOutput<UploadFileInfoDTO>> DownloadOfficialResume(int language, Guid[] doctorIds)
+        {
+
+            var path = await _fileService.CreateDoctorsAllAttachmentZip(doctorIds);
+            return ResponseOutput.Ok(new UploadFileInfoDTO
+            {
+                FilePath = await _fileService.CreateOfficialResumeZip(language, doctorIds),
+                FullFilePath = path + "?access_token=" + HttpContext.Request.Headers["Authorization"].ToString().Substring(7)
+            });
+        }
+
+
+
+
+        /// <summary>
+        /// 入组 项目下载简历
+        /// </summary>
+        /// <param name="language"></param>
+        /// <param name="trialId"></param>
+        /// <param name="doctorIdArray"></param>
+        /// <returns></returns>
+        [HttpPost, Route("enroll/downloadResume/{trialId:guid}/{language}")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [AllowAnonymous]
+        [Obsolete]
+        public async Task<IResponseOutput<string>> DownloadResume(int language, Guid trialId, Guid[] doctorIdArray)
+        {
+            var zipPath = await _fileService.CreateOfficialResumeZip(language, doctorIdArray);
+
+            return ResponseOutput.Ok(zipPath);
+        }
+        #endregion
+
+
    }
    #endregion

@@ -981,18 +1064,18 @@ namespace IRaCIS.Core.API.Controllers
            }
            var generateUserTypeList = new List<string>() { "CRC", "CRA" };

-            //if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))
-            //{
-            //    //用户类型仅能为 CRC,SR,CRA 请核查Excel数据
-            //    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidUserType"]);
-            //}
+            if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))
+            {
+                //用户类型仅能为 CRC,SR,CRA 请核查Excel数据
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidUserType"]);
+            }
            if (excelList.Count == 0)
            {
                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_NoValiddata"]);
            }
            //处理好 用户类型  和用户类型枚举
            var sysUserTypeList = _usertypeRepository.Where(t => t.UserTypeEnum == UserTypeEnum.CRA || t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { UserTypeId = t.Id, t.UserTypeEnum }).ToList();
-            var siteList = _trialSiteRepository.Where(t => t.TrialId == trialId && siteCodeList.Contains(t.TrialSiteCode)).Select(t => new { t.TrialSiteCode, TrialSiteId = t.Id }).ToList();
+            var siteList = _trialSiteRepository.Where(t => t.TrialId == trialId && siteCodeList.Contains(t.TrialSiteCode)).Select(t => new { t.TrialSiteCode, TrialSiteId= t.Id }).ToList();

            foreach (var item in excelList)
            {
@@ -1016,9 +1099,9 @@ namespace IRaCIS.Core.API.Controllers
                item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.ToUpper() == item.TrialSiteCode.ToUpper()).TrialSiteId;
            }

-            var list = excelList.Where(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA).ToList();

-            await _trialSiteSurveyService.ImportGenerateAccountAndJoinTrialAsync(trialId, baseUrl, routeUrl, list);
+
+            await _trialSiteSurveyService.ImportGenerateAccountAndJoinTrialAsync(trialId, baseUrl, routeUrl, excelList.ToList());

            return ResponseOutput.Ok();

@@ -0,0 +1,107 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <SignAssembly>false</SignAssembly>
+    <UserSecretsId>354572d4-9e15-4099-807c-63a2d29ff9f2</UserSecretsId>
+    <LangVersion>default</LangVersion>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>.\IRaCIS.Core.API.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591;</NoWarn>
+    <OutputPath>..\bin\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\IRaCIS.Core.API.xml</DocumentationFile>
+    <OutputPath>bin\Release\</OutputPath>
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Controllers\ReviewerApi\**" />
+    <Compile Remove="UploadFile\**" />
+    <Content Remove="Controllers\ReviewerApi\**" />
+    <Content Remove="UploadFile\**" />
+    <EmbeddedResource Remove="Controllers\ReviewerApi\**" />
+    <EmbeddedResource Remove="UploadFile\**" />
+    <None Remove="Controllers\ReviewerApi\**" />
+    <None Remove="UploadFile\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Remove="web.config" />
+    <Content Remove="wwwroot\swagger\ui\abp.js" />
+    <Content Remove="wwwroot\swagger\ui\abp.swagger.js" />
+    <Content Remove="wwwroot\swagger\ui\Index.html" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove=".preview.jpg" />
+    <None Remove="GrpcToken.proto" />
+    <None Remove="IRaCIS.Core.API.xml" />
+    <None Remove="Protos\GrpcToken.proto" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ApplicationDefinition Include="GrpcToken.proto" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="wwwroot\swagger\ui\abp.js" />
+    <EmbeddedResource Include="wwwroot\swagger\ui\abp.swagger.js" />
+    <EmbeddedResource Include="wwwroot\swagger\ui\Index.html" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Protobuf Include="Protos\GrpcToken.proto">
+      <GrpcServices>Client</GrpcServices>
+    </Protobuf>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AspNetCoreRateLimit" Version="4.0.1" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
+    <PackageReference Include="EasyCaching.InMemory" Version="1.4.1" />
+    <PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.4.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.19.1" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.41.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.42.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Hangfire.Tags.SqlServer" Version="1.8.0" />
+    <PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
+    <PackageReference Include="LogDashboard" Version="1.4.8" />
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+    <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.1.4" />
+    <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\IRaCIS.Core.Application\IRaCIS.Core.Application.csproj" />
+    <ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\PublishProfiles\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="NLog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ProjectExtensions><VisualStudio><UserProperties anonymizetagsetting_1json__JsonSchema="http://json.schemastore.org/jovo-language-model" /></VisualStudio></ProjectExtensions>
+
+
+</Project>
@@ -1,112 +1,159 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<SignAssembly>false</SignAssembly>
-		<UserSecretsId>354572d4-9e15-4099-807c-63a2d29ff9f2</UserSecretsId>
-		<LangVersion>default</LangVersion>
-		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<Version>1.0.1.001</Version>
-		<Company>上海展影医疗科技有限公司</Company>
-		<Product>IRC影像系统 (EICS)</Product>
-		<Copyright>上海展影医疗科技有限公司版权所有</Copyright>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <SignAssembly>false</SignAssembly>
+    <UserSecretsId>354572d4-9e15-4099-807c-63a2d29ff9f2</UserSecretsId>
+    <LangVersion>default</LangVersion>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <Version>1.0.1.001</Version>
+    <Company>上海展影医疗科技有限公司</Company>
+    <Product>IRC影像系统 (EICS)</Product>
+    <Copyright>上海展影医疗科技有限公司版权所有</Copyright>
+  </PropertyGroup>

-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-		<DocumentationFile>.\IRaCIS.Core.API.xml</DocumentationFile>
-		<NoWarn>1701;1702;1591;1570;</NoWarn>
-		<OutputPath>..\bin\</OutputPath>
-	</PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>.\IRaCIS.Core.API.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591;1570;</NoWarn>
+    <OutputPath>..\bin\</OutputPath>
+  </PropertyGroup>

-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-		<DocumentationFile>bin\Release\IRaCIS.Core.API.xml</DocumentationFile>
-		<OutputPath>bin\Release\</OutputPath>
-		<NoWarn>1701;1702;1591</NoWarn>
-	</PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\IRaCIS.Core.API.xml</DocumentationFile>
+    <OutputPath>bin\Release\</OutputPath>
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>



-	<ItemGroup>
-		<Content Remove="web.config" />
-		<Content Remove="wwwroot\swagger\ui\abp.js" />
-		<Content Remove="wwwroot\swagger\ui\abp.swagger.js" />
-		<Content Remove="wwwroot\swagger\ui\Index.html" />
-	</ItemGroup>
+  <ItemGroup>
+    <Content Remove="web.config" />
+    <Content Remove="wwwroot\swagger\ui\abp.js" />
+    <Content Remove="wwwroot\swagger\ui\abp.swagger.js" />
+    <Content Remove="wwwroot\swagger\ui\Index.html" />
+  </ItemGroup>

-	<ItemGroup>
-		<None Remove=".preview.jpg" />
-		<None Remove="GrpcToken.proto" />
-		<None Remove="IRaCIS.Core.API.xml" />
-		<None Remove="Protos\GrpcToken.proto" />
-	</ItemGroup>
+  <ItemGroup>
+    <None Remove=".preview.jpg" />
+    <None Remove="GrpcToken.proto" />
+    <None Remove="IRaCIS.Core.API.xml" />
+    <None Remove="Protos\GrpcToken.proto" />
+  </ItemGroup>

-	<ItemGroup>
-		<ApplicationDefinition Include="GrpcToken.proto" />
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Include="wwwroot\swagger\ui\abp.js">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</EmbeddedResource>
-		<EmbeddedResource Include="wwwroot\swagger\ui\abp.swagger.js">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</EmbeddedResource>
-		<EmbeddedResource Include="wwwroot\swagger\ui\Index.html">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</EmbeddedResource>
-	</ItemGroup>
-	<ItemGroup>
-		<Protobuf Include="Protos\GrpcToken.proto">
-			<GrpcServices>Client</GrpcServices>
-		</Protobuf>
-	</ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="GrpcToken.proto" />
+  </ItemGroup>
+<ItemGroup>
+    <EmbeddedResource Include="wwwroot\swagger\ui\abp.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="wwwroot\swagger\ui\abp.swagger.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="wwwroot\swagger\ui\Index.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Protobuf Include="Protos\GrpcToken.proto">
+      <GrpcServices>Client</GrpcServices>
+    </Protobuf>
+  </ItemGroup>

-	<ItemGroup>
-		<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+  <ItemGroup>
+    <PackageReference Include="aliyun-net-sdk-sts" Version="3.1.2" />
+    <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+	<PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.9.2" />
+	<PackageReference Include="EasyCaching.Serialization.MessagePack" Version="1.9.2">
+	  <TreatAsUsed>true</TreatAsUsed>
+	</PackageReference>
+	  <PackageReference Include="Hangfire.AspNetCore" Version="1.8.12" />
+	  <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
+	  <PackageReference Include="Hangfire.SqlServer" Version="1.8.12" />
+    <PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
+    <PackageReference Include="LogDashboard" Version="1.4.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
+  </ItemGroup>

-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="ConfigMapFileProvider" Version="2.0.1" />
-		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.14" />
-		<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
-		<PackageReference Include="Hangfire.InMemory" Version="0.10.3" />
-		<PackageReference Include="Hangfire.SqlServer" Version="1.8.14" />
-		<PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
-		<PackageReference Include="LogDashboard" Version="1.4.8" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-		<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
-		<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.1" />
-		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.3" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\IRaCIS.Core.Application\IRaCIS.Core.Application.csproj" />
+    <ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
+  </ItemGroup>

-	<ItemGroup>
-		<ProjectReference Include="..\IRaCIS.Core.Application\IRaCIS.Core.Application.csproj" />
-		<ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>

-	<ItemGroup>
-		<None Include="..\.editorconfig" Link=".editorconfig" />
-	</ItemGroup>
+  <ItemGroup>
+    <Content Update="wwwroot\EmailTemplate\AdminAddUser_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\AdminResetUser_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\AdminResetUser.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\SubjectEnrollConfirmOrPDProgress_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialDoctorExistJoin_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialDoctorFirstJoin.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialSiteSurveyReject.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialSiteSurveyReject_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialDoctorExistJoin.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialUserExistJoin_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialUserExistJoin.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\AdminAddUser.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialDoctorFirstJoin_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\SubjectEnrollConfirmOrPDProgress.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialUserFirstJoin_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\UserOptCommon_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\UserOptCommon.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialUserFirstJoin.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>

-	<ItemGroup>
-		<Folder Include="Properties\PublishProfiles\" />
-	</ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\PublishProfiles\" />
+  </ItemGroup>

-	<ItemGroup>
-	  <Content Update="appsettings.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	</ItemGroup>
-
-	<ProjectExtensions>
-		<VisualStudio>
-			<UserProperties properties_4launchsettings_1json__JsonSchema="" />
-		</VisualStudio>
-	</ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>


 </Project>
@@ -29,7 +29,7 @@
            <param name="doctorId"></param>
            <returns></returns>
        </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,IRaCIS.Core.Application.Service.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Application.Service.IMailVerificationService)">
+        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,EasyCaching.Core.IEasyCachingProvider,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},IRaCIS.Application.Services.IMailVerificationService)">
            <summary>  系统用户登录接口[New] </summary>
        </member>
        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})">
@@ -41,7 +41,7 @@
            <param name="param"></param>
            <returns>新记录Id</returns>
        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.WorkLoadAddOrUpdate(IRaCIS.Core.Application.Service.IDoctorWorkloadService,IRaCIS.Application.Contracts.WorkloadCommand)">
+        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.WorkLoadAddOrUpdate(IRaCIS.Application.Services.IDoctorWorkloadService,IRaCIS.Application.Contracts.WorkloadCommand)">
            <summary>
            添加或更新工作量[AUTH]
            </summary>
@@ -167,13 +167,6 @@
            <param name="opt"></param>
            <returns></returns>
        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SignConsistencyAnalysisReadingClinicalData(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SignConsistencyAnalysisReadingClinicalDataInDto})">
-            <summary>
-            PM签名一致性分析临床数据
-            </summary>
-            <param name="opt"></param>
-            <returns></returns>
-        </member>
        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitClinicalFormAndSign(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SubmitClinicalFormInDto})">
            <summary>
            提交结构化录入并签名
@@ -278,35 +271,24 @@
        <member name="M:IRaCIS.Core.API.Controllers.UploadBaseController.DicomFileUploadAsync(System.Func{System.String,System.IO.Stream,System.Int32,System.Threading.Tasks.Task},System.String)">
            <summary>  流式上传   Dicom上传  </summary>
        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.ArchiveStudyNew(System.Guid,System.Guid,System.String,System.Nullable{System.Guid},System.Guid,Microsoft.Extensions.Logging.ILogger{IRaCIS.Core.API.Controllers.UploadDownLoadController},IRaCIS.Core.Application.Contracts.IStudyService,Microsoft.AspNetCore.SignalR.IHubContext{IRaCIS.Core.API.UploadHub,IRaCIS.Core.API.IUploadClient},IRaCIS.Core.Application.Contracts.Dicom.IDicomArchiveService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.ArchiveStudyNew(System.Guid,System.Guid,System.String,System.Nullable{System.Guid},System.Guid,Microsoft.Extensions.Logging.ILogger{IRaCIS.Core.API.Controllers.UploadDownLoadController},EasyCaching.Core.IEasyCachingProvider,IRaCIS.Core.Application.Contracts.IStudyService,Microsoft.AspNetCore.SignalR.IHubContext{IRaCIS.Core.API.UploadHub,IRaCIS.Core.API.IUploadClient},IRaCIS.Core.Application.Contracts.Dicom.IDicomArchiveService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
            <summary>Dicom 归档</summary>
        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.PreArchiveStudy(IRaCIS.Core.Application.Contracts.PreArchiveStudyCommand,IRaCIS.Core.Application.Contracts.IStudyService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
-            <summary>
-            非dicom 上传预上传接口
-            </summary>
-            <param name="preArchiveStudyCommand"></param>
-            <param name="_studyService"></param>
-            <param name="_studyMonitorRepository"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFileCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile})">
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFileCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
            <summary>
            上传非Dicom 文件 支持压缩包 多文件上传
            </summary>
            <param name="incommand"></param>
            <param name="_noneDicomStudyRepository"></param>
            <param name="_studyMonitorRepository"></param>
-            <param name="_noneDicomStudyFileRepository"></param>
            <returns></returns>
        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitCheckExcel(System.Guid,IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.InspectionFile})">
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitCheckExcel(System.Guid,IRaCIS.Core.Application.Helper.IOSSService)">
            <summary>
            一致性核查 excel上传 支持三种格式
            </summary>
            <param name="trialId"></param>
            <param name="oSSService"></param>
-            <param name="_inspectionFileRepository"></param>
            <returns></returns>
            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
        </member>
@@ -337,6 +319,38 @@
            <param name="_attachmentrepository"></param>
            <returns></returns>
        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadAttachment(System.Guid[])">
+            <summary>
+            下载多个医生的所有附件
+            </summary>
+            <param name="doctorIds"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadAttachmentById(System.Guid,System.Guid[])">
+            <summary>
+            下载指定医生的指定附件
+            </summary>
+            <param name="doctorId">医生Id</param>
+            <param name="attachmentIds">要下载的附件Id</param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadOfficialResume(System.Int32,System.Guid[])">
+            <summary>
+            下载医生官方简历   首页 区分 中文和英文
+            </summary>
+            <param name="language"></param>
+            <param name="doctorIds"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadResume(System.Int32,System.Guid,System.Guid[])">
+            <summary>
+            入组 项目下载简历
+            </summary>
+            <param name="language"></param>
+            <param name="trialId"></param>
+            <param name="doctorIdArray"></param>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadCommonFile(System.String,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument})">
            <summary>  通用文件下载 </summary>
        </member>
@@ -362,11 +376,6 @@
            序列化，反序列化的时候，处理时间 时区转换
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.API.JSONTimeZoneConverter.#ctor(Microsoft.AspNetCore.Http.IHttpContextAccessor)">
-            <summary>
-            序列化，反序列化的时候，处理时间 时区转换
-            </summary>
-        </member>
        <member name="M:IRaCIS.Core.API.NullToEmptyStringResolver.CreateProperties(System.Type,Newtonsoft.Json.MemberSerialization)">
            <summary>
            创建属性
@@ -375,6 +384,18 @@
            <param name="memberSerialization">序列化成员</param>
            <returns></returns>
        </member>
+        <member name="M:IRaCIS.WX.CoreApi.Auth.AuthMiddleware.Invoke(Microsoft.AspNetCore.Http.HttpContext)">
+             <summary>
+            为了前端 一段时间无操作，需要重新登陆
+             </summary>
+             <param name="httpContext"></param>
+             <returns></returns>
+        </member>
+        <member name="T:TimeZoneAdjustmentMiddleware">
+            <summary>
+            废弃，没用
+            </summary>
+        </member>
        <member name="T:ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt.CustomHSJWTService">
            <summary>
            对称可逆加密
@@ -0,0 +1,118 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+/// <summary>
+/// 废弃，没用
+/// </summary>
+public class TimeZoneAdjustmentMiddleware
+{
+    private readonly RequestDelegate _next;
+
+    public TimeZoneAdjustmentMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext context)
+    {
+        if (string.IsNullOrEmpty(context.Request.ContentType))
+        {
+            // 请求没有内容体，可能是一个没有请求体的请求，比如 GET 请求
+            await _next(context);
+            return;
+        }
+        
+
+        var timeZoneId = "Asia/Shanghai"; // 客户端默认时区
+
+        var timeZoneIdHeaderValue = context.Request.Headers["TimeZoneId"];
+
+        if (!string.IsNullOrEmpty(timeZoneIdHeaderValue))
+        {
+            timeZoneId = timeZoneIdHeaderValue;
+        }
+
+        var timeZone = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+
+
+
+        // 处理 JSON 请求体中的时间字段
+        if (context.Request.ContentType.StartsWith("application/json"))
+        {
+            var requestBody = await new StreamReader(context.Request.Body).ReadToEndAsync();
+
+            // 使用 JSON.NET 或 System.Text.Json 解析 JSON 请求体
+            // 假设请求体中有一个名为 "dateTime" 的时间字段
+            dynamic jsonData = JsonConvert.DeserializeObject(requestBody);
+
+            if (jsonData.dateTime != null)
+            {
+                if (DateTime.TryParse((string)jsonData.dateTime, out DateTime dateTime))
+                {
+                    // 将 JSON 请求体中的时间字段转换为服务器时区的时间
+                    var serverTime = TimeZoneInfo.ConvertTime(dateTime, timeZone);
+                    jsonData.dateTime = serverTime;
+                }
+            }
+
+            // 将修改后的 JSON 请求体重新写入请求流中
+            var jsonBytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(jsonData));
+            context.Request.Body = new MemoryStream(jsonBytes);
+            context.Request.ContentLength = jsonBytes.Length;
+        }
+
+
+        // 处理 URL 表单参数
+        var modifiedQuery = new Dictionary<string, StringValues>();
+
+        foreach (var key in context.Request.Query.Keys)
+        {
+            if (DateTime.TryParse(context.Request.Query[key], out DateTime dateTime))
+            {
+                // 将 URL 表单参数中的时间转换为服务器时区的时间
+                var serverTime = TimeZoneInfo.ConvertTime(dateTime, timeZone);
+                modifiedQuery[key] = new StringValues(serverTime.ToString());
+            }
+            else
+            {
+                modifiedQuery[key] = context.Request.Query[key];
+            }
+        }
+
+        context.Request.Query = new QueryCollection(modifiedQuery);
+
+        // 处理Form请求体中的参数
+        if (context.Request.HasFormContentType)
+        {
+            var modifiedForm = new Dictionary<string, StringValues>();
+
+            foreach (var key in context.Request.Form.Keys)
+            {
+                if (DateTime.TryParse(context.Request.Form[key], out DateTime dateTime))
+                {
+                    // 将请求体中的时间转换为服务器时区的时间
+                    var serverTime = TimeZoneInfo.ConvertTime(dateTime, timeZone);
+                    modifiedForm[key] = new StringValues(serverTime.ToString());
+                }
+                else
+                {
+                    modifiedForm[key] = context.Request.Form[key];
+                }
+            }
+
+            var newFormCollection = new FormCollection(modifiedForm);
+
+            // 将新的表单集合设置回请求对象
+            context.Request.Form = newFormCollection;
+        }
+
+        await _next(context);
+    }
+
+}
@@ -4,6 +4,8 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Configuration;
 using Serilog;
+using MediatR;
+using IRaCIS.Core.Application.MediatR.Handlers;
 using System.Threading.Tasks;
 using MassTransit;
 using MassTransit.NewIdProviders;
@@ -20,24 +22,14 @@ using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using IRaCIS.Core.Application.Filter;
 using Microsoft.AspNetCore.HttpOverrides;
-using IRaCIS.Core.Application.Service.BackGroundJob;
+using IRaCIS.Application.Services.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 Newtonsoft.Json;
-using Microsoft.AspNetCore.Diagnostics;
-using IRaCIS.Core.Application.MassTransit.Command;
-using IRaCIS.Core.Application.MassTransit.Consumer;
-using DocumentFormat.OpenXml.InkML;
-using IRaCIS.Core.Domain;

-AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
+
 #region 获取环境变量
 //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
 var config = new ConfigurationBuilder()
@@ -84,8 +76,8 @@ if (urlsIndex > -1)

 NewId.SetProcessIdProvider(new CurrentProcessIdProvider());

-builder.Configuration.AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), "appsettings.json", false, true)
-                     .AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), $"appsettings.{enviromentName}.json", false, true);
+builder.Configuration.AddJsonFile("appsettings.json", false, true)
+                     .AddJsonFile($"appsettings.{enviromentName}.json", false, true);

 builder.Host
            .UseServiceProviderFactory(new AutofacServiceProviderFactory())
@@ -112,9 +104,11 @@ builder.Services.AddControllers(options =>
    options.Filters.Add<ModelActionFilter>();
    options.Filters.Add<ProjectExceptionFilter>();
    options.Filters.Add<UnitOfWorkFilter>();
-    //options.Filters.Add<EncreptApiResultFilter>(10);
-    options.Filters.Add<LimitUserRequestAuthorization>();

+    if (_configuration.GetSection("BasicSystemConfig").GetValue<bool>("OpenLoginLimit"))
+    {
+        options.Filters.Add<LimitUserRequestAuthorization>();
+    }

 })
    .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
@@ -123,10 +117,6 @@ builder.Services.AddOptions().Configure<SystemEmailSendConfig>(_configuration.Ge
 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  省掉控制器代码
@@ -134,7 +124,7 @@ builder.Services.AddDynamicWebApiSetup();
 //AutoMapper
 builder.Services.AddAutoMapperSetup();
 //EF ORM  QueryWithNoLock
-builder.Services.AddEFSetup(_configuration, enviromentName);
+builder.Services.AddEFSetup(_configuration);
 //Http 响应压缩
 builder.Services.AddResponseCompressionSetup();
 //Swagger Api 文档
@@ -143,45 +133,9 @@ builder.Services.AddSwaggerSetup();
 builder.Services.AddJWTAuthSetup(_configuration);

 // MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
-//builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
-
-#region MassTransit
-//masstransit组件 也支持MediatR 中介者模式，但是支持分布式，考虑后续，所以在次替代MediatR
-//参考链接：https://masstransit.io/documentation/concepts/mediator#scoped-mediator
-builder.Services.AddMediator(cfg =>
-{
-    cfg.AddConsumer<ConsistencyCheckConsumer>();
-    cfg.AddConsumer<AddSubjectTriggerConsumer>();
-    cfg.AddConsumer<AddSubjectTriggerConsumer2>();
-    //cfg.ConfigureMediator((context, cfg) => cfg.UseHttpContextScopeFilter(context));
-});
-
-//添加 MassTransit 和 InMemory 传输
-builder.Services.AddMassTransit(cfg =>
-{
-    // 注册消费者
-    cfg.AddConsumer<AddSubjectTriggerConsumer>(); // 替换为你的消费者类
-    cfg.AddConsumer<AddSubjectTriggerConsumer2>();
-
-    // 使用 InMemory 作为消息传递机制
-    cfg.UsingInMemory((context, cfg) =>
-    {
-        // 这里可以进行额外的配置
-        cfg.ConfigureEndpoints(context); // 自动配置所有消费者的端点
-    });
-});
-
-#endregion
-
-
-#region FusionCache
-
-builder.Services.AddFusionCache();
-
-#endregion
-
+builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
 // EasyCaching 缓存
-//builder.Services.AddEasyCachingSetup(_configuration);
+builder.Services.AddEasyCachingSetup(_configuration);

 // hangfire  定时任务框架  有界面，更友好~
 builder.Services.AddhangfireSetup(_configuration);
@@ -209,9 +163,6 @@ 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();
@@ -235,60 +186,9 @@ var env = app.Environment;

 #region 配置中间件

-app.UseMiddleware<EncryptionRequestMiddleware>();

 // Configure the HTTP request pipeline.

-#region 异常处理  全局业务异常已统一处理了，非业务错误会来到这里  400 -500状态码
-
-
-//app.UseStatusCodePagesWithReExecute("/Error/{0}");
-
-app.UseStatusCodePages(async context =>
-{
-    var code = context.HttpContext.Response.StatusCode;
-    context.HttpContext.Response.ContentType = "application/json";
-    if (code < 500)
-    {
-        await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk($"Client error, actual request error status code({code})")));
-    }
-    else
-    {
-        //ResultFilter 里面的异常并不会到这里
-        await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject((ResponseOutput.NotOk($"Server error , actual request error status code({code})"))));
-    }
-
-});
-
-//app.UseExceptionHandler(o => { });
-
-//这里没生效，原因未知，官方文档也是这种写法，也用了GlobalExceptionHandler 尝试，还是不行，怀疑框架bug
-//app.UseExceptionHandler(configure =>
-//{
-//    configure.Run(async context =>
-//    {
-//        var exceptionHandlerPathFeature = context.Features.Get<IExceptionHandlerPathFeature>();
-//var ex = exceptionHandlerPathFeature?.Error;
-//context.Response.ContentType = "application/json";
-
-//if (ex != null)
-//{
-//    var errorInfo = $"Exception: {ex.Message}[{ex.StackTrace}]" + (ex.InnerException != null ? $" InnerException: {ex.InnerException.Message}[{ex.InnerException.StackTrace}]" : "");
-
-//    await context.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk($"{ex?.Message}")));
-
-//    Log.Logger.Error(errorInfo);
-
-
-//}
-
-//    });
-//});
-
-
-
-#endregion
-
 //本地化
 app.UseLocalization();

@@ -297,11 +197,12 @@ app.UseForwardedHeaders();
 //响应压缩
 app.UseResponseCompression();

+//app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());

 //不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
 app.UseStaticFiles();

-
+app.UseMiddleware<MultiDiskStaticFilesMiddleware>();

 //LogDashboard
 app.UseLogDashboard("/LogDashboard");
@@ -309,24 +210,22 @@ app.UseLogDashboard("/LogDashboard");
 //hangfire
 app.UseHangfireConfig(env);

-#region 暂时废弃

-//app.UseMiddleware<MultiDiskStaticFilesMiddleware>();
 ////限流 中间件
 //app.UseIpRateLimiting();
-//if (env.IsDevelopment())
-//{
-//    app.UseDeveloperExceptionPage();
-//}
-//else
-//{
-//    //app.UseHsts();
-//}
-#endregion
-


+if (env.IsDevelopment())
+{
+    app.UseDeveloperExceptionPage();
+}
+else
+{
+    //app.UseHsts();
+}

+// 特殊异常处理 比如 404 
+app.UseStatusCodePagesWithReExecute("/Error/{0}");

 SwaggerSetup.Configure(app, env);

@@ -396,6 +295,10 @@ try
    //Log.Logger.Warning($"ContentRootPath——xx：{Path.GetDirectoryName(Path.GetDirectoryName(env.ContentRootPath))}");


+
+
+    var server = DicomServerFactory.Create<CStoreSCPService>(11112,userState: app.Services);
+
    app.Run();

 }
@@ -24,14 +24,6 @@
      },
      "applicationUrl": "http://localhost:6100"
    },
-    "IRaCIS.Test_IRC_PGSQL": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Test_IRC_PGSQL"
-      },
-      "applicationUrl": "http://localhost:6100"
-    },
    "IRaCIS.Event_IRC": {
      "commandName": "Project",
      "launchBrowser": true,
@@ -1,4 +1,5 @@
-using IRaCIS.Core.Domain.Share;
+using EasyCaching.Core;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.SignalR;
@@ -0,0 +1,66 @@
+using System;
+using System.IdentityModel.Tokens.Jwt;
+using System.Net;
+using System.Threading.Tasks;
+using EasyCaching.Core;
+using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Http;
+
+namespace IRaCIS.WX.CoreApi.Auth
+{
+    public class AuthMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private readonly IEasyCachingProvider _provider;
+        public AuthMiddleware(RequestDelegate next, IEasyCachingProvider provider)
+        {
+            _next = next;
+            _provider = provider;
+        }
+        /// <summary>
+        ///为了前端 一段时间无操作，需要重新登陆
+        /// </summary>
+        /// <param name="httpContext"></param>
+        /// <returns></returns>
+        public async Task Invoke(HttpContext httpContext)
+        {
+           
+            var isLogin = httpContext.Request.Path.ToString().ToLower().Contains("login");
+            
+            var result = await httpContext.AuthenticateAsync(JwtBearerDefaults.AuthenticationScheme);
+
+            if (!isLogin)
+            {
+                if (!result.Succeeded)
+                {
+                    httpContext.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+                    await httpContext.Response.WriteAsync("Unauthorized");
+                }
+                else
+                {
+                    var toekn = result.Properties.Items[".Token.access_token"];
+                    var jwtHandler = new JwtSecurityTokenHandler();
+                    JwtSecurityToken jwtToken = jwtHandler.ReadJwtToken(toekn);
+                    object userId;
+                    jwtToken.Payload.TryGetValue("id", out userId);
+
+                    var cacheValueExist = await _provider.ExistsAsync(userId.ToString()); //Get<string>(userId.ToString()).ToString();
+                    if (!cacheValueExist)
+                    {
+                        httpContext.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+                        await httpContext.Response.WriteAsync("Unauthorized");
+                    }
+                    else
+                    {
+                        await _provider.SetAsync(userId.ToString(), userId.ToString(), TimeSpan.FromMinutes(15));
+                        httpContext.User = result.Principal;
+                        await _next.Invoke(httpContext);
+                    }
+                }
+            }
+            else await _next.Invoke(httpContext);
+        }
+    }
+}
@@ -1,7 +1,7 @@
 using Hangfire;
 using Hangfire.Dashboard;
 using Hangfire.Dashboard.BasicAuthorization;
-using IRaCIS.Core.Application.Service.BackGroundJob;
+using IRaCIS.Application.Services.BackGroundJob;
 using IRaCIS.Core.API.Filter;
 using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Builder;
@@ -1,5 +1,4 @@
-using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Localization;
 using System.Collections.Generic;
 using System.Globalization;
@@ -13,9 +12,8 @@ namespace IRaCIS.Core.API
        {
            var supportedCultures = new List<CultureInfo>
            {
-                
-                new CultureInfo(StaticData.CultureInfo.en_US),
-                new CultureInfo(StaticData.CultureInfo.zh_CN)
+                new CultureInfo("en-US"),
+                new CultureInfo("zh-CN")
            };

            var options = new RequestLocalizationOptions
@@ -20,20 +20,18 @@ namespace IRaCIS.Core.API
            // Set all the common properties available for every request
            diagnosticContext.Set("Host", request.Host);

-            diagnosticContext.Set("Protocol", request.Protocol);
-            diagnosticContext.Set("Scheme", request.Scheme);
-
-            #region old 未用
            //这种获取的Ip不准 配置服务才行
            //diagnosticContext.Set("RequestIP", httpContext.Connection.RemoteIpAddress.ToString());

            //这种方式可以，但是serilog提供了 就不用了
            //diagnosticContext.Set("TestIP", httpContext.GetUserIp());

+            diagnosticContext.Set("Protocol", request.Protocol);
+            diagnosticContext.Set("Scheme", request.Scheme);
+
            //这种方式不行 读取的body为空字符串  必须在中间件中读取
            //diagnosticContext.Set("RequestBody", await ReadRequestBody(httpContext.Request));
            //diagnosticContext.Set("RequestBody", RequestPayload);
-            #endregion

            // Only set it if available. You're not sending sensitive data in a querystring right?!
            if (request.QueryString.HasValue)
@@ -1,6 +1,5 @@
 using AutoMapper.EquivalencyExpression;
 using IRaCIS.Core.Application.Service;
-using IRaCIS.Core.Domain.Models;
 using Microsoft.Extensions.DependencyInjection;

 namespace IRaCIS.Core.API
@@ -15,16 +14,11 @@ namespace IRaCIS.Core.API
                //AutoMapper.Collection.EntityFrameworkCore
                automapper.AddCollectionMappers();

-
-                // 全局忽略 DomainEvents 属性
-                automapper.AddGlobalIgnore(nameof(Entity.DomainEvents));
-                automapper.AddGlobalIgnore(nameof(Entity.DomainCommands));
-
                #region 会使  IncludeMembers 失效 不能全局使用
                //mapping an EntityFramework Core DbContext-object.
                //automapper.UseEntityFrameworkCoreModel<IRaCISDBContext>(services);

-
+                
                //automapper.ForAllMaps((a, b) => b.ForAllMembers(opt => opt.Condition((src, dest, srcMember, desMenber) =>
                //{
                //    //// Can test  When Guid? -> Guid  if source is null  will change to Guid.Empty
@@ -33,7 +27,7 @@ namespace IRaCIS.Core.API
                //    // not want to map a null Guid? value to db Guid value
                //})));
                #endregion
-
+            
            }, typeof(QCConfig).Assembly);


@@ -1,4 +1,5 @@
 using Autofac;
+using Autofac.Extras.DynamicProxy;
 using IRaCIS.Core.Application;
 using IRaCIS.Core.Application.BackGroundJob;
 using IRaCIS.Core.Infra.EFCore;
@@ -9,7 +10,8 @@ using System.Linq;
 using System.Reflection;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Service;
+using MediatR;
+using IRaCIS.Application.Services;
 using IRaCIS.Application.Interfaces;
 using AutoMapper;

@@ -49,12 +51,12 @@ namespace IRaCIS.Core.API

            Assembly application = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "IRaCIS.Core.Application.dll");
            containerBuilder.RegisterAssemblyTypes(application).Where(t => t.FullName.Contains("Service"))
-                .PropertiesAutowired().AsImplementedInterfaces();
+                .PropertiesAutowired().AsImplementedInterfaces().EnableClassInterceptors();



-            //containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
-            //containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
+            containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
+            containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();


           //注册hangfire任务  依赖注入
@@ -1,68 +1,31 @@
-using EntityFramework.Exceptions.SqlServer;
-using Hangfire.SqlServer;
+using Hangfire.SqlServer;
 using IRaCIS.Core.Application.Triggers;
-using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Infra.EFCore.Interceptor;
 using Medallion.Threading;
 using Medallion.Threading.SqlServer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-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)
        {
-
-            services.AddHttpContextAccessor();
-            services.AddScoped<IUserInfo, UserInfo>();
-            services.AddScoped<ISaveChangesInterceptor, AuditEntityInterceptor>();
-            services.AddScoped<ISaveChangesInterceptor, DispatchDomainEventsInterceptor>();
-
-
-            // First, register a pooling context factory as a Singleton service, as usual:
+            //services.AddScoped<DbContext, IRaCISDBContext>();

            //这个注入没有成功--注入是没问题的，构造函数也只是支持参数就好，错在注入的地方不能写DbContext
            //Web程序中通过重用池中DbContext实例可提高高并发场景下的吞吐量， 这在概念上类似于ADO.NET Provider原生的连接池操作方式，具有节省DbContext实例化成本的优点
-            services.AddDbContext<IRaCISDBContext>((sp, options) =>
+            services.AddDbContext<IRaCISDBContext>(options =>
            {
-
-                // 在控制台
-                //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 ;
-                if (!string.IsNullOrWhiteSpace(dbType) && dbType == "pgsql")
-                {
-                    options.UseNpgsql(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
-
-                }
-                else
-                {
-                    options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
-                }
-
-
-                //迁移的时候，不生成外键
-                options.ReplaceService<IMigrationsSqlGenerator, NoForeignKeyMigrationsSqlGenerator>();
-
-
-                options.UseLoggerFactory(logFactory);
-
-                options.UseExceptionProcessor();
+                options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, 
+                    contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());

                options.EnableSensitiveDataLogging();

                options.AddInterceptors(new QueryWithNoLockDbCommandInterceptor());
-                options.AddInterceptors(sp.GetServices<ISaveChangesInterceptor>());

                options.UseProjectables();

@@ -75,15 +38,18 @@ namespace IRaCIS.Core.API

                options.UseTriggers(triggerOptions =>
                {
-                    triggerOptions.AddTrigger<SubjectTrigger>();
-                    triggerOptions.AddTrigger<ChallengeStateTrigger>();   
+                    triggerOptions.AddTrigger<AddSubjectTrigger>();
+                    triggerOptions.AddTrigger<ChallengeStateTrigger>();
+                    triggerOptions.AddTrigger<SubjectStateTrigger>();
+                    triggerOptions.AddTrigger<AddCRCCliniaclDataTrigger>();
+                    triggerOptions.AddTrigger<SubjectVisitCheckPassedTrigger>();
+                    triggerOptions.AddTrigger<SubjectVisitFinalVisitTrigger>();
                    triggerOptions.AddTrigger<SubjectVisitTrigger>();
-                    triggerOptions.AddTrigger<SubjectVisitScanDateTrigger>();
                    triggerOptions.AddTrigger<TrialCriterionSignTrigger>();
                    triggerOptions.AddTrigger<TableQuestionRowTrigger>();
                    //triggerOptions.AddTrigger<AddlTrialUserTrigger>();
                    triggerOptions.AddTrigger<VisitTaskIsFrontTaskNeedSignButNotSignTrigger>();
-                    triggerOptions.AddTrigger<JudgeVisitTaskTrigger>();
+                    triggerOptions.AddTrigger<VisitTaskIbeforeTrigger>();

                    triggerOptions.AddTrigger<UserLogTrigger>();

@@ -96,12 +62,6 @@ namespace IRaCIS.Core.API

            });

-            // Register an additional context factory as a Scoped service, which gets a pooled context from the Singleton factory we registered above,
-            //services.AddScoped<IRaCISDBScopedFactory>();
-
-            //// Finally, arrange for a context to get injected from our Scoped factory:
-            //services.AddScoped(sp => sp.GetRequiredService<IRaCISDBScopedFactory>().CreateDbContext());
-
            //注意区分 easy caching 也有  IDistributedLockProvider
            services.AddSingleton<IDistributedLockProvider>(sp =>
            {
@@ -1,4 +1,7 @@
-using Microsoft.Extensions.Configuration;
+using EasyCaching.Core;
+using EasyCaching.Core.Configurations;
+using EasyCaching.Interceptor.Castle;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

 namespace IRaCIS.Core.API
@@ -7,18 +10,18 @@ namespace IRaCIS.Core.API
    {
        public static void AddEasyCachingSetup(this IServiceCollection services, IConfiguration configuration)
        {
-            //services.AddEasyCaching(options =>
-            //{
-            //    options.UseInMemory();
+            services.AddEasyCaching(options =>
+            {
+                options.UseInMemory();

-            //    //options.UseRedis(configuration, EasyCachingConstValue.DefaultRedisName).WithMessagePack(EasyCachingConstValue.DefaultRedisName); 
+                //options.UseRedis(configuration, EasyCachingConstValue.DefaultRedisName).WithMessagePack(EasyCachingConstValue.DefaultRedisName); 


-            //});
+            });

-            ////services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultRedisName);
+            //services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultRedisName);

-            //services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultInMemoryName);
+            services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultInMemoryName);
        }
    }
 }
@@ -11,41 +11,19 @@ namespace IRaCIS.Core.API
    /// <summary>
    /// 序列化，反序列化的时候，处理时间 时区转换
    /// </summary>
-    public class JSONTimeZoneConverter(IHttpContextAccessor _httpContextAccessor) : DateTimeConverterBase
+    public class JSONTimeZoneConverter : DateTimeConverterBase
    {
+        private readonly IHttpContextAccessor _httpContextAccessor;

-        private  TimeZoneInfo _clientTimeZone;
-
-        private  string _dateFormat;
-
-
-
-        public override bool CanConvert(Type objectType)
+        private readonly TimeZoneInfo _clientTimeZone;
+        public JSONTimeZoneConverter(IHttpContextAccessor httpContextAccessor)
        {
-            #region 设置语言格式化方式，放在构造函数里面做不到动态切换
-
-
-            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-
-            if (!isEn_US)
-            {
-                // Chinese date format
-                _dateFormat = "yyyy-MM-dd HH:mm:ss";
-            }
-            else
-            {
-                // Default or English date format
-                //_dateFormat = "MM/dd/yyyy HH:mm:ss";
-
-                _dateFormat = "yyyy-MM-dd HH:mm:ss";
-            }
-
-            #endregion
-
-            #region 获取当前请求的客户端时区
+            _httpContextAccessor = httpContextAccessor;

+            //默认是UTC
            //var timeZoneId = "Etc/UTC";
            var timeZoneId = "Asia/Shanghai";
+
            var timeZoneIdHeader = _httpContextAccessor?.HttpContext?.Request?.Headers["TimeZoneId"];

            if (timeZoneIdHeader is not null && !string.IsNullOrEmpty(timeZoneIdHeader.Value))
@@ -55,12 +33,12 @@ namespace IRaCIS.Core.API

            _clientTimeZone = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);

-            #endregion
-
+        }

+        public override bool CanConvert(Type objectType)
+        {
            // 仅支持 DateTime 类型的转换
            return objectType == typeof(DateTime)|| objectType == typeof(DateTime?);
-
        }

        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -113,10 +91,7 @@ namespace IRaCIS.Core.API
            {
                //第一个参数默认使用系统本地时区 也就是应用服务器的时区
                DateTime clientZoneTime = TimeZoneInfo.ConvertTime(nullableDateTime.Value, _clientTimeZone);
-
-                //writer.WriteValue(clientZoneTime);
-
-                writer.WriteValue(clientZoneTime.ToString(_dateFormat));
+                writer.WriteValue(clientZoneTime);
            }
            else
            {
@@ -1,99 +0,0 @@
-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
-{
-
-
-    //public class CustomContractResolver : DefaultContractResolver
-    //{
-    //    protected override JsonContract CreateContract(Type objectType)
-    //    {
-    //        var contract = base.CreateContract(objectType);
-
-    //        // 检查类是否有 LowercaseJsonAttribute 标记
-    //        if (objectType.GetCustomAttribute<LowerCamelCaseJsonAttribute>() != null)
-    //        {
-    //            contract.NamingStrategy = new IRCCamelCaseNamingStrategy();
-    //        }
-
-    //        return contract;
-    //    }
-    //}
-
-
-
-    #region 废弃
-
-    public class MyDateTimeConverter : JsonConverter<DateTime>
-    {
-        public override DateTime ReadJson(JsonReader reader, Type objectType, DateTime existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            return reader.ReadAsDateTime().Value;
-        }
-
-        public override void WriteJson(JsonWriter writer, DateTime value, JsonSerializer serializer)
-        {
-            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-
-            string dateFormat;
-            if (!isEn_US)
-            {
-                // Chinese date format
-                dateFormat = "yyyy-MM-dd HH:mm:ss";
-            }
-            else
-            {
-                // Default or English date format
-                dateFormat = "MM/dd/yyyy HH:mm:ss";
-            }
-
-            writer.WriteValue(value.ToString(dateFormat));
-
-        }
-    }
-
-    public class MyNullableDateTimeConverter : JsonConverter<DateTime?>
-    {
-        public override DateTime? ReadJson(JsonReader reader, Type objectType, DateTime? existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            var val = reader.ReadAsDateTime();
-            return val;
-        }
-
-        public override void WriteJson(JsonWriter writer, DateTime? value, JsonSerializer serializer)
-        {
-            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-
-            string dateFormat;
-            if (!isEn_US)
-            {
-                // Chinese date format
-                dateFormat = "yyyy-MM-dd HH:mm:ss";
-            }
-            else
-            {
-                // Default or English date format
-                dateFormat = "MM/dd/yyyy HH:mm:ss";
-            }
-
-            if (value.HasValue)
-            {
-                writer.WriteValue(value.Value.ToString(dateFormat));
-
-            }
-            else
-            {
-                writer.WriteValue(default(DateTime?));
-            }
-
-        }
-    }
-
-    #endregion
-}
@@ -1,16 +1,10 @@

 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
 {
@@ -18,43 +12,34 @@ namespace IRaCIS.Core.API
    {
        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder, IServiceCollection services)
        {
-
            services.AddHttpContextAccessor();
            services.AddScoped<JSONTimeZoneConverter>();
-            services.AddScoped<ObjectStorePathConvert>();
-            services.AddScoped<IOSSService, OSSService>();
-
-
+            services.AddScoped<CustomStringConverter>();
+            services.AddScoped<IOSSService,OSSService>();

            builder.AddNewtonsoftJson(options =>
             {
-
-                 //大驼峰
-                 //options.SerializerSettings.ContractResolver = new DefaultContractResolver();
-                 //小驼峰
-                 //options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
-
-
-
+                 //options.SerializerSettings.PreserveReferencesHandling = PreserveReferencesHandling.Objects;
                 // 忽略循环引用
                 options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+                 //options.SerializerSettings.TypeNameHandling = TypeNameHandling.All;

                 //处理返回给前端  可空类型 给出默认值 比如in? 为null 设置 默认值0
-                 options.SerializerSettings.ContractResolver = new NullToEmptyStringResolver();
-
-                 // 设置时间格式 isEn_US? "MM/dd/yyyy HH:mm:ss" :
-                 //options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
+                 options.SerializerSettings.ContractResolver = new NullToEmptyStringResolver(); //new DefaultContractResolver();// new NullToEmptyStringResolver();
+                                                                                                // 设置时间格式
+                 options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";

                 options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;

+                 //options.SerializerSettings.Converters.Add(new JSONCustomDateConverter()) ;

-                 //二者只能取其一
-                 //options.SerializerSettings.Converters.Add(new MyDateTimeConverter());
-                 //options.SerializerSettings.Converters.Add(new MyNullableDateTimeConverter());
-
-                 //必须放在后面
                 options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<JSONTimeZoneConverter>());

+                 //options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<CustomStringConverter>());
+
+
+                 //IsoDateTimeConverter
+                 //options.SerializerSettings.NullValueHandling = NullValueHandling.Ignore;

             })
                .AddControllersAsServices()//动态webApi属性注入需要
@@ -1,10 +1,8 @@
-using IRaCIS.Core.Infrastructure.NewtonsoftJson;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;

 namespace IRaCIS.Core.API
 {
@@ -32,20 +30,8 @@ namespace IRaCIS.Core.API

        protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
        {
-            // 检查类是否有 LowerCamelCaseJsonAttribute 标记  有的话，属性名小写
-            if (type.GetCustomAttribute<LowerCamelCaseJsonAttribute>() != null)
-            {
-                base.NamingStrategy= new LowerCamelCaseNamingStrategy();
-            }
-            else
-            {
-                base.NamingStrategy = null;
-            }
-
-
            IList<JsonProperty> properties = base.CreateProperties(type, memberSerialization);

-
            var list= type.GetProperties()
                .Select(p =>
                {
@@ -9,13 +9,15 @@ using System.Text.RegularExpressions;

 namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
 {
-    public class ObjectStorePathConvert : JsonConverter<string>
+    public class CustomStringConverter : JsonConverter<string>
    {
+        //private readonly IHttpContextAccessor _httpContextAccessor;
        private readonly IOSSService _oSSService;

        // 构造函数
-        public ObjectStorePathConvert( IOSSService oSSService)
+        public CustomStringConverter(/*IHttpContextAccessor httpContextAccessor*/ IOSSService oSSService)
        {
+            //_httpContextAccessor = httpContextAccessor;
            _oSSService = oSSService;
        }

@@ -1,30 +1,18 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.Extensions.DependencyInjection;
-using System.IO.Compression;

 namespace IRaCIS.Core.API
 {
-    public static class ResponseCompressionSetup
+    public  static class ResponseCompressionSetup
    {
        public static void AddResponseCompressionSetup(this IServiceCollection services)
        {
            services.AddResponseCompression(options =>
            {
-                options.EnableForHttps = true;
                options.Providers.Add<BrotliCompressionProvider>();
                options.Providers.Add<GzipCompressionProvider>();
            });
-
-            services.Configure<BrotliCompressionProviderOptions>(options =>
-            {
-                options.Level = CompressionLevel.Optimal;
-            });
-
-            services.Configure<GzipCompressionProviderOptions>(options =>
-            {
-                options.Level = CompressionLevel.Optimal;
-            });
        }
    }
 }
@@ -31,13 +31,13 @@ namespace IRaCIS.Core.API

                    logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("LocalIP", httpContext.Connection.LocalIpAddress.MapToIPv4().ToString()));

-                    logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("TokenUserRealName", httpContext?.User?.FindFirst(ClaimAttributes.RealName)?.Value));
-                    logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("TokenUserType", httpContext?.User?.FindFirst(JwtIRaCISClaimType.UserTypeShortName)?.Value));
-

                    //这样读取没用
                    //logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("RequestBody", await ReadRequestBody(httpContext.Request)));
                    //logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("RequestIP", IPHelper.GetIP(httpContext.Request) ));
+                    logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("TokenUserRealName", httpContext?.User?.FindFirst(ClaimAttributes.RealName)?.Value));
+                    logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("TokenUserType", httpContext?.User?.FindFirst(JwtIRaCISClaimType.UserTypeShortName)?.Value));
+
                    //logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("Referer", httpContext.Request.Headers["Referer"].ToString()));
                    //logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("request_path", httpContext.Request.Path));
                    //logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("request_method", httpContext.Request.Method));
@@ -3,7 +3,6 @@ using Hangfire.SqlServer;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
-using System.Runtime.InteropServices;

 namespace IRaCIS.Core.API
 {
@@ -15,29 +14,19 @@ namespace IRaCIS.Core.API

            services.AddHangfire(hangFireConfig =>
            {
-                //本地window 调试 使用内存，服务器部署使用数据库，防止服务器任务调度到本地
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+
+                //hangFireConfig.UseInMemoryStorage();
+
+                //指定存储介质
+                hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()
                {
-                    hangFireConfig.UseInMemoryStorage();
-
-                }
-                else
-                {
-                    //指定存储介质
-                    hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()
-                    {
-                        SchemaName = "dbo",
-                        CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
-                        SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
-                        QueuePollInterval = TimeSpan.Zero,
-                        UseRecommendedIsolationLevel = true,
-                        DisableGlobalLocks = true
-                    });
-                }
-
-
-
-             
+                    SchemaName = "dbo",
+                    CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
+                    SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
+                    QueuePollInterval = TimeSpan.Zero,
+                    UseRecommendedIsolationLevel = true,
+                    DisableGlobalLocks = true
+                });

                //hangFireConfig.UseTagsWithSql(); //nuget引入Hangfire.Tags.SqlServer
                //.UseHangfireHttpJob();
@@ -13,16 +13,15 @@
  "ObjectStoreService": {
    "ObjectStoreUse": "AliyunOSS",
    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
-      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
-      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
-      "BucketName": "zy-irc-store",
-      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
+      "regionId": "cn-shanghai",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-irc-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
    },
    "MinIO": {
      "endpoint": "http://192.168.3.68",
@@ -48,11 +47,7 @@

    "ContinuousReadingTimeMin": 120,

-    "ReadingRestTimeMin": 10,
-
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90
+    "ReadingRestTimeMin": 10
  },
  "SystemEmailSendConfig": {
    "Port": 465,
@@ -64,8 +59,7 @@
    "CompanyName": "Extensive Imaging",
    "CompanyNameCN": "上海展影医疗科技有限公司",
    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false
+    "CompanyShortNameCN": "展影医疗"
  }


@@ -15,16 +15,15 @@
  "ObjectStoreService": {
    "ObjectStoreUse": "AliyunOSS",
    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
-      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
-      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
-      "BucketName": "zy-irc-store",
-      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
+      "regionId": "cn-shanghai",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-irc-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
    },
    "MinIO": {
      "endpoint": "http://192.168.3.68",
@@ -50,10 +49,8 @@

    "ContinuousReadingTimeMin": 120,

-    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
+    "ReadingRestTimeMin": 10

-    "ChangePassWordDays": 90
  },

  "SystemEmailSendConfig": {
@@ -68,12 +65,6 @@
    "CompanyName": "Extensive Imaging",
    "CompanyNameCN": "上海展影医疗科技有限公司",
    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false
-  },
-  "SystemPacsConfig": {
-    "Port": "11113",
-    "IP": "101.132.193.237"
+    "CompanyShortNameCN": "展影医疗"
  }
-
 }
@@ -9,6 +9,7 @@
  "ConnectionStrings": {
    "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
    "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+
  },

  "ObjectStoreService": {
@@ -16,36 +17,33 @@
    "ObjectStoreUse": "AliyunOSS",

    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      "BucketName": "zy-irc-test-store",
-      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
+      "regionId": "cn-shanghai",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-irc-test-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
    },
    "MinIO": {
-      "EndPoint": "hir-oss.test.extimaging.com",
-      "Port": "443",
-      "UseSSL": true,
-      "AccessKey": "fbStsVYCIPKHQneeqMwD",
-      "SecretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      "BucketName": "irc-test",
-      "ViewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
+      "endPoint": "hir-oss.test.extimaging.com",
+      "port": "443",
+      "useSSL": true,
+      "accessKey": "fbStsVYCIPKHQneeqMwD",
+      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      "bucketName": "irc-test",
+      "viewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
    },
+
    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": true,
+      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
+      "secretKey": "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",
+      "bucketName": "ei-irc-test-store",
+      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
    }
  },

@@ -69,10 +67,7 @@

    "ContinuousReadingTimeMin": 120,

-    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90
+    "ReadingRestTimeMin": 10
  },

  "SystemEmailSendConfig": {
@@ -81,6 +76,7 @@
    "FromEmail": "test@extimaging.com",
    "FromName": "Test_IRC",
    "AuthorizationCode": "SHzyyl2021",
+
    "SiteUrl": "http://irc.test.extimaging.com/login",

    "OrganizationName": "Extlmaging",
@@ -88,12 +84,7 @@
    "CompanyName": "Extensive Imaging",
    "CompanyNameCN": "上海展影医疗科技有限公司",
    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false
-  },
-
-  "SystemPacsConfig": {
-    "Port": "11113",
-    "IP": "106.14.89.110"
+    "CompanyShortNameCN": "展影医疗"
  }
+
 }
@@ -1,95 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "Db_Type": "pgsql",
-    "RemoteNew": "Host=106.14.89.110;Port=5432;Username=sa;Password=pgsql_pwd;Database=Test2_PG",
-    "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-
-  "ObjectStoreService": {
-
-    "ObjectStoreUse": "AliyunOSS",
-
-    "AliyunOSS": {
-      "regionId": "cn-shanghai",
-      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
-      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
-      "bucketName": "zy-irc-test-store",
-      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
-      "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
-      "region": "oss-cn-shanghai"
-    },
-    "MinIO": {
-      "endPoint": "hir-oss.test.extimaging.com",
-      "port": "443",
-      "useSSL": true,
-      "accessKey": "fbStsVYCIPKHQneeqMwD",
-      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      "bucketName": "irc-test",
-      "viewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
-    },
-    "AWS": {
-      "endPoint": "s3.us-east-1.amazonaws.com",
-      "useSSL": true,
-      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
-      "secretKey": "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",
-      "bucketName": "ei-irc-test-store",
-      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
-    }
-  },
-
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
-
-    "LoginMaxFailCount": 5,
-
-    "LoginFailLockMinutes": 1,
-
-    "AutoLoginOutMinutes": 1,
-
-    "OpenLoginMFA": false,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.test.extimaging.com/login",
-
-    "OrganizationName": "Extlmaging",
-    "OrganizationNameCN": "Extlmaging",
-    "CompanyName": "Extensive Imaging",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗"
-  },
-
-  "SystemPacsConfig": {
-    "Port": "11113",
-    "IP": "106.14.89.110"
-  }
-}
@@ -26,15 +26,12 @@
    },

    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": true,
+      "accessKey": "AKIAW3MEAFJX5P32P6NA",
+      "secretKey": "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",
+      "bucketName": "ei-med-s3-lili-store",
+      "viewEndpoint": "https://ei-med-s3-lili-store.s3.amazonaws.com/"
    }
  },
  "BasicSystemConfig": {
@@ -50,14 +47,14 @@
    "LoginMaxFailCount": 5,

    "LoginFailLockMinutes": 30,
+
    "AutoLoginOutMinutes": 60,

    "ContinuousReadingTimeMin": 120,

    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,

-    "ChangePassWordDays": 90
+    "OpenLoginMFA": false
  },

  "SystemEmailSendConfig": {
@@ -73,13 +70,7 @@
    "CompanyNameCN": "上海展影医疗科技有限公司",
    "CompanyShortName": "Elevate Imaging",
    "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.elevateimaging.ai/login",
-    "IsEnv_US": true
-  },
-
-  "SystemPacsConfig": {
-    "Port": "104",
-    "IP": "44.210.231.169"
+    "SiteUrl": "https://lili.elevateimaging.ai/login"
  }

 }
@@ -13,7 +13,19 @@

  "ObjectStoreService": {

-    "ObjectStoreUse": "AWS",
+    "ObjectStoreUse": "MinIO",
+    "AliyunOSS": {
+      "regionId": "cn-shanghai",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-irc-test-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
+    },
+
    "MinIO": {
      //"endPoint": "hir-oss.uat.extimaging.com",
      //"port": "443",
@@ -32,26 +44,23 @@
    },

    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": true,
+      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
+      "secretKey": "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",
+      "bucketName": "ei-irc-test-store",
+      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
    }
  },
  "BasicSystemConfig": {

-    "OpenUserComplexPassword": true,
+    "OpenUserComplexPassword": false,

-    "OpenSignDocumentBeforeWork": true,
+    "OpenSignDocumentBeforeWork": false,

    "OpenTrialRelationDelete": true,

-    "OpenLoginLimit": true,
+    "OpenLoginLimit": false,

    "LoginMaxFailCount": 5,

@@ -60,12 +69,7 @@

    "ContinuousReadingTimeMin": 120,

-    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90,
-
-    "OpenLoginMFA": true
+    "ReadingRestTimeMin": 10
  },

  "SystemEmailSendConfig": {
@@ -81,13 +85,7 @@
    "CompanyNameCN": "上海展影医疗科技有限公司",
    "CompanyShortName": "Elevate Imaging",
    "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.test.elevateimaging.ai/login",
-    "IsEnv_US": true
-  },
-
-  "SystemPacsConfig": {
-    "Port": "104",
-    "IP": "3.226.182.187"
+    "SiteUrl": "https://lili.test.elevateimaging.ai/login"
  }

 }
@@ -7,11 +7,11 @@
    }
  },
  "ConnectionStrings": {
-    //"RemoteNew": "Server=us-mssql-service,1433;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    //"Hangfire": "Server=us-mssql-service,1433;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=us-mssql-service,1433;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=us-mssql-service,1433;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"

-    "RemoteNew": "Server=3.226.182.187,1435;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=3.226.182.187,1435;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    //"RemoteNew": "Server=3.226.182.187,1435;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    //"Hangfire": "Server=3.226.182.187,1435;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
  },

  "ObjectStoreService": {
@@ -36,22 +36,19 @@
    },

    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/",
-      "DurationSeconds": 7200
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": true,
+      "accessKey": "AKIAW3MEAFJXUO6XYFYN",
+      "secretKey": "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",
+      "bucketName": "ei-med-s3-lili-uat-store",
+      "viewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/"
    }
  },
  "BasicSystemConfig": {

-    "OpenUserComplexPassword": true,
+    "OpenUserComplexPassword": false,

-    "OpenSignDocumentBeforeWork": true,
+    "OpenSignDocumentBeforeWork": false,

    "OpenTrialRelationDelete": true,

@@ -65,11 +62,8 @@
    "ContinuousReadingTimeMin": 120,

    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,

-    "ChangePassWordDays": 90,
-
-    "OpenLoginMFA": false
+    "OpenLoginMFA": true
  },

  "SystemEmailSendConfig": {
@@ -85,13 +79,7 @@
    "CompanyNameCN": "上海展影医疗科技有限公司",
    "CompanyShortName": "Elevate Imaging",
    "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.test.elevateimaging.ai/login",
-    "IsEnv_US": true
-  },
-
-  "SystemPacsConfig": {
-    "Port": "104",
-    "IP": "3.226.182.187"
+    "SiteUrl": "https://lili.test.elevateimaging.ai/login"
  }

 }
@@ -15,41 +15,29 @@
    "ObjectStoreUse": "AliyunOSS",

    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      "BucketName": "zy-irc-uat-store",
-      "ViewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
+      "regionId": "cn-shanghai",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-irc-uat-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
    },

    "MinIO": {
      "endPoint": "hir-oss.uat.extimaging.com",
-      "port": "80",
-      "useSSL": false,
-      "viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
-      //"port": "443",
-      //"useSSL": true,
-      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
+      //"port": "80",
+      //"useSSL": false,
+      //"viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
+      "port": "443",
+      "useSSL": true,
+      "viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
      "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
      "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
      "bucketName": "irc-uat"

-    },
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/sts_s3_upload",
-      "AccessKeyId": "AKIAW3MEAFJXWRCGSX5Z",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/",
-      "DurationSeconds": 7200
    }
  },

@@ -68,10 +56,7 @@

    "ContinuousReadingTimeMin": 120,

-    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90
+    "ReadingRestTimeMin": 10

  },
  "SystemEmailSendConfig": {
@@ -86,13 +71,8 @@
    "CompanyName": "Extensive Imaging",
    "CompanyNameCN": "上海展影医疗科技有限公司",
    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false
-  },
-
-  "SystemPacsConfig": {
-    "Port": "11113",
-    "IP": "47.117.164.182"
+    "CompanyShortNameCN": "展影医疗"
  }

+
 }
@@ -43,6 +43,40 @@
      }
    ]
  },
+  "easycaching": {
+    "inmemory": {
+      "MaxRdSecond": 120,
+      "EnableLogging": false,
+      "LockMs": 5000,
+      "SleepMs": 300,
+      "DBConfig": {
+        "SizeLimit": 10000,
+        "ExpirationScanFrequency": 60,
+        "EnableReadDeepClone": true,
+        "EnableWriteDeepClone": false
+      }
+    },
+    "redis": {
+      "MaxRdSecond": 120,
+      "EnableLogging": false,
+      "LockMs": 5000,
+      "SleepMs": 300,
+      "dbconfig": {
+        "Password": "xc@123456",
+        "IsSsl": false,
+        "SslHost": null,
+        "ConnectionTimeout": 5000,
+        "AllowAdmin": true,
+        "Endpoints": [
+          {
+            "Host": "47.117.164.182",
+            "Port": 6379
+          }
+        ],
+        "Database": 0
+      }
+    }
+  },
  "IRaCISImageStore": {
    "SwitchingMode": "RemainingDiskCapacity",
    "SwitchingRatio": 80,
@@ -54,17 +88,9 @@
    "QCChallengeCodePrefix": "Q",
    "NoneDicomStudyCodePrefix": "NST",
    "DicomStudyCodePrefix": "ST",
-    "TaskStudyCodePrefix": "P-ST",
    "SystemSiteCodePrefix": "S",
    "DefaultPassword": "123456",
+    "DefaultInternalOrganizationName": "ExtImaging",
    "ImageShareExpireDays": 10
-  },
-  "EncrypteResponseConfig": {
-    "Base64RSAPublicKey": "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0NCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBaHp3T1hYTWYyaEFkS1ZoWHczYUYNCmNaT3QycE1lcmdEaFVrOUdQK2s4VDBrUjFTRVlGVGtzNlkzaEVvL0dRTExqMHZFYVV3bTNhSFNuTTl5NmdLRWoNCmY5cTN6dkoyZzRSQjE4Z0UrTnNWWi9DMkVRZ3k5OWFiWGc5TitGREVlT0NmSjlSRTJPV3JBQ2s0V0RPbFFUdXYNCnhvR2JmcnkwVElSaFBrOGtuYkFmVkZ1and1VXJGblpJZ0ExYXhKZVZ6aDhwcmV1SEgreW1jdHp6NVo4V1pSV3kNCi9ISURHUy90dkg2NUMra2l6cUxRYUpKNHYwODMrRGpaVTBmNzNCdkk5eWt1dW1saXFzY1pvU2preDFOUFJwSkUNCkFtMVFNQ0hMRCtFdzlHT2Vsc2Mwa1ZxdjdaeEF1TkFrMkZuUURNRk1BUmZuUFd0aGVhOGZYVTJsMW9ROWs3WDcNCmN3SURBUUFCDQotLS0tLUVORCBQVUJMSUMgS0VZLS0tLS0NCg==",
-    "Base64RSAPrivateKey": "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQ0KTUlJRW9nSUJBQUtDQVFFQWh6d09YWE1mMmhBZEtWaFh3M2FGY1pPdDJwTWVyZ0RoVWs5R1ArazhUMGtSMVNFWQ0KRlRrczZZM2hFby9HUUxMajB2RWFVd20zYUhTbk05eTZnS0VqZjlxM3p2SjJnNFJCMThnRStOc1ZaL0MyRVFneQ0KOTlhYlhnOU4rRkRFZU9DZko5UkUyT1dyQUNrNFdET2xRVHV2eG9HYmZyeTBUSVJoUGs4a25iQWZWRnVqd3VVcg0KRm5aSWdBMWF4SmVWemg4cHJldUhIK3ltY3R6ejVaOFdaUld5L0hJREdTL3R2SDY1QytraXpxTFFhSko0djA4Mw0KK0RqWlUwZjczQnZJOXlrdXVtbGlxc2Nab1Nqa3gxTlBScEpFQW0xUU1DSExEK0V3OUdPZWxzYzBrVnF2N1p4QQ0KdU5BazJGblFETUZNQVJmblBXdGhlYThmWFUybDFvUTlrN1g3Y3dJREFRQUJBb0lCQUNDRFoxNi9XWWFYZmpOZA0KQ29pemU2VFJZU2llVzI5eFJic0ExVDV6YUcwVmY4U1NsdFF2Y1dWYmw2UGJUa3BxMkF4MHJDUVB2M2xOSm8vNA0KL3h3QzRlS1E1c1ZLRlFWTXJIbmhISlRxTTJ6UWVpMkJINlBuaEdZcVh0QVhOdzFxejhrSEoyQlFZM3IvN2d5Qw0KcWpZVFVCRDFRem5HeThCanlXOXVIcnNNeDVPRHRRZWxBM3B1TFd1bXZNb3Z1L2JhaDZvTGtOSHY4b0VTdzhGSQ0KTllyTUtscHhFTjZaWUdwSTl2VTZnYUhuTmhEa2ExTHlvUnZ5NnA2dTRLR0FsRTc1VXk4T0dsdncydU5uay9sdg0KSEMyYnY5TnlCRGJpSFNDY0MyK1JXUXMrN0tNWFlwYnBvTVFCR0hqV01GRHVBODFaUCs1TWYxUm9yQUpRNGxrRw0KQnRDQThva0NnWUVBeWY4alBjcFIvQ3dJNU5MYnlwb3ZUWEFHVkFKMmtWRlJVUC9HT2ZOMkFyYWMvL20wdDJ5NA0KemNYVkJZc0pJeHkvVWYxRTFJNFg3VFg3V3NBNGxVNGlPTkwzTnN4dDBEbk1PV2tKUlBPZlF1bW1JaWw5QVRiYQ0KTnRVWFNlTmRoUFFGMGlCb21acFFJYWpSN1RmUnVBbzR6dmpTLzkzeXZZY0lIWU1zM0tjR00ya0NnWUVBcTJPbg0KZlp0RmhLTElGanVlRzRrNklGTWdjbytEUUh5TTFWSUp5Tk05K1o2TEgybzI5eDJCaSs2Qm82M2NKUjQ2STZncQ0KNWUrSTBvdzZRYmNQeTZUNHFSQ0o3Ujd6MllkdEw4eXdJTkNYS3U0cC9qaFNqNWJ1TzFJWlI3ZStSV29CakNtUQ0KWFd0ZVBCbldqWVlLdVRCazROc2FXV09GTXg1QndKdUp2MjBnQ0hzQ2dZQlV4QnFYM1lWV0cyeUlDZXh1TXhIUw0KbjBZb2p2Z090MTgyYkg5VTVsUUpnM1NTL3NqVmlHeHMvYTROSzNGa0tMWW93KzNVZk9TUmlPdTRBNTQ3R1pURw0KMzlFYVQrTnRWRFBkaTdSMkdQNG1hRUp0WjVlcm9NY2w1M3BrYVdOZlhiL3JrK29STzI2UkVYVTI1UXUrL1pzbA0KVDhuTDBlb0JtdDdPODdNcHpYV09zUUtCZ0ZxVGFQSGx2RUNUY3FEbFV2S0VmRmFXOTkvelhrOFhRNnA5RjdTdA0KaHVSRDJJeDZxcC9BVlRWcGo5Tzd6MHRDaFVGUTM1THpHMkVDUU10My9uNEdLbS9XMEwyakRRWWFIeWNTeXNZYw0KMXJjV2ROVG9XU0dQaDBtTVl0WFhFbFJHNkpoMVl0a3NJL29wUVkwN21MRTBGU3dNUHdtY29jbFpKVEN3UW9VTA0KRzlHL0FvR0FWM25kcWcydnUyR0x4TlRUbm1UTWRJNFB3UzBmN0V4VnVNUnRicGZyOWhKNzlDakVNTGFXQ1FsNg0KeE43TElMTnArNVQwQW1DZVBqcitkbnJkRUNidFZPTDFybDc3Z0krRkwzaVVqYmZmMVZqa0N3M0x6K3cyb1FFdA0KbGE4aTZrL1NRK01iYkRPaWRJOVczdlN6MmlJRlZobWJiK1Q2SlZwakxqNjlkblM3eUxZPQ0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0NCg==",
-    "IsResponseEncreptEnable": true,
-    "ApiPathList": [
-      "/test/get"
-    ]
  }
 }
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                尊敬的 {0} ,您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation}为您添加了账户，账户信息如下:
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>              
+                <div>
+                    用户名: {1}
+                </div>
+                <div>
+                    角色: {2}
+                </div>
+                <div>
+                    首次登陆前，请通过该链接修改您的账户信息：
+                    <a href='{3}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        初始化账号信息
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear  {0} ,
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation} has created an account for you. The account information is as follows:
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>              
+                <div>
+                    User ID: {1}
+                </div>
+                <div>
+                    Role: {2}
+                </div>
+                <div>
+                    Before logging in for the first time, please modify the account information through this link：
+                    <a href='{3}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    Initialize account information
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                尊敬的 {0} ,您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation}将您的账户密码已重置，账户信息如下:
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    用户名: {1}
+                </div>
+                <div>
+                    角色: {2}
+                </div>
+                <div>
+                    密码: {3}
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0} ,
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation} has reset your account password, and the account information is as follows:
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    User ID: {1}
+                </div>
+                <div>
+                    Role: {2}
+                </div>
+                <div>
+                    Password: {3}
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+               您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                感谢您使用展影云平台。
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {0}。
+            </div>
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                Thank you for using {company abbreviation} Cloud System.
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {0}。
+            </div>
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                尊敬的 {0} ,您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                该项目采用电子化工作流，系统及您的账号信息如下：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    项目编号: {3}
+                </div>
+                <div>
+                    试验方案号: {2}
+                </div>
+                <div>
+                    试验名称: {1}
+                </div>
+                <div>
+                    用户名: {4}
+                </div>
+                <div>
+                    角色: {5}
+                </div>
+                <div>
+                    系统登录地址:
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        点击跳转
+                    </a>
+                </div>
+            </div>
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0},
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1} , {2}).
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                Your account information is as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {3}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {1}
+                </div>
+                <div>
+                    User ID: {4}
+                </div>
+                <div>
+                    Role: {5}
+                </div>
+                <div>
+                    Login URL: 
+					<a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        Click to login
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                尊敬的 {0} ,您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                该项目采用电子化工作流，系统及您的账号信息如下：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    项目编号: {3}
+                </div>
+                <div>
+                    试验方案号: {2}
+                </div>
+                <div>
+                    试验名称: {1}
+                </div>
+                <div>
+                    用户名: {4}
+                </div>
+                <div>
+                    角色: {5}
+                </div>
+                <div>
+                    首次登陆前，请通过该链接修改您的账户信息：
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        初始化账号信息
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0},
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                Your account information is  as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {3}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {1}
+                </div>
+                <div>
+                    User ID: {4}
+                </div>
+                <div>
+                    Role: {5}
+                </div>
+                <div>
+                    Before logging in for the first time, please modify the account information through this link：
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                     Initialize account information
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                尊敬的 {0} ,您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                您填写的中心调研表被驳回，详细信息如下：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    项目编号: {1}
+                </div>
+                <div>
+                    试验方案号: {2}
+                </div>
+                <div>
+                    试验名称: {3}
+                </div>
+                <div>
+                    中心编号: {4}
+                </div>
+                <div>
+                    中心名称: {5}
+                </div>
+                <div>
+                    驳回原因: {6}
+                </div>
+
+            </div>
+            <a href='{7}' style='margin-left:60px;font-size:14px;padding: 10px;text-decoration: none;display:{8} ;height: 40px;width: 140px;background: #00D1B2;color:#fff;border-radius: 5px;line-height: 40px;text-align: center;margin-bottom: 100px;'>
+                登陆并查看
+            </a>
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear  {0} ,
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                The site survey form you filled in has been rejected. The details are as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {1}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {3}
+                </div>
+                <div>
+                    Site ID: {4}
+                </div>
+                <div>
+                    Site name: {5}
+                </div>
+                <div>
+                    Reason for rejection: {6}
+                </div>
+
+            </div>
+            <a href='{7}' style='margin-left:60px;font-size:14px;padding: 10px;text-decoration: none;display:{8} ;height: 40px;width: 140px;background: #00D1B2;color:#fff;border-radius: 5px;line-height: 40px;text-align: center;margin-bottom: 100px;'>
+                Login and view
+            </a>
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                尊敬的 {0} ,您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                该项目采用电子化工作流，系统及您的账号信息如下：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    项目编号: {3}
+                </div>
+                <div>
+                    试验方案号: {2}
+                </div>
+                <div>
+                    试验名称: {1}
+                </div>
+                <div>
+                    用户名: {4}
+                </div>
+                <div>
+                    角色: {5}
+                </div>
+                <div>
+                    系统登录地址:
+                    <a href='{6}' style='margin-left:5px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        点击跳转
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0},
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                Your account information is as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {3}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {1}
+                </div>
+                <div>
+                    User ID: {4}
+                </div>
+                <div>
+                    Role: {5}
+                </div>
+                <div>
+                    Login URL: 
+					<a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        Click to login
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                尊敬的 {0} ,您好：
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                该项目采用电子化工作流，系统及您的账号信息如下：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    项目编号: {3}
+                </div>
+                <div>
+                    试验方案号: {2}
+                </div>
+                <div>
+                    试验名称: {1}
+                </div>
+                <div>
+                    用户名: {4}
+                </div>
+                <div>
+                    角色: {5}
+                </div>
+                <div>
+                    首次登陆前，请通过该链接修改您的账户信息：
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        初始化账号信息
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0},
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                Your account information is as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {3}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {1}
+                </div>
+                <div>
+                    User ID: {4}
+                </div>
+                <div>
+                    Role: {5}
+                </div>
+                <div>
+                    Before logging in for the first time, please modify the account information through this link：
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                     Initialize the account information
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+               {0}您好,
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                感谢您使用展影云平台。
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {1}，验证码是: <span style="font-weight:bold">{2}</span>。
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                请在3分钟内输入该验证码，进行后续操作
+            </div>
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0},
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {1}
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                The verification code is <span style="font-weight:bold">{2}</span>.
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                This code will expire in 3 minutes.
+            </div>
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
@@ -31,9 +31,9 @@ namespace IRaCIS.Core.Application.Auth
                Id = user.Id,
                FullName = user.UserName,
                RealName = user.RealName,
-                UserTypeEnum = user.UserTypeEnum,
-                UserTypeId = user.UserTypeId,
-                IsTestUser = user.IsTestUser,
+                UserTypeEnum=user.UserTypeEnum,
+                UserTypeId=user.UserTypeId,
+                IsTestUser=user.IsTestUser,
                Code = user.Code,
                PermissionStr = user.PermissionStr,

@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Auth
            {
                Id = doctor.Id,
                FullName = doctor.FirstName + doctor.LastName,
-                Phone = doctor.Phone,
+                Phone = doctor.Phone,               
            };
        }
    }
@@ -1,4 +1,10 @@
-namespace IRaCIS.Core.Application.Auth
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Auth
 {


@@ -7,7 +13,7 @@



-        public const string CRC = "CRC";
+        public  const string CRC = "CRC";

        public const string PM = "PM";

@@ -1,5 +1,6 @@
-using Microsoft.IdentityModel.Tokens;
+using System.Collections.Generic;
 using System.Text;
+using Microsoft.IdentityModel.Tokens;

 namespace IRaCIS.Core.Application.Auth
 {
@@ -1,7 +1,7 @@
-using IRaCIS.Core.Domain.Share;
-using Microsoft.Extensions.Options;
-using System.IdentityModel.Tokens.Jwt;
+using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
+using IRaCIS.Core.Domain.Share;
+using Microsoft.Extensions.Options;

 namespace IRaCIS.Core.Application.Auth
 {
@@ -56,5 +56,5 @@ namespace IRaCIS.Core.Application.Auth
        }
    }

-
+   
 }
@@ -1,59 +1,187 @@
-using Hangfire;
+using EasyCaching.Core;
+using Hangfire;
 using Hangfire.Storage;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using SharpCompress.Common;

-namespace IRaCIS.Core.Application.Service.BackGroundJob
+namespace IRaCIS.Application.Services.BackGroundJob
 {

    public interface IIRaCISHangfireJob
    {

-        //Task MemoryCacheTrialStatusAsync();
+        Task MemoryCacheTrialStatusAsync();

        Task InitHangfireJobTaskAsync();

    }
-    public class IRaCISCHangfireJob(ILogger<IRaCISCHangfireJob> _logger,
-         IRepository<Internationalization> _internationalizationRepository,
-         IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository
-        ) : IIRaCISHangfireJob
+    public class IRaCISCHangfireJob : IIRaCISHangfireJob
    {
        public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);

+        public static FileSystemWatcher FileSystemWatcher_US { get; set; }
+        public static FileSystemWatcher FileSystemWatcher_CN { get; set; }
+        private readonly IRepository<Trial> _trialRepository;
+        private readonly IEasyCachingProvider _provider;
+        private readonly ILogger<IRaCISCHangfireJob> _logger;
+        private readonly IRepository<SystemAnonymization> _systemAnonymizationRepository;
+        private readonly IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository;
+        private readonly IRepository<Internationalization> _internationalizationRepository;
+
+
+
+        public IRaCISCHangfireJob(IRepository<Trial> trialRepository, ILogger<IRaCISCHangfireJob> logger, IEasyCachingProvider provider, IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<Internationalization> internationalizationRepository, IRepository<SystemAnonymization> systemAnonymizationRepository)
+        {
+            _trialRepository = trialRepository;
+            _provider = provider;
+            _logger = logger;
+            _trialEmailNoticeConfigRepository = trialEmailNoticeConfigRepository;
+            _internationalizationRepository = internationalizationRepository;
+            _systemAnonymizationRepository = systemAnonymizationRepository;
+        }

        public async Task InitHangfireJobTaskAsync()
        {
            _logger.LogInformation("项目启动 hangfire 任务初始化 执行开始~");

-            //初始化国际化

-            await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_internationalizationRepository);
+            //项目状态 立即加载到缓存中
+            await MemoryCacheTrialStatusAsync();
+
+            await MemoryCacheAnonymizeData();
+
+
+            //创建项目缓存 定时任务
+            HangfireJobHelper.AddOrUpdateInitCronJob<IIRaCISHangfireJob>("RecurringJob_Cache_TrialState", t => t.MemoryCacheTrialStatusAsync(), Cron.Daily());
+
+            //初始化
+
+            await InitInternationlizationDataAndWatchJsonFileAsync();

            //创建邮件定时任务
            await InitSysAndTrialCronJobAsync();

-            #region 废弃
-            ////项目状态 立即加载到缓存中
-            //await MemoryCacheTrialStatusAsync();
-
-            ////await MemoryCacheAnonymizeData();
-
-
-            ////创建项目缓存 定时任务
-            //HangfireJobHelper.AddOrUpdateInitCronJob<IIRaCISHangfireJob>("RecurringJob_Cache_TrialState", t => t.MemoryCacheTrialStatusAsync(), Cron.Daily());
-            #endregion
-

            _logger.LogInformation("项目启动 hangfire 任务初始化 执行结束");
        }

+        /// <summary>
+        /// 缓存项目状态
+        /// </summary>
+        /// <returns></returns>
+        public async Task MemoryCacheTrialStatusAsync()
+        {
+
+            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));
+        }
+
+
+        #region 国际化 初始化
+
+
+        public async Task InitInternationlizationDataAndWatchJsonFileAsync()
+        {
+            //查询数据库的数据
+            var toJsonList = await _internationalizationRepository.Where(t => t.InternationalizationType == 1).Select(t => new
+            {
+                t.Code,
+                t.Value,
+                t.ValueCN
+            }).ToListAsync();
+
+            //组织成json 文件
+
+            var usJsonPath = Path.Combine(JsonFileFolder, StaticData.En_US_Json);
+            var cnJsonPath = Path.Combine(JsonFileFolder, StaticData.Zh_CN_Json);
+
+
+            //本地静态文件国际化需要
+            foreach (var tojsonItem in toJsonList)
+            {
+                StaticData.En_US_Dic[tojsonItem.Code] = tojsonItem.Value;
+                StaticData.Zh_CN_Dic[tojsonItem.Code] = tojsonItem.ValueCN;
+            }
+
+            File.WriteAllText(usJsonPath, JsonConvert.SerializeObject(StaticData.En_US_Dic));
+            File.WriteAllText(cnJsonPath, JsonConvert.SerializeObject(StaticData.Zh_CN_Dic));
+
+
+            //监测Json文件变更 实时刷新数据
+
+            if (!File.Exists(usJsonPath)|| !File.Exists(cnJsonPath))
+            {
+                throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound"));
+            }
+
+            FileSystemWatcher_US = new FileSystemWatcher
+            {
+                Path = Path.GetDirectoryName(usJsonPath)!,
+                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
+                Filter = Path.GetFileName(usJsonPath),
+                EnableRaisingEvents = true,
+
+            };
+            // 添加文件更改事件的处理程序
+            FileSystemWatcher_US.Changed += (sender, e) => LoadJsonFile(usJsonPath);
+
+
+            FileSystemWatcher_CN = new FileSystemWatcher
+            {
+                Path = Path.GetDirectoryName(cnJsonPath)!,
+                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
+                Filter = Path.GetFileName(cnJsonPath),
+                EnableRaisingEvents = true,
+
+            };
+            FileSystemWatcher_CN.Changed += (sender, e) => LoadJsonFile(cnJsonPath);
+
+        }




+        private void LoadJsonFile(string filePath)
+        {
+            Console.WriteLine("刷新json内存数据");
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath,false,true);

+            IConfigurationRoot enConfiguration = builder.Build();
+
+            foreach (IConfigurationSection section in enConfiguration.GetChildren())
+            {
+                if (filePath.Contains(StaticData.En_US_Json))
+                {
+                    StaticData.En_US_Dic[section.Key] = section.Value;
+
+                }
+                else
+                {
+                    StaticData.Zh_CN_Dic[section.Key] = section.Value;
+                }
+            }
+        }
+
+        #endregion

        public async Task InitSysAndTrialCronJobAsync()
        {
@@ -95,9 +223,6 @@ namespace IRaCIS.Core.Application.Service.BackGroundJob


        }
-
-
-
    }


@@ -1,10 +1,11 @@
-using Microsoft.Extensions.Logging;
+using IRaCIS.Core.Infra.EFCore;
+using Microsoft.Extensions.Logging;

 namespace IRaCIS.Core.Application.BackGroundJob
 {
    public interface IObtainTaskAutoCancelJob
    {
-        Task CancelQCObtaion(Guid subjectVisitId, DateTime startTime);
+      Task  CancelQCObtaion(Guid subjectVisitId,DateTime startTime);
    }

    public class ObtainTaskAutoCancelJob : IObtainTaskAutoCancelJob
@@ -12,7 +13,7 @@ namespace IRaCIS.Core.Application.BackGroundJob
        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
        private readonly ILogger<ObtainTaskAutoCancelJob> _logger;

-        public ObtainTaskAutoCancelJob(IRepository<SubjectVisit> subjectVisitRepository, ILogger<ObtainTaskAutoCancelJob> logger)
+        public ObtainTaskAutoCancelJob(IRepository<SubjectVisit> subjectVisitRepository,  ILogger<ObtainTaskAutoCancelJob> logger)
        {
            _subjectVisitRepository = subjectVisitRepository;
            _logger = logger;
@@ -29,7 +30,7 @@ namespace IRaCIS.Core.Application.BackGroundJob

                var success = await _subjectVisitRepository.SaveChangesAsync();

-                _logger.LogWarning($"任务建立时间:{startTime}  取消时间：{DateTime.Now} 取消 受试者访视：{subjectVisitId}success:{success}");
+                _logger.LogWarning($"任务建立时间:{startTime}  取消时间：{DateTime.Now} 取消 受试者访视：{ subjectVisitId }success:{success}"); 
            }
            catch (Exception e)
            {
@@ -1,16 +1,15 @@
 using AutoMapper;
-using IRaCIS.Core.Application.Service.BusinessFilter;
-using IRaCIS.Core.Domain.Share;
+using IRaCIS.Application.Services.BusinessFilter;
+using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
 using Panda.DynamicWebApi;
 using Panda.DynamicWebApi.Attributes;
 using System.Diagnostics.CodeAnalysis;
-using ZiggyCreatures.Caching.Fusion;
+using IRaCIS.Core.Domain.Share;

-namespace IRaCIS.Core.Application.Service
+namespace IRaCIS.Core.Application
 {

 #pragma warning disable CS8618
@@ -18,21 +17,20 @@ namespace IRaCIS.Core.Application.Service

    #region 非泛型版本

-    [TypeFilter(typeof(UnifiedApiResultFilter))]
-    [Authorize, DynamicWebApi]
+    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
    public class BaseService : IBaseService, IDynamicWebApi
    {
        public IMapper _mapper { get; set; }

        public IUserInfo _userInfo { get; set; }

-
+        public IRepository _repository { get; set; }

        public IStringLocalizer _localizer { get; set; }

        public IWebHostEnvironment _hostEnvironment { get; set; }

-        public IFusionCache _fusionCache { get; set; }
+


        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
@@ -51,6 +49,8 @@ namespace IRaCIS.Core.Application.Service
        [MemberNotNull(nameof(_userInfo))]
        public IUserInfo _userInfo { get; set; }

+        [MemberNotNull(nameof(_repository))]
+        public IRepository _repository { get; set; }

        [MemberNotNull(nameof(_localizer))]
        public IStringLocalizer _localizer { get; set; }
@@ -58,9 +58,6 @@ namespace IRaCIS.Core.Application.Service
        [MemberNotNull(nameof(_hostEnvironment))]
        public IWebHostEnvironment _hostEnvironment { get; set; }

-        [MemberNotNull(nameof(_fusionCache))]
-        public IFusionCache _fusionCache { get; set; }
-
    }
    #endregion

@@ -76,25 +73,27 @@ namespace IRaCIS.Core.Application.Service
        [MemberNotNull(nameof(_userInfo))]
        public IUserInfo _userInfo { get; set; }

+        [MemberNotNull(nameof(_repository))]
+        public IRepository _repository { get; set; }
+
        [MemberNotNull(nameof(_localizer))]
        public IStringLocalizer _localizer { get; set; }

-        [MemberNotNull(nameof(_fusionCache))]
-        public IFusionCache _fusionCache { get; set; }

+      
    }

-    [TypeFilter(typeof(UnifiedApiResultFilter))]
-    [Authorize, DynamicWebApi]
+
+    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
    public class BaseServiceTest<T> : IBaseServiceTest<T>, IDynamicWebApi where T : Entity
    {
        public IMapper _mapper { get; set; }

        public IUserInfo _userInfo { get; set; }

-        public IStringLocalizer _localizer { get; set; }
+        public IRepository _repository { get; set; }

-        public IFusionCache _fusionCache { get; set; }
+        public IStringLocalizer _localizer { get; set; }

        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
        {
@@ -1,60 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using System.Text;
-
-namespace IRaCIS.Core.Application.BusinessFilter;
-
-/// <summary>
-/// 测试加密API 返回的结果
-/// </summary>
-public class EncreptApiResultFilter : IAsyncResultFilter
-{
-    private readonly IOptionsMonitor<IRCEncreptOption> _encreptResponseMonitor;
-
-    public EncreptApiResultFilter(IOptionsMonitor<IRCEncreptOption> encreptResponseMonitor)
-    {
-        _encreptResponseMonitor = encreptResponseMonitor;
-    }
-
-    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
-    {
-
-        if (_encreptResponseMonitor.CurrentValue.IsResponseEncreptEnable)
-        {
-
-            if (context.Result is ObjectResult objectResult)
-            {
-                var statusCode = objectResult.StatusCode ?? context.HttpContext.Response.StatusCode;
-
-                var objectValue = objectResult.Value;
-
-
-                if (objectValue is IResponseOutput)
-                {
-                    var responseOutput = objectValue as IResponseOutput<object>;
-
-                    var path = context.HttpContext?.Request.Path.Value?.ToLower();
-
-
-                    if (!string.IsNullOrEmpty(path) && path.Length > 5 && _encreptResponseMonitor.CurrentValue.ApiPathList.Contains(path.ToLower()))
-                    {
-
-                        if (responseOutput.IsSuccess)
-                        {
-                            responseOutput.Code = ApiResponseCodeEnum.ResultEncrepted;
-                            responseOutput.Data = JsonConvert.SerializeObject(Convert.ToBase64String(Encoding.UTF8.GetBytes(responseOutput.Data.ToString())));
-
-                            objectResult.Value = responseOutput;
-                        }
-
-                    }
-
-                }
-            }
-        }
-        await next.Invoke();
-    }
-}
@@ -1,130 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Encryption;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json.Linq;
-using System.Text;
-
-namespace IRaCIS.Core.Application.BusinessFilter;
-
-public class EncryptionRequestMiddleware
-{
-    private readonly RequestDelegate _next;
-
-    private readonly IRCEncreptOption _IRCEncreptOption;
-
-    public EncryptionRequestMiddleware(RequestDelegate next, IOptionsMonitor<IRCEncreptOption> encreptResponseMonitor)
-    {
-        _next = next;
-
-        _IRCEncreptOption = encreptResponseMonitor.CurrentValue;
-    }
-
-    public async Task InvokeAsync(HttpContext context)
-    {
-        //模拟前端已经设置该请求头
-        //context.Request.Headers["X-Encrypted-Key"] = "hW8JuJocBzIPWSHURUnYJMZ0l68g6uP9rEdMho8ioFO8amD6GIH+R6RIX5jVFzOwO+lmgBi+4gaVJGGkWJMTcoDTfzzzT1EmfPV+UhFLE9HWvCkEXmDOLE9xCHrbG8TrR1I9+Qd3cvo9HLmrQ58n13cJsM82FBw+reUgiWeklPCkEWM9br2qc9VkCp6gKzimTldNTWBezV86S6j3qHbZpVZm0atdDtGb+zSC9LLA3+oHQwRLJAAGSOAi8CUiRmIQsygRd824wBndkaH2ImEeRjBMs7PqCeK3KsoDp13yHdj2AE751gsfNzf4SF547UPf72m0F2/rBFgrSNy+Jz0T9w==";
-
-        // 检查请求头中是否包含加密的对称密钥
-        if (context.Request.Headers.ContainsKey("X-Encrypted-Key"))
-        {
-
-            var encryptedSymmetricKeyStr = context.Request.Headers["X-Encrypted-Key"].ToString();
-
-            var pemSecretKey = Encoding.UTF8.GetString(Convert.FromBase64String(_IRCEncreptOption.Base64RSAPrivateKey));
-
-            // 使用私钥解密对称密钥
-            var decryptedSymmetricKey = RSAEncryption.Decrypt(pemSecretKey, encryptedSymmetricKeyStr);
-
-
-            #region 处理路径传递参数
-
-            // 处理路径参数解密
-            var path = context.Request.Path.Value;
-
-            // 假设加密的参数在路径中，按照顺序解密路径中的每个部分
-            var pathSegments = path.Split('/', StringSplitOptions.RemoveEmptyEntries);
-            for (int i = 2; i < pathSegments.Length; i++)
-            {
-                if (!string.IsNullOrEmpty(pathSegments[i]))
-                {
-                    try
-                    {
-                        var decryptedSegment = AesEncryption.Decrypt(pathSegments[i], decryptedSymmetricKey);
-                        pathSegments[i] = decryptedSegment;
-                    }
-                    catch
-                    {
-                        // 如果不能解密该部分，保持原值
-                    }
-                }
-            }
-
-            // 将解密后的路径重新拼接并设置到请求的Path
-            context.Request.Path = "/" + string.Join("/", pathSegments);
-
-            #endregion
-
-            #region 处理url 传递参数
-
-            // 处理 URL 查询参数的解密
-            var queryParams = context.Request.Query.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.ToString());
-            var decryptedQueryParams = new Dictionary<string, string>();
-
-            foreach (var param in queryParams)
-            {
-                var encryptedValue = param.Value;
-                var decryptedValue = AesEncryption.Decrypt(encryptedValue, decryptedSymmetricKey);
-                decryptedQueryParams[param.Key] = decryptedValue;
-            }
-
-            // 构造解密后的查询字符串
-            var decryptedQueryString = new QueryString("?" + string.Join("&", decryptedQueryParams.Select(kvp => $"{kvp.Key}={kvp.Value}")));
-            context.Request.QueryString = decryptedQueryString;
-
-            #endregion
-
-            #region 处理body传参
-
-            // 读取并解密请求体中的JSON数据
-            context.Request.EnableBuffering();
-            using (var reader = new StreamReader(context.Request.Body, Encoding.UTF8, leaveOpen: true))
-            {
-                var encryptedBody = await reader.ReadToEndAsync();
-                context.Request.Body.Position = 0;
-
-
-                if (!string.IsNullOrEmpty(encryptedBody))
-                {
-                    // 尝试解析为JObject
-                    var encryptedJson = JObject.Parse(encryptedBody);
-                    var decryptedJson = new JObject();
-
-                    // 解密每个字段的值
-                    foreach (var property in encryptedJson.Properties())
-                    {
-                        var encryptedValue = property.Value.ToString();
-                        var decryptedValue = AesEncryption.Decrypt(encryptedValue, decryptedSymmetricKey);
-                        decryptedJson[property.Name] = decryptedValue;
-                    }
-
-                    // 将解密后的JSON对象转换回字符串，并替换原始请求体
-                    var decryptedBody = decryptedJson.ToString();
-                    var bodyStream = new MemoryStream(Encoding.UTF8.GetBytes(decryptedBody));
-                    context.Request.Body = bodyStream;
-                    context.Request.ContentLength = bodyStream.Length;
-                    bodyStream.Seek(0, SeekOrigin.Begin);
-                }
-            }
-
-            #endregion
-
-
-
-        }
-        // 调用下一个中间件
-        await _next(context);
-    }
-
-
-}
@@ -1,43 +0,0 @@
-using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-
-
-namespace IRaCIS.Core.Application.BusinessFilter;
-
-
-/// <summary>
-/// 不生效，不知道为啥 
-/// </summary>
-public class GlobalExceptionHandler : IExceptionHandler
-{
-    private readonly ILogger<GlobalExceptionHandler> _logger;
-    public GlobalExceptionHandler(ILogger<GlobalExceptionHandler> logger)
-    {
-        this._logger = logger;
-    }
-    public ValueTask<bool> TryHandleAsync(
-        HttpContext httpContext,
-        Exception exception,
-        CancellationToken cancellationToken)
-    {
-
-
-        httpContext.Response.ContentType = "application/json";
-
-
-        var ex = exception;
-        var errorInfo = $"Exception: {ex.Message}[{ex.StackTrace}]" + (ex.InnerException != null ? $" InnerException: {ex.InnerException.Message}[{ex.InnerException.StackTrace}]" : "");
-
-        httpContext.Response.WriteAsJsonAsync(ResponseOutput.NotOk($"{ex?.Message}"));
-
-
-
-
-
-        _logger.LogError(errorInfo);
-
-        // return true to signal that this exception is handled
-        return ValueTask.FromResult(false);
-    }
-}
@@ -1,12 +1,13 @@
-using IRaCIS.Core.Application.Helper;
+using EasyCaching.Core;
 using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
-using ZiggyCreatures.Caching.Fusion;
+using Newtonsoft.Json;

 namespace IRaCIS.Core.Application.Filter;

@@ -17,15 +18,15 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
 {
    public IStringLocalizer _localizer { get; set; }

-    private readonly IFusionCache _fusionCache;
+    private readonly IEasyCachingProvider _provider;

    private readonly IUserInfo _userInfo;

    private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;

-    public LimitUserRequestAuthorization(IFusionCache fusionCache, IUserInfo userInfo, IStringLocalizer localizer, IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig)
+    public LimitUserRequestAuthorization(IEasyCachingProvider provider, IUserInfo userInfo, IStringLocalizer localizer ,IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig)
    {
-        _fusionCache = fusionCache;
+        _provider = provider;
        _userInfo = userInfo;
        _verifyConfig = verifyConfig;
        _localizer = localizer;
@@ -53,7 +54,7 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
                {
                    context.HttpContext.Response.ContentType = "application/json";
                    context.HttpContext.Response.StatusCode = StatusCodes.Status200OK;
-                    //---当前请求未从Header/Url取到用户Token,请联系开发者
+                //---当前请求未从Header/Url取到用户Token,请联系开发者
                    //await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"])));

                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"]));
@@ -62,7 +63,7 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter


                //2、在这里取缓存  进行比较  看是否有其他人进行了登陆，如果其他人登陆了，就把之前用户挤掉
-                var cacheUserToken = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserToken(_userInfo.Id));
+                var cacheUserToken = (await _provider.GetAsync<string>(_userInfo.Id.ToString())).Value;



@@ -72,17 +73,17 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
                    cacheUserToken = _userInfo.UserToken;

                    //设置当前用户最新Token
-                    await _fusionCache.SetAsync(CacheKeys.UserToken(_userInfo.Id), _userInfo.UserToken, TimeSpan.FromDays(7));
+                    await _provider.SetAsync(_userInfo.Id.ToString(), _userInfo.UserToken, TimeSpan.FromDays(7));

                    //重启应用程序，所有人续期，不一下子踢出所有人
-                    await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.Id), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                    await _provider.SetAsync($"{_userInfo.Id.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));

                }
                //是同一个人  
                else if (cacheUserToken == _userInfo.UserToken)
                {

-                    var cacheTime = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserAutoLoginOut(_userInfo.Id));
+                    var cacheTime = (await _provider.GetAsync<string>($"{_userInfo.Id.ToString()}_Online")).Value;

                    //过期了 需要自动退出
                    if (string.IsNullOrEmpty(cacheTime))
@@ -91,22 +92,32 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
                        context.HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;

                        context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AccountAuto_LoginOut"], ApiResponseCodeEnum.AutoLoginOut));
+                        
                    }
                    else
                    {
-                        await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.Id), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                        await _provider.SetAsync($"{_userInfo.Id.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
                    }
+
                }
+
                else
                {
+
                    context.HttpContext.Response.ContentType = "application/json";
                    context.HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
                    //---您的账户在其他地方已登陆，您被迫下线。

+
                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AccountLoggedInElsewhere"], ApiResponseCodeEnum.LoginInOtherPlace));
+                        
+
+                    //await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["LimitUser_AccountLoggedInElsewhere"], ApiResponseCodeEnum.LoginInOtherPlace)));

                }

+
+
            }
        }

@@ -114,3 +125,52 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
    }
 }

+
+
+
+
+
+
+
+
+
+
+
+
+
+//public class UserTypeRequirement : IAuthorizationRequirement
+//{
+//}
+
+//public class UserTypeHandler : AuthorizationHandler<UserTypeRequirement>
+//{
+
+//    private IUserInfo _userInfo;
+
+//    public UserTypeHandler(IUserInfo userInfo)
+//    {
+//        _userInfo = userInfo;
+//    }
+
+
+//    protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, UserTypeRequirement requirement)
+//    {
+
+//        //if (context.User.Claims.Count() == 0)
+//        //{
+//        //    return Task.CompletedTask;
+//        //}
+
+//        //string userId = context.User.Claims.First(c => c.Type == "Userid").Value;
+//        //string qq = context.User.Claims.First(c => c.Type == "QQ").Value;
+
+//        //if (_UserService.Validata(userId, qq))
+//        //{
+//        //    context.Succeed(requirement); //验证通过了
+//        //}
+//        ////在这里就可以做验证
+
+//        return Task.CompletedTask;
+//    }
+//}
+
@@ -1,34 +1,37 @@
-using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using Newtonsoft.Json;


-namespace IRaCIS.Core.Application.Filter;
-
-
-
-public class ModelActionFilter : ActionFilterAttribute, IActionFilter
+namespace IRaCIS.Core.Application.Filter
 {
-    public IStringLocalizer _localizer;
-    public ModelActionFilter(IStringLocalizer localizer)
-    {
-        _localizer = localizer;
-    }

-    public override void OnActionExecuting(ActionExecutingContext context)
+
+    public class ModelActionFilter : ActionFilterAttribute, IActionFilter
    {
-        if (!context.ModelState.IsValid)
+		public IStringLocalizer _localizer;
+		public ModelActionFilter(IStringLocalizer localizer)
        {
+			_localizer = localizer;
+		}

-            var validationErrors = context.ModelState
-                                          .Keys
-                                          .SelectMany(k => context.ModelState[k]!.Errors)
-                                          .Select(e => e.ErrorMessage)
-                                          .ToArray();
+		public override void OnActionExecuting(ActionExecutingContext context)
+		{
+            if (!context.ModelState.IsValid)
+            {

-            //---提供给接口的参数无效。
-            context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ModelAction_InvalidAPIParameter"] + JsonConvert.SerializeObject(validationErrors)));
+                var validationErrors = context.ModelState
+                                              .Keys
+                                              .SelectMany(k => context.ModelState[k]!.Errors)
+                                              .Select(e => e.ErrorMessage)
+                                              .ToArray();
+     
+                //---提供给接口的参数无效。
+                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ModelAction_InvalidAPIParameter"] + JsonConvert.SerializeObject( validationErrors)));
+            }
        }
    }
+
 }
@@ -1,26 +1,28 @@
+using System;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;

-namespace IRaCIS.Core.Application.Filter;
-
-#region snippet_DisableFormValueModelBindingAttribute
-[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-public class DisableFormValueModelBindingAttribute : Attribute, IResourceFilter
+namespace IRaCIS.Core.Application.Filter
 {
-    public void OnResourceExecuting(ResourceExecutingContext context)
+    #region snippet_DisableFormValueModelBindingAttribute
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+    public class DisableFormValueModelBindingAttribute : Attribute, IResourceFilter
    {
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {


-        var factories = context.ValueProviderFactories;
-        //factories.RemoveType<FormValueProviderFactory>();
-        factories.RemoveType<FormFileValueProviderFactory>();
-        factories.RemoveType<JQueryFormValueProviderFactory>();
-        context.HttpContext.Request.EnableBuffering();
-    }
-
-    public void OnResourceExecuted(ResourceExecutedContext context)
-    {
+            var factories = context.ValueProviderFactories;
+            //factories.RemoveType<FormValueProviderFactory>();
+            factories.RemoveType<FormFileValueProviderFactory>();
+            factories.RemoveType<JQueryFormValueProviderFactory>();
+            context.HttpContext.Request.EnableBuffering();
+        }
+
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+        }
    }
+    #endregion
 }
-#endregion
@@ -1,75 +1,61 @@
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;

-namespace IRaCIS.Core.Application.Filter;
-
-public class ProjectExceptionFilter : Attribute, IExceptionFilter
+namespace IRaCIS.Core.Application.Filter
 {
-    private readonly ILogger<ProjectExceptionFilter> _logger;
-
-    public IStringLocalizer _localizer;
-
-    public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
+    public class ProjectExceptionFilter : Attribute, IExceptionFilter
    {
-        _logger = logger;
-        _localizer = localizer;
-    }
-    public void OnException(ExceptionContext context)
-    {
-        //context.ExceptionHandled;//记录当前这个异常是否已经被处理过了
+        private readonly ILogger<ProjectExceptionFilter> _logger;

-        if (!context.ExceptionHandled)
+		public IStringLocalizer _localizer;
+
+		public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
        {
-            if (context.Exception.GetType().Name == "DbUpdateConcurrencyException")
+            _logger = logger;
+			_localizer = localizer;
+		}
+        public void OnException(ExceptionContext context)
+        {
+            //context.ExceptionHandled;//记录当前这个异常是否已经被处理过了
+
+            if (!context.ExceptionHandled)
            {
-                //---并发更新，当前不允许该操作
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ProjectException_ConcurrentUpdateNotAllowed"] + context.Exception.Message));
-            }
-
-            if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
-            {
-                var error = context.Exception as BusinessValidationFailedException;
-
-                var info = string.Empty;
-
-                if (!string.IsNullOrWhiteSpace(error!.LocalizedKey) && StaticData.Log_Locoalize_Dic.ContainsKey(error!.LocalizedKey))
+                if (context.Exception.GetType().Name == "DbUpdateConcurrencyException")
                {
-                    info = $"[{error!.LocalizedKey}]:{StaticData.Log_Locoalize_Dic[error!.LocalizedKey]}";
+                //---并发更新，当前不允许该操作
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ProjectException_ConcurrentUpdateNotAllowed"] + context.Exception.Message));
+                }
+
+                if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
+                {
+                    var error = context.Exception as BusinessValidationFailedException;
+
+					context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, error!.Code));
+                }
+                else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
+                {
+                    context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message, ApiResponseCodeEnum.DataNotExist));
+                }
+                else
+                {
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["Project_ExceptionContactDeveloper"] + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/)
+                        : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)), ApiResponseCodeEnum.ProgramException));
                }


-                context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, "", error!.Code, localizedInfo: info));
+                _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message + context.Exception.StackTrace) : (context.Exception.InnerException?.Message + context.Exception.InnerException?.StackTrace));


-                //warning 级别记录
-                //_logger.LogWarning($"[{error!.LocalizedKey}]:{StaticData.Log_Locoalize_Dic[error!.LocalizedKey]}");
-            }
-            else if (context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
-            {
-                context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, ApiResponseCodeEnum.DataNotExist));
            }
            else
            {
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["Project_ExceptionContactDeveloper"] + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/)
-                    : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)), ApiResponseCodeEnum.ProgramException));
-
-                _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message + context.Exception.StackTrace) : (context.Exception.InnerException?.Message + context.Exception.InnerException?.StackTrace));
-
+                //继续
            }
-
            context.ExceptionHandled = true;//标记当前异常已经被处理过了
-
-
-            //throw new Exception("test-result-exceptioin");
-
-        }
-        else
-        {
-            //继续
        }
    }
 }
@@ -1,196 +1,215 @@
-using IRaCIS.Core.Application.Helper;
+using EasyCaching.Core;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using System.Text.RegularExpressions;
-using ZiggyCreatures.Caching.Fusion;
 using static IRaCIS.Core.Domain.Share.StaticData;

-namespace IRaCIS.Core.Application.Filter;
-
-/// <summary>
-/// 主要为了 处理项目结束 锁库，不允许操作
-/// </summary>
-public class TrialResourceFilter : Attribute, IAsyncResourceFilter
+namespace IRaCIS.Core.Application.Filter
 {
-    private readonly IUserInfo _userInfo;
-    private readonly IFusionCache _fusionCache;
-    public IStringLocalizer _localizer;
-    private readonly IRepository<Trial> _trialRepository;
-    private readonly List<string> _trialOptList = new List<string>();
-
-
-    public TrialResourceFilter(IFusionCache fusionCache, IRepository<Trial> trialRepository, IStringLocalizer localizer, IUserInfo userInfo, string trialOpt = null, string trialOpt2 = null, string trialOpt3 = null)
+    /// <summary>
+    /// 主要为了 处理项目结束 锁库，不允许操作
+    /// </summary>
+    public class TrialResourceFilter : Attribute, IAsyncResourceFilter
    {
-        _fusionCache = fusionCache;
-        _userInfo = userInfo;
-        _localizer = localizer;
-        _trialRepository = trialRepository;
+        private readonly IEasyCachingProvider _provider;
+        private readonly IUserInfo _userInfo;

-        if (!string.IsNullOrWhiteSpace(trialOpt)) _trialOptList.Add(trialOpt.Trim());
-        if (!string.IsNullOrWhiteSpace(trialOpt2)) _trialOptList.Add(trialOpt2.Trim());
-        if (!string.IsNullOrWhiteSpace(trialOpt3)) _trialOptList.Add(trialOpt3.Trim());
+        public IStringLocalizer _localizer;
+		private readonly List<string> _trialOptList=new List<string>();

-    }

-    //优先选择异步的方法
-    public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
-    {
-        // var typeFilter = context.ActionDescriptor.EndpointMetadata.Where(t => t.GetType() == typeof(TypeFilterAttribute)).Select(t => (TypeFilterAttribute)t).ToList().FirstOrDefault();
-        //var  _trialOptList= typeFilter.Arguments.Select(t => t.ToString()).ToList();
-
-        // 获取当前请求的 Host 信息
-        var requestHost = context.HttpContext.Request.Host;
-
-        // 检查请求是否来自 localhost:6100
-        if (requestHost.Host == "localhost" && (requestHost.Port == 6100|| requestHost.Port==3305))
+        public TrialResourceFilter(IEasyCachingProvider provider, IStringLocalizer localizer , IUserInfo userInfo, string trialOpt = null, string trialOpt2 = null, string trialOpt3 = null)
        {
-            await next.Invoke();
+            _provider = provider;
+            _userInfo = userInfo;
+            _localizer = localizer;
+			//_trialOpt = trialOpt;

-            return;
+			if (!string.IsNullOrWhiteSpace(trialOpt)) _trialOptList.Add(trialOpt.Trim());
+            if (!string.IsNullOrWhiteSpace(trialOpt2)) _trialOptList.Add(trialOpt2.Trim());
+            if (!string.IsNullOrWhiteSpace(trialOpt3)) _trialOptList.Add(trialOpt3.Trim());
+
+          
        }

-        #region 处理新的用户类型，不能操作项目相关接口

-        // 后期列举出具体的类型，其他任何用户类型，都不允许操作
-        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower() != "TrialDocument/userConfirm".ToLower())
+
+        //public TrialResourceFilter(IEasyCachingProvider provider, IUserInfo userInfo)
+        //{
+        //    _provider = provider;
+        //    _userInfo = userInfo;
+        //}
+
+
+
+
+
+        //优先选择异步的方法
+        public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
        {
-            //---对不起，您的账户没有操作权限。
-            context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_NoAccessPermission"]));
+           // var typeFilter = context.ActionDescriptor.EndpointMetadata.Where(t => t.GetType() == typeof(TypeFilterAttribute)).Select(t => (TypeFilterAttribute)t).ToList().FirstOrDefault();
+           //var  _trialOptList= typeFilter.Arguments.Select(t => t.ToString()).ToList();

-            return;
-        }
+            #region 处理新的用户类型，不能操作项目相关接口

-        #endregion
-
-
-
-        //TrialId 传递的途径多种，可能在path 可能在body  可能在数组中，也可能在对象中，可能就在url
-        var trialIdStr = string.Empty;
-
-        if (!string.IsNullOrWhiteSpace(context.HttpContext.Request.Query["trialId"]))
-        {
-            trialIdStr = context.HttpContext.Request.Query["trialId"];
-        }
-
-        //先尝试从path中取TrialId 
-        else if (context.RouteData.Values.Keys.Any(t => t.Contains("trialId")))
-        {
-            var index = context.RouteData.Values.Keys.ToList().IndexOf("trialId");
-            trialIdStr = context.RouteData.Values.Values.ToList()[index] as string;
-        }
-        else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId"))
-        {
-            var headerStr = context.HttpContext.Request.Headers["Referer"].ToString();
-
-            var trialIdIndex = headerStr.IndexOf("trialId");
-
-
-            var matchResult = Regex.Match(headerStr.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
-
-            if (matchResult.Success)
+            // 后期列举出具体的类型，其他任何用户类型，都不允许操作
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower()!= "TrialDocument/userConfirm".ToLower())
            {
-                trialIdStr = matchResult.Value;
-            }
-            else
-            {
-                //---正则取请求Refer 中trialId 失败，请联系开发人员核查
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
-            }
+                //---对不起，您的账户没有操作权限。
+                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_NoAccessPermission"]));

-        }
-        else
-        {
-            #region body 中取数据
-
-            //设置可以多次读
-            context.HttpContext.Request.EnableBuffering();
-            var reader = new StreamReader(context.HttpContext.Request.Body);
-            var contentFromBody = await reader.ReadToEndAsync();
-            //读取后，流的位置还原
-            context.HttpContext.Request.Body.Seek(0, SeekOrigin.Begin);
-            //context.HttpContext.Request.Body.Position = 0;
-
-            //找到参数位置在字符串中的索引
-            var trialIdIndex = contentFromBody.IndexOf("\"TrialId\"", StringComparison.OrdinalIgnoreCase);
-
-            if (trialIdIndex > -1)
-            {
-                //  (?<="trialId" *: *").*?(?=",)
-
-                //使用正则 [0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}
-
-                var matchResult = Regex.Match(contentFromBody.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
-
-                if (matchResult.Success)
-                {
-                    //有可能匹配错误   "trialId":"","documentId":"b8180000-3e2c-0016-9fe0-08da33f96236"  从缓存里面验证下
-
-                    trialIdStr = matchResult.Value;
-
-                    var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
-
-                    if (string.IsNullOrWhiteSpace(trialStatusStr))
-                    {
-
-                        //数据库 检查该项目Id不对
-                        context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
-
-                        return;
-                    }
-                }
-                else
-                {
-                    //---正则取请求Refer 中trialId 失败，请联系开发人员核查
-                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
-
-                    return;
-                }
-
-                //使用字符串取 如果是swagger  可能有时取的不对  因为空格的原因
-                //trialIdStr = contentFromBody.Substring(trialIdIndex + "TrialId".Length + 4, 3
+                return;
            }

            #endregion
-        }

-        //通过path 或者body 找到trialId 了  
-        if (!string.IsNullOrWhiteSpace(trialIdStr))
-        {
-            var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));

-            //  这里是统一拦截 项目有关的操作允许情况(特殊的地方，比如项目配置（有的在多种状态（初始化，ongoing）都可以操作，有的仅仅在Initializing）还有  项目添加和更新，不走这里，特殊处理,不然在这里显得很乱，判断是哪个接口)
-            if (trialStatusStr == StaticData.TrialState.TrialOngoing || _trialOptList.Any(t => t == TrialOpt.BeforeOngoingCantOpt))
+
+            //TrialId 传递的途径多种，可能在path 可能在body  可能在数组中，也可能在对象中，可能就在url
+            var trialIdStr = string.Empty;
+
+            if (!string.IsNullOrWhiteSpace(context.HttpContext.Request.Query["trialId"]))
            {
+                trialIdStr = context.HttpContext.Request.Query["trialId"];
+            }

-                await next.Invoke();
+            //先尝试从path中取TrialId 
+            else if (context.RouteData.Values.Keys.Any(t => t.Contains("trialId")))
+            {
+                var index = context.RouteData.Values.Keys.ToList().IndexOf("trialId");
+                trialIdStr = context.RouteData.Values.Values.ToList()[index] as string;
+            }
+            else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId"))
+            {
+                var headerStr = context.HttpContext.Request.Headers["Referer"].ToString();
+
+                var trialIdIndex = headerStr.IndexOf("trialId");
+
+
+                var matchResult = Regex.Match(headerStr.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                if (matchResult.Success)
+                {
+                    trialIdStr = matchResult.Value;
+                }
+                else
+                {
+                //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
+                }

            }
-            //  项目停止、或者完成  不允许操作
            else
            {
-                //---本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_InterceptedProjectStatusRule"]));
+                #region body 中取数据

+                //设置可以多次读
+                context.HttpContext.Request.EnableBuffering();
+                var reader = new StreamReader(context.HttpContext.Request.Body);
+                var contentFromBody = await reader.ReadToEndAsync();
+                //读取后，流的位置还原
+                context.HttpContext.Request.Body.Seek(0, SeekOrigin.Begin);
+                //context.HttpContext.Request.Body.Position = 0;
+
+                //找到参数位置在字符串中的索引
+                var trialIdIndex = contentFromBody.IndexOf("\"TrialId\"", StringComparison.OrdinalIgnoreCase);
+
+                if (trialIdIndex > -1)
+                {
+                    //  (?<="trialId" *: *").*?(?=",)
+
+                    //使用正则 [0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}
+
+                    var matchResult = Regex.Match(contentFromBody.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                    if (matchResult.Success)
+                    {
+                        //有可能匹配错误   "trialId":"","documentId":"b8180000-3e2c-0016-9fe0-08da33f96236"  从缓存里面验证下
+                        var cacheResultDic = _provider.GetAll<string>(new[] { matchResult.Value });
+
+                        var trialStatusStr = cacheResultDic[matchResult.Value.ToLower()].Value;
+
+                        if (!string.IsNullOrWhiteSpace(trialStatusStr))
+                        {
+                            trialIdStr = matchResult.Value;
+                        }
+
+
+                    }
+                    else
+                    {
+                //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                        context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
+                    }
+
+                    //使用字符串取 如果是swagger  可能有时取的不对  因为空格的原因
+                    //trialIdStr = contentFromBody.Substring(trialIdIndex + "TrialId".Length + 4, 3
+                }
+
+                #endregion
            }

+            //通过path 或者body 找到trialId 了  
+            if ( !string.IsNullOrWhiteSpace(trialIdStr))
+            {
+
+                //如果没缓存数据，可能定时任务没执行或者缓存丢失  在此重新缓存
+                if (_provider.GetCount() == 0)
+                {
+
+                    var _trialRepository = context.HttpContext.RequestServices.GetService(typeof(IRepository<Trial>)) as IRepository<Trial>;
+
+                    var list = _trialRepository.IfNullThrowException().Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr })
+                      .ToList();
+
+                    list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(7)));
+                }
+
+                var cacheResultDic = _provider.GetAll<string>(new[] { trialIdStr });
+
+                var trialStatusStr = cacheResultDic[trialIdStr].Value;
+
+                //意外 导致缓存过期，调整服务器时间，测试不想重启程序
+                if (string.IsNullOrWhiteSpace(trialStatusStr))
+                {
+                    var trialRepository = context.HttpContext.RequestServices.GetService(typeof(IRepository<Trial>)) as IRepository<Trial>;
+                    trialStatusStr = trialRepository?.Where(t => t.Id == Guid.Parse(trialIdStr)).Select(t => t.TrialStatusStr).FirstOrDefault();
+                }
+
+                //  这里是统一拦截 项目有关的操作允许情况(特殊的地方，比如项目配置（有的在多种状态（初始化，ongoing）都可以操作，有的仅仅在Initializing）还有  项目添加和更新，不走这里，特殊处理,不然在这里显得很乱，判断是哪个接口)
+                if (trialStatusStr == StaticData.TrialState.TrialOngoing || _trialOptList.Any(t=>t== TrialOpt.BeforeOngoingCantOpt)  )
+                {
+
+                    await next.Invoke();
+
+                }
+                //  项目停止、或者完成  不允许操作
+                else
+                {
+                //---本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_InterceptedProjectStatusRule"]));
+
+                }
+
+            }
+            //添加项目  签名系统文档的时候  不做拦截   但是更新项目  签名项目文档的时候需要拦截
+            else if (_trialOptList.Any(t => t == TrialOpt.AddOrUpdateTrial ||t ==TrialOpt.SignSystemDocNoTrialId))
+            {
+                await next.Invoke();
+            }
+
+            else
+            {
+                //如果项目相关接口没有传递trialId 会来到这里,提醒，以便修改
+
+                //---该接口参数中，没有传递项目编号，请核对。
+                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_MissingProjectNumber"]));
+            }
+
+
        }
-        //添加项目  签名系统文档的时候  不做拦截   但是更新项目  签名项目文档的时候需要拦截
-        else if (_trialOptList.Any(t => t == TrialOpt.AddOrUpdateTrial || t == TrialOpt.SignSystemDocNoTrialId))
-        {
-            await next.Invoke();
-        }
-
-        else
-        {
-            //如果项目相关接口没有传递trialId 会来到这里,提醒，以便修改
-
-            //---该接口参数中，没有传递项目编号，请核对。
-            context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_MissingProjectNumber"]));
-        }
-
-
    }
 }
@@ -1,122 +1,119 @@
-using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
+using IRaCIS.Core.Domain.Share;

-namespace IRaCIS.Core.Application.Service.BusinessFilter;
-
-/// <summary>
-///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
-/// by zhouhang 2021.09.12 周末
-/// </summary>
-public class UnifiedApiResultFilter : Attribute, IAsyncResultFilter
+namespace IRaCIS.Application.Services.BusinessFilter
 {
-    private readonly ILogger _logger;
-
-    public UnifiedApiResultFilter(ILogger<UnifiedApiResultFilter> logger)
-    {
-        _logger = logger;
-    }
-
    /// <summary>
-    /// 异步版本
+    ///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
+    /// by zhouhang 2021.09.12 周末
    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="next"></param>
-    /// <returns></returns>
-    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
-    {
-
-        if (context.Result is ObjectResult objectResult)
+    public class UnifiedApiResultFilter : Attribute, IAsyncResultFilter  
+    {             
+        /// <summary>
+        /// 异步版本
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="next"></param>
+        /// <returns></returns>
+        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
        {
-            var statusCode = objectResult.StatusCode ?? context.HttpContext.Response.StatusCode;

-            //是200 并且没有包装  那么包装结果
-            if (statusCode == 200 && !(objectResult.Value is IResponseOutput))
+            if (context.Result is ObjectResult objectResult)
            {
+                var statusCode = objectResult.StatusCode ?? context.HttpContext.Response.StatusCode;

-                var type = objectResult.Value?.GetType();
-
-
-                if (type != null && type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(ValueTuple<,>) || type.GetGenericTypeDefinition() == typeof(Tuple<,>)))
+                //是200 并且没有包装  那么包装结果
+                if (statusCode == 200 && !(objectResult.Value is IResponseOutput))
                {
+                    //if (objectResult.Value == null)
+                    //{
+                    //    var apiResponse = ResponseOutput.DBNotExist();

-                    //报错
-                    //var tuple = (object, object))objectResult.Value;
-                    //var (val1, val2) = ((dynamic, dynamic))objectResult.Value;
-                    //var apiResponse = ResponseOutput.Ok(val1, val2);
+                    //    objectResult.Value = apiResponse;
+                    //    objectResult.DeclaredType = apiResponse.GetType();
+                    //}
+                    //else
+                    //{

-                    //OK
-                    var tuple = (dynamic)objectResult.Value;
-                    var apiResponse = ResponseOutput.Ok(tuple!.Item1, tuple!.Item2);
+                    var type = objectResult.Value?.GetType();


-                    objectResult.Value = apiResponse;
-                    objectResult.DeclaredType = apiResponse.GetType();
+                    if (  type!=null&& type.IsGenericType&&(type.GetGenericTypeDefinition()==typeof(ValueTuple<,>)|| type.GetGenericTypeDefinition()==typeof(Tuple<,>)))
+                    {
+
+                        //报错
+                        //var tuple = (object, object))objectResult.Value;
+
+                        //var (val1, val2) = ((dynamic, dynamic))objectResult.Value;
+                        //var apiResponse = ResponseOutput.Ok(val1, val2);
+
+                        //OK
+                        var tuple = (dynamic)objectResult.Value;
+                        var apiResponse = ResponseOutput.Ok(tuple!.Item1, tuple!.Item2);
+
+
+                        objectResult.Value = apiResponse;
+                        objectResult.DeclaredType = apiResponse.GetType();
+                    }
+                    else
+                    {
+                        var apiResponse = ResponseOutput.Ok(objectResult.Value);
+
+                        objectResult.Value = apiResponse;
+                        objectResult.DeclaredType = apiResponse.GetType();
+                    }
+
+                      
+                    //}
+                   
                }
-                else
+                //如果不是200  是IResponseOutput  不处理
+                else if (statusCode != 200 && (objectResult.Value is IResponseOutput))
                {
-                    var apiResponse = ResponseOutput.Ok(objectResult.Value);
-
-                    objectResult.Value = apiResponse;
-                    objectResult.DeclaredType = apiResponse.GetType();
                }

-
-            }
-            //如果是200  是IResponseOutput  记录下日志
-            else if (statusCode == 200 && (objectResult.Value is IResponseOutput))
-            {
-                var result = objectResult.Value as IResponseOutput;
-
-                if (!string.IsNullOrWhiteSpace(result.LocalizedInfo))
+                else if(statusCode != 200&&!(objectResult.Value is IResponseOutput))
                {
-                    //统一在这里记录国际化的日志信息
-                    _logger.LogWarning($"{result.LocalizedInfo}");
-                }
-
-            }
-
-            else if (statusCode != 200 && !(objectResult.Value is IResponseOutput))
-            {
                //---程序错误，请联系开发人员。
-                var apiResponse = ResponseOutput.NotOk(StaticData.International("UnifiedAPI_ProgramError"));
+                    var apiResponse = ResponseOutput.NotOk(StaticData.International("UnifiedAPI_ProgramError"));
+
+                    objectResult.Value = apiResponse;
+                    objectResult.DeclaredType = apiResponse.GetType();
+                }

-                objectResult.Value = apiResponse;
-                objectResult.DeclaredType = apiResponse.GetType();
            }

+            await next.Invoke();
+
        }

-        await next.Invoke();
-
-    }
-
-    public static bool IsTupleType(Type type, bool checkBaseTypes = false)
-    {
-        if (type == null)
-            throw new ArgumentNullException(nameof(type));
-
-        if (type == typeof(Tuple))
-            return true;
-
-        while (type != null)
+        public static bool IsTupleType(Type type, bool checkBaseTypes = false)
        {
-            if (type.IsGenericType)
+            if (type == null)
+                throw new ArgumentNullException(nameof(type));
+
+            if (type == typeof(Tuple))
+                return true;
+
+            while (type != null)
            {
-                var genType = type.GetGenericTypeDefinition();
-                if (genType == typeof(Tuple<>)
-                    || genType == typeof(Tuple<,>)
-                    || genType == typeof(Tuple<,>))
-                    return true;
+                if (type.IsGenericType)
+                {
+                    var genType = type.GetGenericTypeDefinition();
+                    if (genType == typeof(Tuple<>)
+                        || genType == typeof(Tuple<,>)
+                        || genType == typeof(Tuple<,>))
+                        return true;
+                }
+
+                if (!checkBaseTypes)
+                    break;
+
+                type = type.BaseType;
            }

-            if (!checkBaseTypes)
-                break;
-
-            type = type.BaseType;
+            return false;
        }
-
-        return false;
    }
 }
@@ -1,164 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Json;
-using System.ComponentModel;
-
-namespace IRaCIS.Core.Domain.Share;
-
-[Description("多环境 配置环境实体")]
-public class ServiceVerifyConfigOption
-{
-    public bool OpenUserComplexPassword { get; set; }
-
-    public bool OpenSignDocumentBeforeWork { get; set; }
-
-    public bool OpenTrialRelationDelete { get; set; }
-
-    public bool OpenLoginLimit { get; set; }
-
-    public int LoginMaxFailCount { get; set; }
-
-    public int LoginFailLockMinutes { get; set; }
-
-    public int AutoLoginOutMinutes { get; set; }
-
-    public bool OpenLoginMFA { get; set; }
-
-    [Description("连续阅片时间 (min)")]
-    public int ContinuousReadingTimeMin { get; set; }
-
-    [Description("休息时间 (min)")]
-    public int ReadingRestTimeMin { get; set; }
-    [Description("是否需要修改密码")]
-    public bool IsNeedChangePassWord { get; set; }
-
-    [Description("修改密码的天数")]
-    public int ChangePassWordDays { get; set; }
-
-}
-
-public class SystemEmailSendConfig
-{
-    public int Port { get; set; }
-
-    public string Host { get; set; } = string.Empty;
-    public string FromEmail { get; set; } = string.Empty;
-
-    public string FromName { get; set; } = string.Empty;
-
-    public string AuthorizationCode { get; set; } = string.Empty;
-
-    public string SiteUrl { get; set; } = string.Empty;
-
-    public string OrganizationName { get; set; } = string.Empty;
-    public string OrganizationNameCN { get; set; } = string.Empty;
-
-    public string CompanyName { get; set; } = string.Empty;
-
-    public string CompanyNameCN { get; set; } = string.Empty;
-
-    public string CompanyShortName { get; set; } = string.Empty;
-
-    public string CompanyShortNameCN { get; set; } = string.Empty;
-
-    public bool IsEnv_US { get; set; }
-}
-
-public class SystemEmailSendConfigView
-{
-    public string CompanyName { get; set; } = string.Empty;
-
-    public string CompanyNameCN { get; set; } = string.Empty;
-
-    public string CompanyShortName { get; set; } = string.Empty;
-
-    public string CompanyShortNameCN { get; set; } = string.Empty;
-}
-
-public class SystemPacsConfig
-{
-    public int Port { get; set; }
-
-    public string IP { get; set; } = string.Empty;
-}
-public class IRCEncreptOption
-{
-    public string Base64RSAPublicKey { get; set; }
-
-    public string Base64RSAPrivateKey { get; set; }
-    public bool IsResponseEncreptEnable { get; set; }
-
-    public List<string> ApiPathList { get; set; }
-}
-
-public class IRaCISBasicConfigOption
-{
-    public string DoctorCodePrefix { get; set; }
-    public string UserCodePrefix { get; set; }
-    public string QCChallengeCodePrefix { get; set; }
-    public string DicomStudyCodePrefix { get; set; }
-    public string TaskStudyCodePrefix { get; set; }
-    public string NoneDicomStudyCodePrefix { get; set; }
-    public int ImageShareExpireDays { get; set; }
-    public string SystemSiteCodePrefix { get; set; }
-    public string BlindTaskPrefix { get; set; }
-    public string DefaultPassword { get; set; }
-}
-
-[Description("项目基础配置规则")]
-public static class AppSettings
-{
-
-    public static IRaCISBasicConfigOption IRaCISBasicConfig { get; set; }
-
-    static AppSettings()
-    {
-        var configuration = new ConfigurationBuilder()
-            .Add(new JsonConfigurationSource
-            {
-                Path = "appsettings.json",
-                ReloadOnChange = true
-            })
-            .Build();
-
-        // 手动绑定配置
-        var appSettings = new IRaCISBasicConfigOption();
-        configuration.GetSection("IRaCISBasicConfig").Bind(appSettings);
-
-        IRaCISBasicConfig = appSettings;
-    }
-    //获取实体编码字符串
-    public static string GetCodeStr(int codeInt, string typeStr)
-    {
-        switch (typeStr)
-        {
-            case nameof(Doctor):
-                return IRaCISBasicConfig.DoctorCodePrefix + codeInt.ToString("D4");
-
-            case nameof(User):
-                return IRaCISBasicConfig.UserCodePrefix + codeInt.ToString("D4");
-
-            case nameof(QCChallenge):
-                return IRaCISBasicConfig.QCChallengeCodePrefix + codeInt.ToString("D5");
-
-            case nameof(NoneDicomStudy):
-                return IRaCISBasicConfig.NoneDicomStudyCodePrefix + codeInt.ToString("D5");
-
-            case nameof(DicomStudy):
-                return IRaCISBasicConfig.DicomStudyCodePrefix + codeInt.ToString("D5");
-
-            case nameof(TaskStudy):
-                return IRaCISBasicConfig.TaskStudyCodePrefix + codeInt.ToString("D5");
-
-            case nameof(VisitTask):
-                return "W" + codeInt.ToString("D5");
-
-            case nameof(Site):
-                return IRaCISBasicConfig.SystemSiteCodePrefix + codeInt.ToString("D4");
-
-            default:
-                return string.Empty;
-        }
-
-    }
-
-}
@@ -1,11 +0,0 @@
-global using AutoMapper.QueryableExtensions;
-global using IRaCIS.Core.Application.Service;
-global using IRaCIS.Core.Domain.Models;
-global using IRaCIS.Core.Infra.EFCore;
-global using IRaCIS.Core.Infrastructure.Extention;
-global using Microsoft.EntityFrameworkCore;
-global using System.Linq.Expressions;
-
-
-
-
@@ -1,4 +1,9 @@
 using IRaCIS.Core.Domain.Share;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;

 namespace IRaCIS.Core.Application.Helper
 {
@@ -14,9 +19,9 @@ namespace IRaCIS.Core.Application.Helper


        //是否翻译依赖其他属性
-        public bool IsTranslateDenpendOtherProperty => !string.IsNullOrWhiteSpace(DependPropertyName);
+        public bool IsTranslateDenpendOtherProperty =>!string.IsNullOrWhiteSpace(DependPropertyName);

-        public string DependPropertyName { get; set; } = string.Empty;
+        public string DependPropertyName { get; set; }=string.Empty;

        public string DependPropertyValueStr { get; set; } = string.Empty;

@@ -28,7 +33,7 @@ namespace IRaCIS.Core.Application.Helper
        }

        //针对不同的标准 翻译的字典不一样 
-        public DictionaryTranslateAttribute(string dicParentCode, CriterionType criterionType)
+        public DictionaryTranslateAttribute(string dicParentCode, CriterionType criterionType )
        {
            DicParentCode = dicParentCode;

@@ -37,7 +42,7 @@ namespace IRaCIS.Core.Application.Helper

        //针对业务某个属性的值 不一样 用的翻译字典不一样

-        public DictionaryTranslateAttribute(string dicParentCode, string dependPropertyName, string dependPropertyValueStr)
+        public DictionaryTranslateAttribute(string dicParentCode,string dependPropertyName, string dependPropertyValueStr)
        {
            DicParentCode = dicParentCode;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hang	b0ef2dc8ab	修改审核时间修改 continuous-integration/drone/push Build is passing Details	2024-08-02 15:41:29 +08:00
hang	ccf4bbdff9	CRC 上传导表 continuous-integration/drone/push Build is passing Details	2024-08-02 11:48:09 +08:00
hang	c3e36991b8	质控增加字段 continuous-integration/drone/push Build is passing Details	2024-08-02 11:29:41 +08:00
hang	81f6c10f23	QCAgreeUpload 才允许修改 continuous-integration/drone/push Build is passing Details	2024-08-01 17:22:10 +08:00
hang	719ca071e1	crc 重传允许修改部位编辑 continuous-integration/drone/push Build is passing Details	2024-08-01 17:06:17 +08:00
hang	dad420a7e8	Merge branch 'Uat_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Uat_IRC_Net8 continuous-integration/drone/push Build is passing Details	2024-07-31 14:34:30 +08:00
hang	d84aedf135	邮件昵称修改	2024-07-31 14:34:29 +08:00
hang	34f3b1607e	修改隐藏邮箱的算法 continuous-integration/drone/push Build is passing Details	2024-07-31 10:04:58 +08:00
hang	7fa73e0054	修改us配置文件 continuous-integration/drone/push Build is passing Details	2024-07-29 11:47:02 +08:00
hang	c146c2bfd2	修改uat 美国配置文件 continuous-integration/drone/push Build is passing Details	2024-07-29 11:27:02 +08:00
hang	2a1220899e	重阅自动失效，错误消息位置改变 continuous-integration/drone/push Build is passing Details	2024-07-25 14:22:19 +08:00
hang	874d36de28	同意重阅，成功，但是给出自动失效的提示 continuous-integration/drone/push Build is passing Details	2024-07-25 13:54:57 +08:00
hang	0283052555	修改，无序重阅和审批 continuous-integration/drone/push Build is passing Details	2024-07-25 10:13:26 +08:00
hang	effef5ad65	修改IR 无序阅片申请bug continuous-integration/drone/push Build is passing Details	2024-07-24 16:25:53 +08:00
hang	43d260e036	修改美国环境配置，使用AWS continuous-integration/drone/push Build is passing Details	2024-07-19 17:17:53 +08:00
hang	19708240b2	oss 下载走内网地址 continuous-integration/drone/push Build is passing Details	2024-07-19 16:13:33 +08:00
hang	0999bae749	修改非dicom 监控上传 continuous-integration/drone/push Build is passing Details	2024-07-19 09:04:55 +08:00
hang	e6bd35ae04	url 解码下载修改 continuous-integration/drone/push Build is passing Details	2024-07-17 18:00:17 +08:00
he	102e193ae8	修改 continuous-integration/drone/push Build is passing Details	2024-07-17 10:19:51 +08:00
he	20d557e795	Merge branch 'Uat_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Uat_IRC_Net8 continuous-integration/drone/push Build is passing Details	2024-07-17 10:10:29 +08:00
he	593ab42882	修改	2024-07-17 10:10:28 +08:00
hang	b56d256e10	去掉权限，方便前端测试 continuous-integration/drone/push Build is passing Details	2024-07-16 10:59:46 +08:00
he	614a3bd70e	返回值修改 continuous-integration/drone/push Build is passing Details	2024-07-16 10:10:12 +08:00
he	2eb3b04365	Merge branch 'Uat_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Uat_IRC_Net8 continuous-integration/drone/push Build is passing Details	2024-07-16 09:57:34 +08:00
he	1fa3a5a181	加返回参数	2024-07-16 09:57:33 +08:00
hang	cd2007c4fd	减少压缩包访视层级，同时处理单个非dicom 特殊情况压缩包处理 continuous-integration/drone/push Build is passing Details	2024-07-15 16:55:21 +08:00
hang	67e710eac0	增加打包下载验证 continuous-integration/drone/push Build is passing Details	2024-07-15 16:28:29 +08:00
hang	ef451d82ec	修改ivus影像下载功能 continuous-integration/drone/push Build is passing Details	2024-07-15 15:46:31 +08:00
he	899ebf2a30	跳过阅片修改 continuous-integration/drone/push Build is passing Details	2024-07-15 14:43:49 +08:00
he	f233d27f96	Merge branch 'Uat_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Uat_IRC_Net8 continuous-integration/drone/push Build is passing Details	2024-07-15 14:13:14 +08:00
he	9e8ab8acca	跳过阅片修改	2024-07-15 14:13:14 +08:00
hang	2265387f47	Uat 自动打包发布 continuous-integration/drone/push Build is passing Details	2024-07-15 13:12:43 +08:00
he	baf8f39bc6	提示语修改 continuous-integration/drone/push Build is passing Details	2024-07-12 10:30:44 +08:00
he	3fa14d92ae	配置文件修改 continuous-integration/drone/push Build is passing Details	2024-07-11 17:29:38 +08:00
he	e6c577e68b	阅片时间修改到配置文件 continuous-integration/drone/push Build is passing Details	2024-07-11 17:28:18 +08:00
hang	bb111dbbeb	修改发布文件 continuous-integration/drone/push Build is passing Details	2024-07-11 15:26:22 +08:00
hang	0df0b10a72	增加用户机构默认值修改 continuous-integration/drone/push Build is failing Details	2024-07-11 10:14:46 +08:00
hang	0a7ba9f0f5	修改字段名 continuous-integration/drone/push Build is failing Details	2024-07-11 09:42:15 +08:00
hang	cd88990c32	spm cpm 返回增加字段	2024-07-11 09:42:03 +08:00
hang	d53a1300fc	增加uat irc 自动打包成镜像 continuous-integration/drone/push Build is passing Details	2024-07-10 16:49:59 +08:00
hang	07332ff3e1	修改发送邮件配置	2024-07-09 13:12:59 +08:00
hang	8195a1cf3e	修改发件箱	2024-07-09 09:50:30 +08:00
hang	f5e5a47624	修改美国irc uat 数据库名称	2024-07-09 09:40:32 +08:00
hang	28608f3ecb	美国验证增加配置文件	2024-07-08 11:39:30 +08:00
hang	bb2da7ca81	修改配置文件	2024-07-05 09:07:57 +08:00
hang	713518a68c	增加美国生产环境配置文件	2024-07-04 14:31:50 +08:00
he	bc448da297	Merge branch 'Uat_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Uat_IRC_Net8	2024-07-03 15:15:48 +08:00
he	8447878cb2	代码修改	2024-07-03 15:15:46 +08:00
hang	1b5a9673f6	修改一致性核查颜色	2024-07-02 17:16:46 +08:00
he	27711f4184	关键序列修改	2024-07-02 09:33:42 +08:00
he	bb9bac1edf	修改医学审核排序	2024-07-01 16:45:07 +08:00
hang	41ae2febc7	改为阿里云	2024-06-26 15:12:06 +08:00
hang	c072c526e2	修改uat 配置文件	2024-06-26 14:36:56 +08:00
hang	d6bb98b84f	中心调研修改	2024-06-25 10:57:42 +08:00
hang	42587ee59f	删掉邮件日志组件	2024-06-25 09:17:28 +08:00
hang	62a964a3ea	发送邮件的包降级	2024-06-25 09:01:58 +08:00
hang	72447eb82f	修改界面控制bug	2024-06-24 16:53:53 +08:00
hang	2f83c27fde	修改筛选条件	2024-06-24 16:39:43 +08:00
hang	b219593f61	医生入组，没有spm修改逻辑	2024-06-24 16:39:40 +08:00