Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

This reverts commit 72f0fd3193.

.dockerignore

@@ -0,0 +1,30 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+!**/.gitignore
+!.git/HEAD
+!.git/config
+!.git/packed-refs
+!.git/refs/heads/**

Dockerfile

@@ -0,0 +1,4 @@
+FROM registry.cn-shanghai.aliyuncs.com/extimaging/aspnetcore:v8.2
+WORKDIR /app 
+COPY publish . 
+ENTRYPOINT ["dotnet", "IRaCIS.Core.API.dll"]

IRC.Core.SCP/BusinessFilter/ModelActionFilter .cs

@@ -0,0 +1,37 @@
+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)));
+            }
+        }
+    }
+
+}

IRC.Core.SCP/BusinessFilter/ModelBinding.cs

@@ -0,0 +1,28 @@
+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
+}

IRC.Core.SCP/BusinessFilter/ProjectExceptionFilter.cs

@@ -0,0 +1,61 @@
+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;//标记当前异常已经被处理过了
+        }
+    }
+}

IRC.Core.SCP/BusinessFilter/UnifiedApiResultFilter.cs

@@ -0,0 +1,120 @@
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
+
+namespace IRaCIS.Application.Services.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;
+        }
+    }
+}

IRC.Core.SCP/Helper/ImageHelper.cs

@@ -0,0 +1,62 @@
+
+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);
+    }
+
+
+}
+
+
+

IRC.Core.SCP/HostConfig/AutofacModuleSetup.cs

@@ -0,0 +1,57 @@
+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.Application.Services;
+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();
+
+
+
+
+
+        }
+    }
+}

IRC.Core.SCP/HostConfig/EFSetup.cs

@@ -0,0 +1,64 @@
+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);
+            });
+
+        }
+    }
+}

IRC.Core.SCP/HostConfig/NewtonsoftJsonSetup.cs

@@ -0,0 +1,59 @@
+
+
+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;
+            });
+
+
+        }
+    }
+}

IRC.Core.SCP/HostConfig/NullToEmptyStringResolver.cs

@@ -0,0 +1,36 @@
+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;
+        }
+
+
+    }
+}

IRC.Core.SCP/HostConfig/NullToEmptyStringValueProvider.cs

@@ -0,0 +1,42 @@
+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);
+            }
+          
+        }
+    }
+
+}

IRC.Core.SCP/IRC.Core.SCP.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+	  <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
+	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+	  <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>

IRC.Core.SCP/Program.cs

@@ -0,0 +1,214 @@
+
+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);
+
+
+//转发头设置  获取真实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();

IRC.Core.SCP/Properties/launchSettings.json

@@ -0,0 +1,25 @@
+{
+  "$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"
+      }
+    }
+  }
+}

IRC.Core.SCP/Service/BaseService.cs

@@ -0,0 +1,111 @@
+using AutoMapper;
+using IRaCIS.Application.Services.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
+
+
+
+
+
+
+
+}

IRC.Core.SCP/Service/CStoreSCPService.cs

@@ -0,0 +1,370 @@
+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);
+
+            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));
+        }
+
+    }
+}

IRC.Core.SCP/Service/DicomArchiveService.cs

@@ -0,0 +1,356 @@
+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);
+
+
+        }
+    }
+}

IRC.Core.SCP/Service/Interface/IDicomArchiveService.cs

@@ -0,0 +1,11 @@
+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);
+
+    }
+}

IRC.Core.SCP/Service/OSSService.cs

@@ -0,0 +1,442 @@
+using Aliyun.OSS;
+using IRaCIS.Core.Infrastructure;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using Minio.DataModel.Args;
+using Minio;
+using SharpCompress.Common;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+
+namespace IRaCIS.Core.SCP
+{
+    public class MinIOOptions : AWSOptions
+    {
+        public int port { get; set; }
+
+    }
+
+    public class AWSOptions
+    {
+        public string endPoint { get; set; }
+        public bool useSSL { get; set; }
+        public string accessKey { get; set; }
+        public string secretKey { get; set; }
+        public string bucketName { get; set; }
+        public string viewEndpoint { 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 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 AliyunOSSOptions AliyunOSS { get; set; }
+
+        public MinIOOptions MinIO { get; set; }
+
+        public AWSOptions AWS { get; set; }
+
+    }
+
+    public class AliyunOSSTempToken
+    {
+        public string AccessKeyId { get; set; }
+        public string AccessKeySecret { get; set; }
+        public string SecurityToken { get; set; }
+        public string Expiration { get; set; }
+
+        public string Region { get; set; }
+        public string BucketName { get; set; }
+        public string ViewEndpoint { get; set; }
+    }
+
+
+
+    public enum ObjectStoreUse
+    {
+        AliyunOSS = 0,
+        MinIO = 1,
+        AWS = 2,
+    }
+
+    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 class OSSService : IOSSService
+    {
+        public ObjectStoreServiceOptions ObjectStoreServiceOptions { 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)
+        {
+            var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
+            //var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}";
+            //var ossRelativePath = 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, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+
+
+                        // 上传文件
+                        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.accessKey, minIOConfig.secretKey).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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+
+                        var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                            .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                            .Build();
+
+                        var putObjectArgs = new PutObjectArgs()
+                               .WithBucket(minIOConfig.bucketName)
+                               .WithObject(ossRelativePath)
+                               .WithStreamData(memoryStream)
+                               .WithObjectSize(memoryStream.Length);
+
+                        await minioClient.PutObjectAsync(putObjectArgs);
+                    }
+                    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>
+        /// <returns></returns>
+        /// <exception cref="BusinessValidationFailedException"></exception>
+        public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
+        {
+            var localFileName = Path.GetFileName(localFilePath);
+
+            var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}";
+
+
+            //var ossRelativePath = oosFolderPath + "/" + localFileName;
+
+
+            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+            {
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.endPoint : aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+                // 上传文件
+                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.accessKey, minIOConfig.secretKey).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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+
+                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                    .Build();
+
+                var putObjectArgs = new PutObjectArgs()
+                       .WithBucket(minIOConfig.bucketName)
+                       .WithObject(ossRelativePath)
+                       .WithFileName(localFilePath);
+
+                await minioClient.PutObjectAsync(putObjectArgs);
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+            return "/" + ossRelativePath;
+
+        }
+
+
+        public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
+        {
+
+            ossRelativePath = ossRelativePath.TrimStart('/');
+            try
+            {
+
+
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.endPoint : aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+                    // 上传文件
+                    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.accessKey, minIOConfig.secretKey).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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var getObjectArgs = new GetObjectArgs()
+                    .WithBucket(minIOConfig.bucketName)
+                    .WithObject(ossRelativePath)
+                    .WithFile(localFilePath);
+
+                    await minioClient.GetObjectAsync(getObjectArgs);
+                }
+                else
+                {
+                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                }
+            }
+            catch (Exception ex)
+            {
+
+                throw new BusinessValidationFailedException("oss下载失败!" + ex.Message);
+            }
+
+
+
+
+
+        }
+
+        public async Task<string> GetSignedUrl(string ossRelativePath)
+        {
+            ossRelativePath = ossRelativePath.TrimStart('/');
+            try
+            {
+
+
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.endPoint : aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+                    // 生成签名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.accessKey, minIOConfig.secretKey).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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var args = new PresignedGetObjectArgs()
+                        .WithBucket(minIOConfig.bucketName)
+                        .WithObject(ossRelativePath)
+                        .WithExpiry(3600);
+
+                    var presignedUrl = await minioClient.PresignedGetObjectAsync(args);
+
+                    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);
+            }
+
+        }
+    }
+
+
+
+}

IRC.Core.SCP/appsettings.Prod_IRC_SCP.json

@@ -0,0 +1,44 @@
+{
+  "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": "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",
+      "port": "8001",
+      "useSSL": false,
+      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "bucketName": "test"
+    }
+  },
+
+  "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
+  }
+
+}

IRC.Core.SCP/appsettings.Test_IRC_SCP.json

@@ -6,20 +6,11 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=us-mssql-service,1433;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-mssql-service,1433;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-
-    //"RemoteNew": "Server=44.218.11.19,1435;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    //"Hangfire": "Server=44.218.11.19,1435;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-
   "ObjectStoreService": {
-
-    "ObjectStoreUse": "AWS",
-
+    "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",
@@ -30,24 +21,29 @@
     },
 
     "MinIO": {
-      "endPoint": "192.168.3.68",
-      "port": "8001",
+      "endPoint": "106.14.89.110",
+      "port": "9001",
       "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test",
-      "viewEndpoint": "http://192.168.3.68:8001/test/"
+      "accessKey": "fbStsVYCIPKHQneeqMwD",
+      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      "bucketName": "hir-test",
+      "viewEndpoint": "http://106.14.89.110:9001/hir-test/"
     },
 
     "AWS": {
       "endPoint": "s3.us-east-1.amazonaws.com",
-      "useSSL": true,
+      "useSSL": false,
       "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
       "secretKey": "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",
       "bucketName": "ei-irc-test-store",
       "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
     }
   },
+
+  "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"
+  },
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": false,
@@ -57,18 +53,28 @@
     "OpenTrialRelationDelete": true,
 
     "OpenLoginLimit": false,
-
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30
+
   },
 
   "SystemEmailSendConfig": {
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
+    "FromEmail": "test-study@extimaging.com",
+    "FromName": "Test_Study",
+    "AuthorizationCode": "zhanying123",
 
+    "SiteUrl": "http://study.test.extimaging.com/login"
+  },
+  "DicomSCPServiceConfig": {
+    "CalledAEList": [
+      "STORESCP",
+      "Value1",
+      "Value2",
+      "Value3"
+    ],
+    "ServerPort": 11112
+  }
 }

IRC.Core.SCP/appsettings.Uat_IRC_SCP.json

@@ -0,0 +1,67 @@
+{
+  "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": "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"
+    },
+
+    "AWS": {
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": false,
+      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
+      "secretKey": "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",
+      "bucketName": "ei-irc-test-store",
+      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
+    }
+  },
+  "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"
+  },
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "uat-study@extimaging.com",
+    "FromName": "Uat_Study",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "http://study.uat.extimaging.com/login"
+  },
+  "DicomSCPServiceConfig": {
+    "CalledAEList": [
+      "STORESCP",
+      "Value1",
+      "Value2",
+      "Value3"
+    ],
+    "ServerPort": 11112
+  }
+}

IRC.Core.SCP/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

IRaCIS.Core.API.sln

@@ -17,6 +17,8 @@ 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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
@@ -51,6 +53,10 @@ 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

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Net.Http;
-using EasyCaching.Core;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
@@ -23,13 +22,21 @@ 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;
 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;
 
 namespace IRaCIS.Api.Controllers
 {
@@ -53,8 +60,8 @@ namespace IRaCIS.Api.Controllers
         /// <param name="doctorId"></param>
         /// <returns></returns>
         [HttpGet, Route("doctor/getDetail/{doctorId:guid}")]
-       
-        public  async Task<IResponseOutput<DoctorDetailDTO>> GetDoctorDetail([FromServices] IAttachmentService attachmentService, [FromServices] IDoctorService _doctorService,
+
+        public async Task<IResponseOutput<DoctorDetailDTO>> GetDoctorDetail([FromServices] IAttachmentService attachmentService, [FromServices] IDoctorService _doctorService,
             [FromServices] IEducationService _educationService, [FromServices] ITrialExperienceService _trialExperienceService,
 
             [FromServices] IResearchPublicationService _researchPublicationService, [FromServices] IVacationService _vacationService, Guid doctorId)
@@ -66,7 +73,7 @@ namespace IRaCIS.Api.Controllers
 
             var doctorDetail = new DoctorDetailDTO
             {
-                AuditView =await _doctorService.GetAuditState(doctorId),
+                AuditView = await _doctorService.GetAuditState(doctorId),
                 BasicInfoView = await _doctorService.GetBasicInfo(doctorId),
                 EmploymentView = await _doctorService.GetEmploymentInfo(doctorId),
                 AttachmentList = await attachmentService.GetAttachments(doctorId),
@@ -77,7 +84,7 @@ namespace IRaCIS.Api.Controllers
                 TrialExperienceView = await _trialExperienceService.GetTrialExperience(doctorId),
                 ResearchPublicationView = await _researchPublicationService.GetResearchPublication(doctorId),
 
-                SpecialtyView =await _doctorService.GetSpecialtyInfo(doctorId),
+                SpecialtyView = await _doctorService.GetSpecialtyInfo(doctorId),
                 InHoliday = (await _vacationService.OnVacation(doctorId)).IsSuccess,
                 IntoGroupInfo = _doctorService.GetDoctorIntoGroupInfo(doctorId),
                 SowList = sowList,
@@ -96,80 +103,31 @@ namespace IRaCIS.Api.Controllers
         /// <summary>  系统用户登录接口[New] </summary>
         [HttpPost, Route("user/login")]
         [AllowAnonymous]
-        public  async Task<IResponseOutput<LoginReturnDTO>>  Login(UserLoginDTO loginUser, [FromServices] IEasyCachingProvider provider, [FromServices] IUserService _userService,
+        public async Task<IResponseOutput> Login(UserLoginDTO loginUser,
+            [FromServices] IFusionCache _fusionCache,
+            [FromServices] IUserService _userService,
             [FromServices] ITokenService _tokenService,
-
-			 [FromServices] IReadingImageTaskService readingImageTaskService,
-			[FromServices] IConfiguration configuration)
+            [FromServices] IReadingImageTaskService readingImageTaskService,
+            [FromServices] IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
+            [FromServices] IMailVerificationService _mailVerificationService)
         {
 
-
-            var returnModel = await _userService.Login(loginUser.UserName, loginUser.Password);
-
-            if (returnModel.IsSuccess)
+            //MFA 邮箱验证  前端传递用户Id  和MFACode
+            if (loginUser.UserId != null && _verifyConfig.CurrentValue.OpenLoginMFA)
             {
-                #region GRPC 调用鉴权中心，因为服务器IIS问题 http/2   故而没法使用
+                Guid userId = (Guid)loginUser.UserId;
 
-                ////重试策略
-                //var defaultMethodConfig = new MethodConfig
-                //{
-                //    Names = { MethodName.Default },
-                //    RetryPolicy = new RetryPolicy
-                //    {
-                //        MaxAttempts = 3,
-                //        InitialBackoff = TimeSpan.FromSeconds(1),
-                //        MaxBackoff = TimeSpan.FromSeconds(5),
-                //        BackoffMultiplier = 1.5,
-                //        RetryableStatusCodes = { Grpc.Core.StatusCode.Unavailable }
-                //    }
-                //};
+                //验证MFA 编码是否有问题 ,前端要拆开，自己调用验证的逻辑
+                //await _userService.VerifyMFACodeAsync(userId, loginUser.MFACode);
 
-                //#region  unable to trust the certificate then the gRPC client can be configured to ignore the invalid certificate
+                //var loginUser = await _userRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
-                //var httpHandler = new HttpClientHandler();
-                //// Return `true` to allow certificates that are untrusted/invalid
-                //httpHandler.ServerCertificateCustomValidationCallback =
-                //    HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
+                var basicInfo = await _userService.GetUserBasicInfo(userId, loginUser.Password);
 
+                var loginReturn = new LoginReturnDTO() { BasicInfo = basicInfo };
 
-                //////这一句是让grpc支持本地 http  如果本地访问部署在服务器上，那么是访问不成功的 
-                //AppContext.SetSwitch(
-                //    "System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
+                loginReturn.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(loginReturn.BasicInfo));
 
-                //#endregion
-
-
-
-                //var grpcAdress = configuration.GetValue<string>("GrpcAddress");
-                ////var grpcAdress = "http://localhost:7200";
-
-                //var channel = GrpcChannel.ForAddress(grpcAdress, new GrpcChannelOptions
-                //{
-                //    HttpHandler = httpHandler,
-                //    ServiceConfig = new ServiceConfig { MethodConfigs = { defaultMethodConfig } }
-
-                //});
-                ////var channel = GrpcChannel.ForAddress(grpcAdress);
-                //var grpcClient = new TokenGrpcService.TokenGrpcServiceClient(channel);
-
-                //var userInfo = returnModel.Data.BasicInfo;
-
-                //var tokenResponse = grpcClient.GetUserToken(new GetTokenReuqest()
-                //{
-                //    Id = userInfo.Id.ToString(),
-                //    ReviewerCode = userInfo.ReviewerCode,
-                //    IsAdmin = userInfo.IsAdmin,
-                //    RealName = userInfo.RealName,
-                //    UserTypeEnumInt = (int)userInfo.UserTypeEnum,
-                //    UserTypeShortName = userInfo.UserTypeShortName,
-                //    UserName = userInfo.UserName
-                //});
-
-                //returnModel.Data.JWTStr = tokenResponse.Token;
-
-                #endregion
-
-                returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
 
                 // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
                 var option = new CookieOptions
@@ -180,20 +138,145 @@ namespace IRaCIS.Api.Controllers
                     Secure = false // 确保 cookie 只能通过 HTTPS 访问
                 };
 
-                HttpContext.Response.Cookies.Append("access_token", returnModel.Data.JWTStr, option);
+                HttpContext.Response.Cookies.Append("access_token", loginReturn.JWTStr, option);
+
+                // 验证阅片休息时间
+                await readingImageTaskService.ResetReadingRestTime(userId);
+
+                await _fusionCache.SetAsync(userId.ToString(), loginReturn.JWTStr, TimeSpan.FromDays(7));
+
+                await _fusionCache.SetAsync($"{userId.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
+
+                return ResponseOutput.Ok(loginReturn);
+
+            }
+            else
+            {
+                var returnModel = await _userService.Login(loginUser.UserName, loginUser.Password);
+
+                if (returnModel.IsSuccess)
+                {
+                    #region GRPC 调用鉴权中心，因为服务器IIS问题 http/2   故而没法使用
+
+                    ////重试策略
+                    //var defaultMethodConfig = new MethodConfig
+                    //{
+                    //    Names = { MethodName.Default },
+                    //    RetryPolicy = new RetryPolicy
+                    //    {
+                    //        MaxAttempts = 3,
+                    //        InitialBackoff = TimeSpan.FromSeconds(1),
+                    //        MaxBackoff = TimeSpan.FromSeconds(5),
+                    //        BackoffMultiplier = 1.5,
+                    //        RetryableStatusCodes = { Grpc.Core.StatusCode.Unavailable }
+                    //    }
+                    //};
+
+                    //#region  unable to trust the certificate then the gRPC client can be configured to ignore the invalid certificate
+
+                    //var httpHandler = new HttpClientHandler();
+                    //// Return `true` to allow certificates that are untrusted/invalid
+                    //httpHandler.ServerCertificateCustomValidationCallback =
+                    //    HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
+
+
+                    //////这一句是让grpc支持本地 http  如果本地访问部署在服务器上，那么是访问不成功的 
+                    //AppContext.SetSwitch(
+                    //    "System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
+
+                    //#endregion
+
+
+
+                    //var grpcAdress = configuration.GetValue<string>("GrpcAddress");
+                    ////var grpcAdress = "http://localhost:7200";
+
+                    //var channel = GrpcChannel.ForAddress(grpcAdress, new GrpcChannelOptions
+                    //{
+                    //    HttpHandler = httpHandler,
+                    //    ServiceConfig = new ServiceConfig { MethodConfigs = { defaultMethodConfig } }
+
+                    //});
+                    ////var channel = GrpcChannel.ForAddress(grpcAdress);
+                    //var grpcClient = new TokenGrpcService.TokenGrpcServiceClient(channel);
+
+                    //var userInfo = returnModel.Data.BasicInfo;
+
+                    //var tokenResponse = grpcClient.GetUserToken(new GetTokenReuqest()
+                    //{
+                    //    Id = userInfo.Id.ToString(),
+                    //    ReviewerCode = userInfo.ReviewerCode,
+                    //    IsAdmin = userInfo.IsAdmin,
+                    //    RealName = userInfo.RealName,
+                    //    UserTypeEnumInt = (int)userInfo.UserTypeEnum,
+                    //    UserTypeShortName = userInfo.UserTypeShortName,
+                    //    UserName = userInfo.UserName
+                    //});
+
+                    //returnModel.Data.JWTStr = tokenResponse.Token;
+
+                    #endregion
+
+                    var userId = returnModel.Data.BasicInfo.Id;
+
+                    if (_verifyConfig.CurrentValue.OpenLoginMFA)
+                    {
+                        //发版屏蔽
+
+                        //returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
+
+                        //MFA 发送邮件
+
+                        returnModel.Data.IsMFA = true;
+
+                        var email = returnModel.Data.BasicInfo.EMail;
+
+                        var hiddenEmail = EmailMaskHelper.MaskEmail(email);
+
+                        returnModel.Data.BasicInfo.EMail = hiddenEmail;
+
+                        await _userService.SendMFAEmail(userId);
+
+                    }
+                    else
+                    {
+                        returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
+
+                        // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
+                        var option = new CookieOptions
+                        {
+                            Expires = DateTime.Now.AddMonths(1), // 设置过期时间为 30 分钟之后
+                            HttpOnly = false, // 确保 cookie 只能通过 HTTP 访问
+                            SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
+                            Secure = false // 确保 cookie 只能通过 HTTPS 访问
+                        };
+
+                        HttpContext.Response.Cookies.Append("access_token", returnModel.Data.JWTStr, option);
+
+
+
+                        // 验证阅片休息时间
+                        await readingImageTaskService.ResetReadingRestTime(returnModel.Data.BasicInfo.Id);
+
+                        await _fusionCache.SetAsync(CacheKeys.UserToken(userId), 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));
+                    }
+
+                }
+                return returnModel;
 
             }
 
-            var userId = returnModel.Data.BasicInfo.Id.ToString();
-            //provider.Set(userId, userId, TimeSpan.FromMinutes(AppSettings.LoginExpiredTimeSpan));
-            // 验证阅片休息时间
-            await readingImageTaskService.ResetReadingRestTime(returnModel.Data.BasicInfo.Id);
-			await provider.SetAsync(userId.ToString(), returnModel.Data.JWTStr, TimeSpan.FromDays(7));
-            return returnModel;
+
+
+
         }
 
 
 
+
+
         [HttpGet, Route("imageShare/ShareImage")]
         [AllowAnonymous]
         public IResponseOutput ShareImage([FromServices] ITokenService _tokenService)
@@ -214,7 +297,7 @@ namespace IRaCIS.Api.Controllers
         }
 
         [HttpGet("user/GetObjectStoreToken")]
-        public IResponseOutput GetObjectStoreToken([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options)
+        public async Task<IResponseOutput> GetObjectStoreTokenAsync([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options)
         {
             var serviceOption = options.CurrentValue;
 
@@ -223,107 +306,186 @@ namespace IRaCIS.Api.Controllers
 
                 var ossOptions = serviceOption.AliyunOSS;
 
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO ,AliyunOSS= serviceOption.AliyunOSS,AWS=serviceOption.AWS });
+                var client = new Client(new AlibabaCloud.OpenApiClient.Models.Config()
+                {
+                    AccessKeyId = ossOptions.AccessKeyId,
+                    AccessKeySecret = ossOptions.AccessKeySecret,
+                    //AccessKeyId = "LTAI5tJV76pYX5yPg1N9QVE8",
+                    //AccessKeySecret = "roRNLa9YG1of4pYruJGCNKBXEWTAWa",
 
-                #region 临时token 屏蔽
-                //IClientProfile profile = DefaultProfile.GetProfile(ossOptions.RegionId, ossOptions.AccessKeyId, ossOptions.AccessKeySecret);
-                //DefaultAcsClient client = new DefaultAcsClient(profile);
+                    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 = credentials.Expiration,
+                    SecurityToken = credentials.SecurityToken,
 
 
-                //// 创建一个STS请求
-                //AssumeRoleRequest request = new AssumeRoleRequest
-                //{
-                //    RoleArn = ossOptions.RoleArn, // 角色ARN，需要替换为你的角色ARN
-                //    RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
-                //    DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
-                //};
+                    Region = ossOptions.Region,
+                    BucketName = ossOptions.BucketName,
+                    EndPoint = ossOptions.EndPoint,
+                    ViewEndpoint = ossOptions.ViewEndpoint,
 
+                };
 
-                //AssumeRoleResponse response = client.GetAcsResponse(request);
+                var awstempToken = await GetAWSTemToken(serviceOption);
 
-                //// 返回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,
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse,  AliyunOSS = tempToken,AWS= awstempToken });
 
-                //        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)
+            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 });
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO});
             }
             else
             {
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AWS = serviceOption.AWS });
+                var awsOptions = serviceOption.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 = await stsClient.AssumeRoleAsync(assumeRoleRequest);
+
+                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,
+
+                };
+
+
+
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AWS = tempToken });
             }
-                   
+
         }
 
-            [HttpGet("user/GenerateSTS")]
-        public IResponseOutput GenerateSTS([FromServices]IOptionsMonitor<AliyunOSSOptions> options )
+
+        private async Task<AWSTempToken> GetAWSTemToken(ObjectStoreServiceOptions serviceOption)
         {
-            var ossOptions = options.CurrentValue;
+            var awsOptions = serviceOption.AWS;
 
+            //aws 临时凭证
+            // 创建 STS 客户端
+            var stsClient = new AmazonSecurityTokenServiceClient(awsOptions.AccessKeyId, awsOptions.SecretAccessKey);
 
-            IClientProfile profile = DefaultProfile.GetProfile(ossOptions.regionId, ossOptions.accessKeyId, ossOptions.accessKeySecret);
-            DefaultAcsClient client = new DefaultAcsClient(profile);
-
-
-            // 创建一个STS请求
-            AssumeRoleRequest request = new AssumeRoleRequest
+            // 使用 AssumeRole 请求临时凭证
+            var assumeRoleRequest = new AssumeRoleRequest
             {
-                RoleArn = ossOptions.roleArn, // 角色ARN，需要替换为你的角色ARN
-                RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
-                DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
+
+                RoleArn = awsOptions.RoleArn, // 角色 ARN
+                RoleSessionName = $"session-name-{NewId.NextGuid()}",
+                DurationSeconds = awsOptions.DurationSeconds          // 临时凭证有效期
             };
 
+            var assumeRoleResponse = await stsClient.AssumeRoleAsync(assumeRoleRequest);
 
-            AssumeRoleResponse response = client.GetAcsResponse(request);
+            var credentials = assumeRoleResponse.Credentials;
 
-            // 返回STS令牌信息给前端
-            var stsToken = new
+            var tempToken = new AWSTempToken()
             {
-                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 ,
+                AccessKeyId = credentials.AccessKeyId,
+                SecretAccessKey = credentials.SecretAccessKey,
+                SessionToken = credentials.SessionToken,
+                Expiration = credentials.Expiration,
+                Region = awsOptions.Region,
+                BucketName = awsOptions.BucketName,
+                EndPoint = awsOptions.EndPoint,
+                ViewEndpoint = awsOptions.ViewEndpoint,
 
             };
 
-            return ResponseOutput.Ok(stsToken);
-
+            return tempToken;
         }
 
 
+        #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]
-        public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository,  string url ,[FromServices]ILogger<ExtraController> _logger)
+        public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository, string url, [FromServices] ILogger<ExtraController> _logger)
         {
 
             var decodeUrl = System.Web.HttpUtility.UrlDecode(url);
 
-            var userId = decodeUrl.Substring(decodeUrl.IndexOf("UserId=") + "UserId=".Length , 36) ;
+            var userId = decodeUrl.Substring(decodeUrl.IndexOf("UserId=") + "UserId=".Length, 36);
 
             var token = decodeUrl.Substring(decodeUrl.IndexOf("access_token=") + "access_token=".Length);
 
@@ -331,12 +493,12 @@ namespace IRaCIS.Api.Controllers
 
             var domainStrList = decodeUrl.Split("/").ToList().Take(3).ToList();
 
-            var errorUrl = domainStrList[0]+"//"+ domainStrList[2]+ "/error";
+            var errorUrl = domainStrList[0] + "//" + domainStrList[2] + "/error";
 
 
-            if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId)  && t.EmailToken == token && t.IsFirstAdd))
+            if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
             {
-                decodeUrl = errorUrl+ $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang=="zh"? "您的初始化链接已过期": "Error！The initialization link has expired.    Return")} ";
+                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.    Return")} ";
             }
 
             return Redirect(decodeUrl);
@@ -348,7 +510,7 @@ namespace IRaCIS.Api.Controllers
 
         [HttpGet, Route("ip")]
         [AllowAnonymous]
-        public IResponseOutput Get([FromServices] IHttpContextAccessor _context/*, [FromServices] IUserService _userService*/)
+        public IResponseOutput Get([FromServices] IHttpContextAccessor _context)
         {
 
             StringBuilder sb = new StringBuilder();
@@ -369,7 +531,7 @@ namespace IRaCIS.Api.Controllers
 
         [HttpGet, Route("ip2")]
         [AllowAnonymous]
-        public IResponseOutput Get2([FromServices] IHttpContextAccessor _context, [FromServices] IRepository _userService)
+        public IResponseOutput Get2([FromServices] IHttpContextAccessor _context)
         {
 
             StringBuilder sb = new StringBuilder();

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -19,18 +19,12 @@ namespace IRaCIS.Core.API.Controllers.Special
     //谨慎修改 涉及到财务模块
 
     [ApiController, Authorize, ApiExplorerSettings(GroupName = "Financial")]
-    public class FinancialChangeController : ControllerBase
+    public class FinancialChangeController(
+        ITrialService _trialService,
+        ICalculateService _calculateService,
+        IStringLocalizer _localizer) : 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)]

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -26,78 +26,19 @@ namespace IRaCIS.Core.API.Controllers
 
     [ApiController, ApiExplorerSettings(GroupName = "Reviewer")]
     [UnitOfWork]
-    public class InspectionController : ControllerBase
+    public class InspectionController(
+        ITrialDocumentService _trialDocumentService,
+        IReadingImageTaskService _iReadingImageTaskService,
+        ITrialConfigService _trialConfigService,
+        IClinicalAnswerService _clinicalAnswerService,
+        IReadingClinicalDataService _readingClinicalDataService,
+        IQCOperationService _qCOperationService,
+        IInspectionService _inspectionService,
+        IReadingMedicalReviewService _readingMedicalReviewService,
+        IReadingMedicineQuestionService _readingMedicineQuestionService
+        ) : 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>
         /// 获取稽查数据
@@ -308,11 +249,28 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
-         /// <summary>
-         /// 提交结构化录入并签名
-         /// </summary>
-         /// <param name="opt"></param>
-         /// <returns></returns>
+        /// <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>
         [HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
 
@@ -402,6 +360,19 @@ 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>
@@ -419,13 +390,30 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
+		/// <summary>
+		/// 重置并同步项目阅片标准
+		/// </summary>
+		/// <returns></returns>
+		[HttpPost, Route("Inspection/ReadingCriterion/ResetAndAsyncCriterion")]
+		[UnitOfWork]
+		[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
 
-        /// <summary>
-        /// CRC RequestToQC  批量提交
-        /// </summary>
-        /// <param name="opt"></param>
-        /// <returns></returns>
-        [HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")]
+		public async Task<IResponseOutput> ResetAndAsyncCriterion(DataInspectionDto<ResetAndAsyncCriterionInDto> opt)
+		{
+			var singid = await _inspectionService.RecordSing(opt.SignInfo);
+			var result = await _trialConfigService.ResetAndAsyncCriterion(opt.Data);
+			await _inspectionService.CompletedSign(singid, result);
+			return result;
+		}
+
+
+
+		/// <summary>
+		/// CRC RequestToQC  批量提交
+		/// </summary>
+		/// <param name="opt"></param>
+		/// <returns></returns>
+		[HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         [UnitOfWork]
         public async Task<IResponseOutput> CRCRequestToQC(DataInspectionDto<CRCRequestToQCCommand> opt)

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -1,6 +1,5 @@
 using AutoMapper;
 using DocumentFormat.OpenXml.Drawing;
-using EasyCaching.Core;
 using ExcelDataReader;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
@@ -10,8 +9,7 @@ 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.MediatR.CommandAndQueries;
-using IRaCIS.Core.Application.MediatR.Handlers;
+using IRaCIS.Core.Application.MassTransit.Command;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.ImageAndDoc;
 using IRaCIS.Core.Application.Service.Reading.Dto;
@@ -20,9 +18,8 @@ using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
-using Magicodes.ExporterAndImporter.Excel;
 using MassTransit;
-using MediatR;
+using MassTransit.Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
@@ -33,12 +30,12 @@ using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 using MiniExcelLibs;
 using Newtonsoft.Json;
 using SharpCompress.Archives;
-using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -47,6 +44,7 @@ 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
@@ -229,31 +227,14 @@ namespace IRaCIS.Core.API.Controllers
 
     [ApiExplorerSettings(GroupName = "Image")]
     [ApiController]
-    public class StudyController : UploadBaseController
+    public class StudyController(
+        IMediator _mediator,
+        QCCommon _qCCommon,
+        IUserInfo _userInfo,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IStringLocalizer _localizer) : UploadBaseController
     {
-        public IMapper _mapper { get; set; }
-        public IUserInfo _userInfo { get; set; }
-        private readonly IMediator _mediator;
-
-        private readonly IWebHostEnvironment _hostEnvironment;
-
-        private readonly IRepository _repository;
-
-        private readonly IEasyCachingProvider _provider;
-        private readonly QCCommon _qCCommon;
-        public StudyController(IMapper mapper, IUserInfo userInfo, IWebHostEnvironment hostEnvironment, IMediator mediator, IEasyCachingProvider provider,
-             QCCommon qCCommon,
-            IRepository repository)
-        {
-            _qCCommon = qCCommon;
-            _provider = provider;
-            _hostEnvironment = hostEnvironment;
-            _mediator = mediator;
-
-            _mapper = mapper;
-            _userInfo = userInfo;
-            _repository = repository;
-        }
+       
 
 
         [HttpPost, Route("Study/PreArchiveStudy")]
@@ -263,17 +244,11 @@ namespace IRaCIS.Core.API.Controllers
              [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,
-                SiteId = savedInfo.SiteId,
                 SubjectId = savedInfo.SubjectId,
                 SubjectVisitId = savedInfo.SubjectVisitId,
 
@@ -296,9 +271,8 @@ namespace IRaCIS.Core.API.Controllers
         [DisableFormValueModelBinding]
         [DisableRequestSizeLimit]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        public async Task<IResponseOutput> ArchiveStudyNew(/*[FromForm] ArchiveStudyCommand archiveStudyCommand,*/ Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId, Guid studyMonitorId,
+        public async Task<IResponseOutput> ArchiveStudyNew( 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,
@@ -313,7 +287,7 @@ namespace IRaCIS.Core.API.Controllers
                 string.IsNullOrEmpty(mediaTypeHeader.Boundary.Value))
             {
                 //---不支持的MediaType
-                return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_UnsupportedMedia"));
+                return ResponseOutput.NotOk(_localizer["UploadDownLoad_UnsupportedMedia"]);
             }
 
             var archiveStudyCommand = new ArchiveStudyCommand() { AbandonStudyId = abandonStudyId, StudyInstanceUid = studyInstanceUid, SubjectVisitId = subjectVisitId };
@@ -323,22 +297,6 @@ 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));
-            //}
 
             //到了接口，代表上传结束了
 
@@ -402,15 +360,14 @@ namespace IRaCIS.Core.API.Controllers
 
 
             }
-            catch (Exception )
+            catch (Exception)
             {
-                _provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}");
 
                 //---请求异常,请重试！
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_RequestError"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_RequestError"]);
             }
 
-            studyMonitor.FileSize = (decimal)HttpContext.Request.ContentLength;
+            studyMonitor.FileSize = (long)HttpContext.Request.ContentLength;
             studyMonitor.FileCount = archiveResult.ReceivedFileCount;
             studyMonitor.FailedFileCount = archiveResult.ErrorFiles.Count;
             studyMonitor.IsDicomReUpload = archiveStudyCommand.AbandonStudyId != null;
@@ -443,7 +400,6 @@ 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;
@@ -477,6 +433,8 @@ namespace IRaCIS.Core.API.Controllers
                 public string FilePath { get; set; }
                 public string FileName { get; set; }
                 public int FileFize { get; set; }
+
+                public string FileType { get; set; }
             }
         }
 
@@ -486,12 +444,15 @@ namespace IRaCIS.Core.API.Controllers
         /// <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<NoneDicomStudy> _noneDicomStudyRepository,
+            [FromServices] IRepository<StudyMonitor> _studyMonitorRepository,
+            [FromServices] IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository)
         {
 
             var subjectVisitId = incommand.SubjectVisitId;
@@ -499,9 +460,9 @@ namespace IRaCIS.Core.API.Controllers
             var noneDicomStudyId = incommand.NoneDicomStudyId;
 
 
-            await _qCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId);
+            await _qCCommon.VerifyIsCRCSubmmitAsync(_subjectVisitRepository, _userInfo, subjectVisitId);
 
-            var sv = (await _repository.Where<SubjectVisit>(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.SiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException();
+            var sv = (await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.TrialSiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException();
 
             var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == studyMonitorId);
 
@@ -509,7 +470,7 @@ namespace IRaCIS.Core.API.Controllers
 
             foreach (var item in incommand.UploadedFileList)
             {
-                await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId });
+                await _noneDicomStudyFileRepository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId,FileType=item.FileType,FileSize=item.FileFize });
 
             }
             var uploadFinishedTime = DateTime.Now;
@@ -526,8 +487,9 @@ namespace IRaCIS.Core.API.Controllers
             studyMonitor.StudyCode = noneDicomStudy.StudyCode;
             studyMonitor.ArchiveFinishedTime = DateTime.Now;
             studyMonitor.IP = _userInfo.IP;
+            studyMonitor.IsSuccess = true;
 
-            await _repository.SaveChangesAsync();
+            await _noneDicomStudyRepository.SaveChangesAsync();
 
             return ResponseOutput.Ok();
         }
@@ -541,12 +503,13 @@ 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)
+        public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService, [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
         {
 
             var fileName = string.Empty;
@@ -556,10 +519,10 @@ namespace IRaCIS.Core.API.Controllers
             {
                 fileName = realFileName;
 
-                if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".csv") && !fileName.EndsWith(".xls"))
+                if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".xls"))
                 {
-                    //---支持.xlsx、.xls、.csv格式的文件上传。
-                    throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_SupportedFormats"));
+                    //---支持.xlsx、.xls格式的文件上传。
+                    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_SupportedFormats"]);
                 }
 
                 fileStream.CopyTo(templateFileStream);
@@ -568,7 +531,7 @@ namespace IRaCIS.Core.API.Controllers
 
                 var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/Check", realFileName);
 
-                await _repository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
+                await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
 
                 return ossRelativePath;
 
@@ -580,9 +543,22 @@ namespace IRaCIS.Core.API.Controllers
             var etcCheckList = new List<CheckViewModel>();
 
 
-
             #region MiniExcel  需要自己验证数据格式规范
 
+
+            if (fileName.EndsWith(".xlsx"))
+            {
+                etcCheckList = MiniExcel.Query<CheckViewModel>(templateFileStream, excelType: ExcelType.XLSX).ToList();
+            }
+            else if (fileName.EndsWith(".csv"))
+            {
+                //因为csv 需要加配置文件 不然都是null
+                etcCheckList = MiniExcel.Query<CheckViewModel>(templateFileStream, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration()
+                {
+                    StreamReaderFunc = (stream) => new StreamReader(stream, Encoding.GetEncoding("gb2312"))
+                }).ToList();
+
+            }
             //if (fileName.EndsWith(".csv"))
             //{
             //    //因为csv 需要加配置文件 不然都是null
@@ -598,67 +574,72 @@ namespace IRaCIS.Core.API.Controllers
 
             #endregion
 
+            #region 升级net8 导入有问题
+
+
             //Magicodes 支持自定义特性验证
-            if (fileName.EndsWith(".xlsx"))
-            {
-                var Importer = new ExcelImporter();
+            //    if (fileName.EndsWith(".xlsx"))
+            //{
+            //    var Importer = new ExcelImporter();
 
-                var import = await Importer.Import<CheckViewModel>(templateFileStream);
+            //    var import = await Importer.Import<CheckViewModel>(templateFileStream);
 
-                if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
+            //    if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
 
-                //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
+            //    //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
 
-                if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
+            //    if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(_localizer["UploadDownLoad_TemplateErrors"]);
 
-                etcCheckList = import.Data.ToList();
-            }
-            else if (fileName.EndsWith(".csv"))
-            {
-                #region   临时方案   MiniExcel读取  然后保存为xlsx  再用 Magicodes验证数据
+            //    etcCheckList = import.Data.ToList();
+            //}
+            //else if (fileName.EndsWith(".csv"))
+            //{
+            //    #region   临时方案   MiniExcel读取  然后保存为xlsx  再用 Magicodes验证数据
 
-                //因为csv 需要加配置文件 不然都是null
-                etcCheckList = MiniExcel.Query<CheckViewModel>(templateFileStream, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration()
-                {
-                    StreamReaderFunc = (stream) => new StreamReader(stream, Encoding.GetEncoding("gb2312"))
-                }).ToList();
+            //    //因为csv 需要加配置文件 不然都是null
+            //    etcCheckList = MiniExcel.Query<CheckViewModel>(templateFileStream, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration()
+            //    {
+            //        StreamReaderFunc = (stream) => new StreamReader(stream, Encoding.GetEncoding("gb2312"))
+            //    }).ToList();
 
-                var (csVToXlsxPath, csVToXlsxRelativePath) = FileStoreHelper.GetTrialCheckFilePath(_hostEnvironment, Path.GetFileNameWithoutExtension(fileName) + ".xlsx", trialId);
+            //    var (csVToXlsxPath, csVToXlsxRelativePath) = FileStoreHelper.GetTrialCheckFilePath(_hostEnvironment, Path.GetFileNameWithoutExtension(fileName) + ".xlsx", trialId);
 
 
-                await MiniExcel.SaveAsAsync(csVToXlsxPath, etcCheckList, excelType: ExcelType.XLSX);
+            //    await MiniExcel.SaveAsAsync(csVToXlsxPath, etcCheckList, excelType: ExcelType.XLSX);
 
 
-                var Importer = new ExcelImporter();
+            //    var Importer = new ExcelImporter();
 
-                var import = await Importer.Import<CheckViewModel>(System.IO.File.OpenRead(csVToXlsxPath));
+            //    var import = await Importer.Import<CheckViewModel>(System.IO.File.OpenRead(csVToXlsxPath));
 
-                if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
+            //    if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
 
-                //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
+            //    //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
 
-                if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
+            //    if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
 
-                etcCheckList = import.Data.ToList();
+            //    etcCheckList = import.Data.ToList();
 
-                #endregion
+            //    #endregion
 
 
-                #region 导入组件有问题  excel编码格式
-                //var Importer = new CsvImporter();
+            //    #region 导入组件有问题  excel编码格式
+            //    //var Importer = new CsvImporter();
 
-                //var import = await Importer.Import<CheckViewModel>(File.OpenRead(filePath));
+            //    //var import = await Importer.Import<CheckViewModel>(File.OpenRead(filePath));
 
-                //if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
+            //    //if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
 
-                //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
+            //    //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
 
-                //if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
+            //    //if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
 
-                //etcCheckList = import.Data.ToList();
-                #endregion
+            //    //etcCheckList = import.Data.ToList();
+            //    #endregion
 
-            }
+            //}
+
+            #endregion
             //ExcelReaderFactory  需要自己验证数据 并且从固定列取数据
             else
             {
@@ -697,7 +678,7 @@ namespace IRaCIS.Core.API.Controllers
             if (etcCheckList == null || etcCheckList.Count == 0)
             {
                 //---请保证上传数据符合模板文件中的样式，且存在有效数据。
-                return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_InvalidData"));
+                return ResponseOutput.NotOk(_localizer["UploadDownLoad_InvalidData"]);
             }
             else
             {
@@ -718,13 +699,18 @@ namespace IRaCIS.Core.API.Controllers
                 if (etcCheckList.Count == 0)
                 {
                     //---请保证上传数据符合模板文件中的样式，且存在有效数据。
-                    return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_InvalidData"));
+                    return ResponseOutput.NotOk(_localizer["UploadDownLoad_InvalidData"]);
                 }
-
             }
 
 
-            await _mediator.Send(new ConsistencyVerificationRequest() { ETCList = etcCheckList, TrialId = trialId });
+
+            // 适合获取结果的
+            //var client = _mediator.CreateRequestClient<ConsistenCheckCommand>();
+            //await client.GetResponse<ConsistenCheckResult>(new ConsistenCheckCommand() { ETCList = etcCheckList, TrialId = trialId });
+
+            //不获取结果，不用定义返回类型
+            await _mediator.Send(new ConsistenCheckCommand() { ETCList = etcCheckList, TrialId = trialId });
 
             return ResponseOutput.Ok();
 
@@ -866,89 +852,6 @@ 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
 
@@ -962,12 +865,13 @@ namespace IRaCIS.Core.API.Controllers
         public IMapper _mapper { get; set; }
         public IUserInfo _userInfo { get; set; }
         private readonly IMediator _mediator;
-
+        public IStringLocalizer _localizer { get; set; }
         private readonly IWebHostEnvironment _hostEnvironment;
 
-        public UploadDownLoadController(IMapper mapper, IUserInfo userInfo, IMediator mediator, IWebHostEnvironment hostEnvironment)
+        public UploadDownLoadController(IMapper mapper, IUserInfo userInfo, IStringLocalizer localizer, IMediator mediator, IWebHostEnvironment hostEnvironment)
         {
             _hostEnvironment = hostEnvironment;
+            _localizer = localizer;
             _mediator = mediator;
             _mapper = mapper;
             _userInfo = userInfo;
@@ -994,7 +898,7 @@ namespace IRaCIS.Core.API.Controllers
                 if (!realFileName.EndsWith(".xlsx", StringComparison.OrdinalIgnoreCase))
                 {
                     //	 请用提供格式的模板excel上传需要处理的数据
-                    throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_TemplateUploadData"));
+                    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_TemplateUploadData"]);
                 }
 
                 var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/SiteSurvey", realFileName);
@@ -1015,7 +919,7 @@ namespace IRaCIS.Core.API.Controllers
             if (excelList.Any(t => string.IsNullOrWhiteSpace(t.TrialSiteCode) || string.IsNullOrWhiteSpace(t.FirstName) || string.IsNullOrWhiteSpace(t.LastName) || string.IsNullOrWhiteSpace(t.Email) || string.IsNullOrWhiteSpace(t.UserTypeStr)))
             {
                 //请确保Excel中 每一行的 中心编号，姓名，邮箱，用户类型数据记录完整再进行上传
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_EnsureCompleteData"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_EnsureCompleteData"]);
             }
 
             var siteCodeList = excelList.Select(t => t.TrialSiteCode.Trim().ToUpper()).Distinct().ToList();
@@ -1023,35 +927,35 @@ namespace IRaCIS.Core.API.Controllers
             if (_trialSiteRepository.Where(t => t.TrialId == trialId && siteCodeList.Contains(t.TrialSiteCode.ToUpper())).Count() != siteCodeList.Count)
             {
                 //在项目中未找到该Excel中部分或全部中心
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_InvalidCenters"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidCenters"]);
             }
 
             if (excelList.GroupBy(t => new { t.TrialSiteCode, t.UserTypeStr, t.Email }).Any(g => g.Count() > 1))
             {
                 //	同一邮箱，同一用户类型，只能生成一个账户,请核查Excel数据
 
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_CheckDuplicateAccounts"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_CheckDuplicateAccounts"]);
             }
 
             if (excelList.Any(t => !t.Email.Contains("@")))
             {
                 //有邮箱不符合邮箱格式,请核查Excel数据
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_InvalidEmail"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidEmail"]);
             }
             var generateUserTypeList = new List<string>() { "CRC", "CRA" };
 
-            if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))
-            {
-                //用户类型仅能为 CRC,SR,CRA 请核查Excel数据
-                throw new BusinessValidationFailedException(StaticData.International("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(StaticData.International("UploadDownLoad_NoValiddata"));
+                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, t.SiteId }).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)
             {
@@ -1072,7 +976,7 @@ namespace IRaCIS.Core.API.Controllers
 
                 }
 
-                item.SiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.ToUpper() == item.TrialSiteCode.ToUpper()).SiteId;
+                item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.ToUpper() == item.TrialSiteCode.ToUpper()).TrialSiteId;
             }
 
 

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -61,27 +61,23 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="aliyun-net-sdk-sts" Version="3.1.2" />
+    <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.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.7" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.13" />
+    <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.SqlServer" Version="1.8.7" />
+	  <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.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
-    <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
-    <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.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>

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -29,7 +29,7 @@
             <param name="doctorId"></param>
             <returns></returns>
         </member>
-        <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.Configuration.IConfiguration)">
+        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,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})">
@@ -167,6 +167,13 @@
             <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>
             提交结构化录入并签名
@@ -208,6 +215,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ResetAndAsyncCriterion(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.ResetAndAsyncCriterionInDto})">
+            <summary>
+            重置并同步项目阅片标准
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCRequestToQC(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.CRCRequestToQCCommand})">
             <summary>
             CRC RequestToQC  批量提交
@@ -265,24 +278,26 @@
         <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},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})">
+        <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})">
             <summary>Dicom 归档</summary>
         </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})">
+        <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})">
             <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)">
+        <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})">
             <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>
@@ -313,38 +328,6 @@
             <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>
@@ -365,6 +348,16 @@
             IPLimit限流 启动服务
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.API.JSONTimeZoneConverter">
+            <summary>
+            序列化，反序列化的时候，处理时间 时区转换
+            </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>
             创建属性
@@ -373,12 +366,10 @@
             <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 name="T:TimeZoneAdjustmentMiddleware">
+            <summary>
+            废弃，没用
+            </summary>
         </member>
         <member name="T:ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt.CustomHSJWTService">
             <summary>

IRaCIS.Core.API/Middleware/TimeZoneAdjustmentMiddleware.cs

@@ -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);
+    }
+
+}

IRaCIS.Core.API/Progranm.cs

@@ -4,8 +4,6 @@ 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;
@@ -24,10 +22,20 @@ using IRaCIS.Core.Application.Filter;
 using Microsoft.AspNetCore.HttpOverrides;
 using IRaCIS.Application.Services.BackGroundJob;
 using LogDashboard;
-using OfficeOpenXml.Utils;
-
-
+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;
 
+AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
 #region 获取环境变量
 //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
 var config = new ConfigurationBuilder()
@@ -74,8 +82,8 @@ if (urlsIndex > -1)
 
 NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
 
-builder.Configuration.AddJsonFile("appsettings.json", false, true)
-                     .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
+builder.Configuration.AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), "appsettings.json", false, true)
+                     .AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), $"appsettings.{enviromentName}.json", false, true);
 
 builder.Host
             .UseServiceProviderFactory(new AutofacServiceProviderFactory())
@@ -102,19 +110,19 @@ 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(); // NewtonsoftJson 序列化  处理
+    .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
 
 builder.Services.AddOptions().Configure<SystemEmailSendConfig>(_configuration.GetSection("SystemEmailSendConfig"));
 builder.Services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
 builder.Services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
 builder.Services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
+builder.Services.AddOptions().Configure<EncreptResponseOption>(_configuration.GetSection("EncrypteResponseConfig"));
+builder.Services.AddOptions().Configure<SystemPacsConfig>(_configuration.GetSection("SystemPacsConfig"));
 
 
 //动态WebApi + UnifiedApiResultFilter  省掉控制器代码
@@ -122,7 +130,7 @@ builder.Services.AddDynamicWebApiSetup();
 //AutoMapper
 builder.Services.AddAutoMapperSetup();
 //EF ORM  QueryWithNoLock
-builder.Services.AddEFSetup(_configuration);
+builder.Services.AddEFSetup(_configuration,enviromentName);
 //Http 响应压缩
 builder.Services.AddResponseCompressionSetup();
 //Swagger Api 文档
@@ -131,9 +139,30 @@ builder.Services.AddSwaggerSetup();
 builder.Services.AddJWTAuthSetup(_configuration);
 
 // MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
-builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
+//builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
+
+#region MassTransit
+//masstransit组件 也支持MediatR 中介者模式，但是支持分布式，考虑后续，所以在次替代MediatR
+builder.Services.AddMediator(cfg =>
+{
+    cfg.AddConsumer<ConsistencyCheckConsumer>();
+});
+
+builder.Services.AddMassTransit(cfg =>
+{
+    cfg.UsingInMemory();
+});
+#endregion
+
+
+#region FusionCache
+
+builder.Services.AddFusionCache();
+
+#endregion
+
 // EasyCaching 缓存
-builder.Services.AddEasyCachingSetup(_configuration);
+//builder.Services.AddEasyCachingSetup(_configuration);
 
 // hangfire  定时任务框架  有界面，更友好~
 builder.Services.AddhangfireSetup(_configuration);
@@ -159,8 +188,10 @@ builder.Services.AddSignalR();
 builder.Services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
 
 
+builder.Services.AddSingleton<ISearcher>(new Searcher(CachePolicy.Content, Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "ip2region.xdb")));
 
-
+//builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
+//builder.Services.AddProblemDetails();
 
 #region  历史废弃配置
 //builder.Services.AddMemoryCache();
@@ -187,6 +218,56 @@ var env = app.Environment;
 
 // 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();
 
@@ -195,12 +276,11 @@ 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");
@@ -208,22 +288,24 @@ 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);
 
@@ -256,6 +338,7 @@ var hangfireJobService = app.Services.GetRequiredService<IIRaCISHangfireJob>();
 await hangfireJobService.InitHangfireJobTaskAsync();
 
 
+
 #endregion
 
 try
@@ -291,6 +374,7 @@ try
     //Log.Logger.Warning($"ContentRootPath——GetParent：{Directory.GetParent(env.ContentRootPath).Parent.FullName}");
     //Log.Logger.Warning($"ContentRootPath——xx：{Path.GetDirectoryName(Path.GetDirectoryName(env.ContentRootPath))}");
 
+
     app.Run();
 
 }

IRaCIS.Core.API/Properties/launchSettings.json

@@ -24,13 +24,21 @@
       },
       "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,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Event_IRC"
       },
-      "applicationUrl": "http://localhost:6101"
+      "applicationUrl": "http://localhost:6100"
     },
     "Docker": {
       "commandName": "Docker",
@@ -54,11 +62,11 @@
       },
       "applicationUrl": "http://localhost:6100"
     },
-    "IRaCIS.US_IRC": {
+    "IRaCIS.US_Uat_IRC": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "US_IRC"
+        "ASPNETCORE_ENVIRONMENT": "US_Uat_IRC"
       },
       "applicationUrl": "http://localhost:6100"
     }

IRaCIS.Core.API/SignalRHub/UploadHub.cs

@@ -1,5 +1,4 @@
-using EasyCaching.Core;
-using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.SignalR;

IRaCIS.Core.API/_PipelineExtensions/AuthMiddleware.cs

@@ -1,66 +0,0 @@
-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);
-        }
-    }
-}

IRaCIS.Core.API/_PipelineExtensions/LocalizationConfig.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Builder;
+using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Localization;
 using System.Collections.Generic;
 using System.Globalization;
@@ -12,8 +13,9 @@ namespace IRaCIS.Core.API
         {
             var supportedCultures = new List<CultureInfo>
             {
-                new CultureInfo("en-US"),
-                new CultureInfo("zh-CN")
+                
+                new CultureInfo(StaticData.CultureInfo.en_US),
+                new CultureInfo(StaticData.CultureInfo.zh_CN)
             };
 
             var options = new RequestLocalizationOptions

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

@@ -20,18 +20,20 @@ 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)

IRaCIS.Core.API/_ServiceExtensions/AutoMapperSetup.cs

@@ -1,5 +1,6 @@
 using AutoMapper.EquivalencyExpression;
 using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Domain.Models;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace IRaCIS.Core.API
@@ -14,11 +15,15 @@ namespace IRaCIS.Core.API
                 //AutoMapper.Collection.EntityFrameworkCore
                 automapper.AddCollectionMappers();
 
+
+                // 全局忽略 DomainEvents 属性
+                automapper.AddGlobalIgnore(nameof(Entity.DomainEvents));
+
                 #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
@@ -27,7 +32,7 @@ namespace IRaCIS.Core.API
                 //    // not want to map a null Guid? value to db Guid value
                 //})));
                 #endregion
-            
+
             }, typeof(QCConfig).Assembly);
 
 

IRaCIS.Core.API/_ServiceExtensions/AutofacModuleSetup.cs

@@ -1,5 +1,4 @@
 using Autofac;
-using Autofac.Extras.DynamicProxy;
 using IRaCIS.Core.Application;
 using IRaCIS.Core.Application.BackGroundJob;
 using IRaCIS.Core.Infra.EFCore;
@@ -10,7 +9,6 @@ using System.Linq;
 using System.Reflection;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
-using MediatR;
 using IRaCIS.Application.Services;
 using IRaCIS.Application.Interfaces;
 using AutoMapper;
@@ -51,12 +49,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().EnableClassInterceptors();
+                .PropertiesAutowired().AsImplementedInterfaces();
 
 
 
-            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任务  依赖注入

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -1,31 +1,65 @@
-using Hangfire.SqlServer;
+using EntityFramework.Exceptions.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.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using StackExchange.Redis;
 
 namespace IRaCIS.Core.API
 {
     public static class EFSetup
     {
-        public static void AddEFSetup( this IServiceCollection services, IConfiguration configuration)
+        public static void AddEFSetup( this IServiceCollection services, IConfiguration configuration,string envName)
         {
-            //services.AddScoped<DbContext, IRaCISDBContext>();
+
+            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:
 
             //这个注入没有成功--注入是没问题的，构造函数也只是支持参数就好，错在注入的地方不能写DbContext
             //Web程序中通过重用池中DbContext实例可提高高并发场景下的吞吐量， 这在概念上类似于ADO.NET Provider原生的连接池操作方式，具有节省DbContext实例化成本的优点
-            services.AddDbContext<IRaCISDBContext>(options =>
+            services.AddDbContext<IRaCISDBContext>((sp, options) =>
             {
-                options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, 
-                    contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
+
+                // 在控制台
+                //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.UseLoggerFactory(logFactory);
+
+                options.UseExceptionProcessor();
 
                 options.EnableSensitiveDataLogging();
 
                 options.AddInterceptors(new QueryWithNoLockDbCommandInterceptor());
+                options.AddInterceptors(sp.GetServices<ISaveChangesInterceptor>());
 
                 options.UseProjectables();
 
@@ -50,8 +84,8 @@ namespace IRaCIS.Core.API
                     //triggerOptions.AddTrigger<AddlTrialUserTrigger>();
                     triggerOptions.AddTrigger<VisitTaskIsFrontTaskNeedSignButNotSignTrigger>();
                     triggerOptions.AddTrigger<VisitTaskIbeforeTrigger>();
-                    
 
+                    triggerOptions.AddTrigger<UserLogTrigger>();
 
 
 
@@ -62,6 +96,12 @@ 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 =>
             {

IRaCIS.Core.API/_ServiceExtensions/EasyCachingSetup.cs

@@ -1,7 +1,4 @@
-using EasyCaching.Core;
-using EasyCaching.Core.Configurations;
-using EasyCaching.Interceptor.Castle;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace IRaCIS.Core.API
@@ -10,18 +7,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);
         }
     }
 }

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

@@ -1,46 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System;
-
-namespace IRaCIS.Core.API
-{
-    public class JSONCustomDateConverter : DateTimeConverterBase
-    {
-        private TimeZoneInfo _timeZoneInfo;
-        private string _dateFormat;
-
-        private IUserInfo _userInfo;
-        public JSONCustomDateConverter(string dateFormat, TimeZoneInfo timeZoneInfo, IUserInfo userInfo)
-        {
-            _dateFormat = dateFormat;
-            _timeZoneInfo = timeZoneInfo;
-
-            _userInfo = userInfo;
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var timeZoneId = _userInfo.TimeZoneId;
-
-            var needConvertUtcDateTime = Convert.ToDateTime(value);
-
-
-            var tz = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
-
-
-            var dateTimeOffset = new DateTimeOffset(needConvertUtcDateTime);
-
-            var time = TimeZoneInfo.ConvertTimeFromUtc(needConvertUtcDateTime, tz).ToString(_dateFormat);
-
-            writer.WriteValue(time);
-            writer.Flush();
-        }
-
-    }
-}

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

@@ -0,0 +1,126 @@
+using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Http;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using StackExchange.Redis;
+using System;
+using System.Globalization;
+
+namespace IRaCIS.Core.API
+{
+    /// <summary>
+    /// 序列化，反序列化的时候，处理时间 时区转换
+    /// </summary>
+    public class JSONTimeZoneConverter(IHttpContextAccessor _httpContextAccessor) : DateTimeConverterBase
+    {
+
+        private  TimeZoneInfo _clientTimeZone;
+
+        private  string _dateFormat;
+
+
+
+        public override bool CanConvert(Type objectType)
+        {
+            #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";
+            }
+
+            #endregion
+
+            #region 获取当前请求的客户端时区
+
+            //var timeZoneId = "Etc/UTC";
+            var timeZoneId = "Asia/Shanghai";
+            var timeZoneIdHeader = _httpContextAccessor?.HttpContext?.Request?.Headers["TimeZoneId"];
+
+            if (timeZoneIdHeader is not null && !string.IsNullOrEmpty(timeZoneIdHeader.Value))
+            {
+                timeZoneId = timeZoneIdHeader.Value;
+            }
+
+            _clientTimeZone = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+
+            #endregion
+
+
+            // 仅支持 DateTime 类型的转换
+            return objectType == typeof(DateTime)|| objectType == typeof(DateTime?);
+
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.Value == null)
+            {
+                return null;
+            }
+
+            DateTime dateTime;
+
+            if (reader.ValueType == typeof(DateTime) || reader.ValueType == typeof(DateTime?))
+            {
+                DateTime? nullableDateTime = reader.Value as DateTime?;
+
+
+                if (nullableDateTime != null && nullableDateTime.HasValue)
+                {
+                    dateTime = nullableDateTime.Value;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                if (DateTime.TryParse((string)reader.Value, out dateTime) == false)
+                {
+                    return null;
+                }
+            }
+            
+          
+
+            // 将客户端时间转换为服务器时区的时间
+            var serverZoneTime = TimeZoneInfo.ConvertTime(dateTime, _clientTimeZone, TimeZoneInfo.Local);
+
+            return serverZoneTime;
+
+           
+                      
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {                  
+            DateTime? nullableDateTime = value as DateTime?;
+
+            if (nullableDateTime != null && nullableDateTime.HasValue)
+            {
+                //第一个参数默认使用系统本地时区 也就是应用服务器的时区
+                DateTime clientZoneTime = TimeZoneInfo.ConvertTime(nullableDateTime.Value, _clientTimeZone);
+
+                //writer.WriteValue(clientZoneTime);
+
+                writer.WriteValue(clientZoneTime.ToString(_dateFormat));
+            }
+            else
+            {
+                writer.WriteNull();
+            }            
+        }
+
+    }
+}

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

@@ -0,0 +1,99 @@
+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
+}

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

@@ -1,32 +1,60 @@
 
+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
 {
     public static class NewtonsoftJsonSetup
     {
-        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder)
+        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder, IServiceCollection services)
         {
 
+            services.AddHttpContextAccessor();
+            services.AddScoped<JSONTimeZoneConverter>();
+            services.AddScoped<ObjectStorePathConvert>();
+            services.AddScoped<IOSSService, OSSService>();
+
+
+
             builder.AddNewtonsoftJson(options =>
              {
-                 //options.SerializerSettings.PreserveReferencesHandling = PreserveReferencesHandling.Objects;
+
+                 //大驼峰
+                 //options.SerializerSettings.ContractResolver = new DefaultContractResolver();
+                 //小驼峰
+                 //options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+
+
+
                  // 忽略循环引用
                  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.ContractResolver = new NullToEmptyStringResolver();
 
-                 //options.SerializerSettings.Converters.Add(new JSONCustomDateConverter()) ;
+                 // 设置时间格式 isEn_US? "MM/dd/yyyy HH:mm:ss" :
+                 //options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
+
+                 options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
+
+
+                 //二者只能取其一
+                 //options.SerializerSettings.Converters.Add(new MyDateTimeConverter());
+                 //options.SerializerSettings.Converters.Add(new MyNullableDateTimeConverter());
+
+                 //必须放在后面
+                 options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<JSONTimeZoneConverter>());
 
-                 //IsoDateTimeConverter
-                 //options.SerializerSettings.NullValueHandling = NullValueHandling.Ignore;
 
              })
                 .AddControllersAsServices()//动态webApi属性注入需要

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

@@ -1,8 +1,10 @@
-using Newtonsoft.Json;
+using IRaCIS.Core.Infrastructure.NewtonsoftJson;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace IRaCIS.Core.API
 {
@@ -30,8 +32,20 @@ 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 =>
                 {

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

@@ -0,0 +1,63 @@
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Http;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
+{
+    public class ObjectStorePathConvert : JsonConverter<string>
+    {
+        private readonly IOSSService _oSSService;
+
+        // 构造函数
+        public ObjectStorePathConvert( IOSSService oSSService)
+        {
+            _oSSService = oSSService;
+        }
+
+        public override string ReadJson(JsonReader reader, Type objectType, string existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.String)
+            {
+                return (string)reader.Value;
+            }
+
+            return null;
+        }
+
+        public override void WriteJson(JsonWriter writer, string value, JsonSerializer serializer)
+        {
+            if (value != null)
+            {
+                // 在这里对字符串进行处理，例如转换大小写、去除空格等
+                // 这里只是一个示例，您可以根据实际需求进行更改
+
+                // 获取当前正在序列化的属性名
+                string propertyName = writer.Path.Split('.').Last();
+
+                Regex guidRegex = new Regex(@"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                if (propertyName.IndexOf("Path") > -1 && value.IndexOf('.')>-1 && guidRegex.IsMatch(value))
+                {
+                    var tt= _oSSService.GetSignedUrl(value);
+                    writer.WriteValue(tt);
+                }
+                else
+                {
+                    // 将处理后的字符串写入到 JsonWriter 中
+                    writer.WriteValue(value);
+                }
+               
+            }
+            else
+            {
+                writer.WriteNull();
+            }
+        }
+                                                       
+    }
+}

IRaCIS.Core.API/_ServiceExtensions/ResponseCompressionSetup.cs

@@ -1,18 +1,30 @@
 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;
+            });
         }
     }
 }

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

@@ -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));

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

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Serilog;
 using Serilog.Events;
-using Serilog.Sinks.Email;
+//using Serilog.Sinks.Email;
 using System;
 using System.Net;
 
@@ -29,8 +29,7 @@ namespace IRaCIS.Core.API
                                     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}")
-                   .Filter.ByExcluding(logEvent => logEvent.Properties.ContainsKey("SourceContext") && logEvent.Properties["SourceContext"].ToString().Contains("health"));
+                                    outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext:l} || {Message} || {Exception} ||end {NewLine}");
 
             //.WriteTo.MSSqlServer("Data Source=DESKTOP-4TU9A6M;Initial Catalog=CoreFrame;User ID=sa;Password=123456", "logs", autoCreateSqlTable: true, restrictedToMinimumLevel: LogEventLevel.Information)//从左至右四个参数分别是数据库连接字符串、表名、如果表不存在是否创建、最低等级。Serilog会默认创建一些列。                
 

IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs

@@ -3,6 +3,7 @@ using Hangfire.SqlServer;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Runtime.InteropServices;
 
 namespace IRaCIS.Core.API
 {
@@ -14,19 +15,29 @@ namespace IRaCIS.Core.API
 
             services.AddHangfire(hangFireConfig =>
             {
-
-                //hangFireConfig.UseInMemoryStorage();
-
-                //指定存储介质
-                hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()
+                //本地window 调试 使用内存，服务器部署使用数据库，防止服务器任务调度到本地
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    SchemaName = "dbo",
-                    CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
-                    SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
-                    QueuePollInterval = TimeSpan.Zero,
-                    UseRecommendedIsolationLevel = true,
-                    DisableGlobalLocks = true
-                });
+                    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
+                    });
+                }
+
+
+
+             
 
                 //hangFireConfig.UseTagsWithSql(); //nuget引入Hangfire.Tags.SqlServer
                 //.UseHangfireHttpJob();

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -14,6 +14,7 @@
     "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",
@@ -41,8 +42,16 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60,
 
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
   },
   "SystemEmailSendConfig": {
     "Port": 465,
@@ -50,7 +59,11 @@
     "FromEmail": "uat@extimaging.com",
     "FromName": "UAT_IRC",
     "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.event.extimaging.com/login"
+    "SiteUrl": "http://irc.event.extimaging.com/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
   }
 
 

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -7,13 +7,16 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    //"RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    //"Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    "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"
   },
   "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",
@@ -34,13 +37,22 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": true,
-
     "OpenSignDocumentBeforeWork": true,
 
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
 
-    "LoginFailLockMinutes": 30
+    "AutoLoginOutMinutes": 360,
+
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
   },
 
   "SystemEmailSendConfig": {
@@ -49,6 +61,17 @@
     "FromEmail": "IRC@extimaging.com",
     "FromName": "IRC",
     "AuthorizationCode": "ExtImg@2022",
-    "SiteUrl": "http://irc.extimaging.com/login"
+    "SiteUrl": "http://irc.extimaging.com/login",
+    "OrganizationName": "Extlmaging",
+    "OrganizationNameCN": "Extlmaging",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
+  },
+  "SystemPacsConfig": {
+    "Port": "11113",
+    "IP": "101.132.193.237"
   }
+
 }

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -7,9 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-
+    "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": {
@@ -17,33 +16,36 @@
     "ObjectStoreUse": "AliyunOSS",
 
     "AliyunOSS": {
-      "regionId": "cn-shanghai",
-      "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"
+      "RegionId": "cn-shanghai",
+      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "AccessKeyId": "LTAI5tJV76pYX5yPg1N9QVE8",
+      "AccessKeySecret": "roRNLa9YG1of4pYruJGCNKBXEWTAWa",
+      "BucketName": "zy-irc-test-store",
+      "RoleArn": "acs:ram::1899121822495495:role/webdirect",
+      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      "Region": "oss-cn-shanghai",
+      "DurationSeconds": 7200
     },
-
     "MinIO": {
-      "endPoint": "192.168.3.68",
-      "port": "8001",
-      "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test",
-      "viewEndpoint": "http://192.168.3.68:8001/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": {
-      "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/"
+      "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
     }
   },
 
@@ -59,7 +61,18 @@
 
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 1
+    "LoginFailLockMinutes": 1,
+
+    "AutoLoginOutMinutes": 1,
+
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
   },
 
   "SystemEmailSendConfig": {
@@ -68,8 +81,18 @@
     "FromEmail": "test@extimaging.com",
     "FromName": "Test_IRC",
     "AuthorizationCode": "SHzyyl2021",
+    "SiteUrl": "http://irc.test.extimaging.com/login",
 
-    "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"
   }
-
 }

IRaCIS.Core.API/appsettings.Test_IRC_PGSQL.json

@@ -0,0 +1,95 @@
+{
+  "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"
+  }
+}

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -0,0 +1,88 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "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"
+    //"RemoteNew": "Server=44.210.231.169,1435;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    //"Hangfire": "Server=44.210.231.169,1435;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+  },
+
+  "ObjectStoreService": {
+    "ObjectStoreUse": "AWS",
+    "AliyunOSS": {
+      "regionId": "cn-shanghai",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "",
+      "accessKeySecret": "",
+      "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": "44.210.231.169",
+      "port": "9001",
+      "useSSL": false,
+      "accessKey": "e9bT1isTOqSAUxb6wd4n",
+      "secretKey": "b5TaDzNdQCBtCvfm8eZ3dR6yY7tfZu2JYze2Po1i",
+      "bucketName": "prod-irc-us",
+      "viewEndpoint": "http://44.210.231.169:9001/prod-irc-us/"
+    },
+
+    "AWS": {
+      "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": {
+
+    "OpenUserComplexPassword": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 587,
+    "Host": "smtp-mail.outlook.com",
+    "FromEmail": "donotreply@elevateimaging.ai",
+    "FromName": "LiLi",
+    "AuthorizationCode": "Q#669869497420ul",
+
+    "OrganizationName": "Elevate Imaging",
+    "OrganizationNameCN": "Elevate Imaging",
+    "CompanyName": "Elevate Imaging Inc.",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Elevate Imaging",
+    "CompanyShortNameCN": "展影医疗",
+    "SiteUrl": "https://lili.elevateimaging.ai/login"
+  }
+
+}

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -0,0 +1,94 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "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": {
+
+    "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",
+      //"useSSL": true,
+      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/hir-uat",
+
+      "endPoint": "47.117.164.182",
+      "port": "9001",
+      "useSSL": false,
+      "viewEndpoint": "http://47.117.164.182:9001/test-irc-us",
+
+      "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
+      "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
+      "bucketName": "test-irc-us"
+
+    },
+
+    "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": 30,
+    "AutoLoginOutMinutes": 60,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 587,
+    "Host": "smtp-mail.outlook.com",
+    "FromEmail": "donotreply@elevateimaging.ai",
+    "FromName": "LiLi",
+    "AuthorizationCode": "Q#669869497420ul",
+
+    "OrganizationName": "Elevate Imaging",
+    "OrganizationNameCN": "Elevate Imaging",
+    "CompanyName": "Elevate Imaging Inc.",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Elevate Imaging",
+    "CompanyShortNameCN": "展影医疗",
+    "SiteUrl": "https://lili.test.elevateimaging.ai/login"
+  }
+
+}

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -0,0 +1,88 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "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=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": {
+
+    "ObjectStoreUse": "AWS",
+
+    "MinIO": {
+      //"endPoint": "hir-minio.uat.elevateimaging.ai",
+      //"port": "443",
+      //"useSSL": true,
+      //"viewEndpoint": "https://hir-minio.uat.elevateimaging.ai/uat-irc-us",
+
+      "endPoint": "3.226.182.187",
+      "port": "9001",
+      "useSSL": false,
+      "viewEndpoint": "http://44.218.11.19:9001/uat-irc-us",
+
+      "accessKey": "lH8DkKskLuDqPaiubuSQ",
+      "secretKey": "pdPdicvvLeH7xAC5yFUrI7odMyBfOXxvVWMvKYV4",
+      "bucketName": "uat-irc-us"
+
+    },
+
+    "AWS": {
+      "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": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90,
+
+    "OpenLoginMFA": true
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 587,
+    "Host": "smtp-mail.outlook.com",
+    "FromEmail": "donotreply@elevateimaging.ai",
+    "FromName": "LiLi",
+    "AuthorizationCode": "Q#669869497420ul",
+
+    "OrganizationName": "Elevate Imaging",
+    "OrganizationNameCN": "Elevate Imaging",
+    "CompanyName": "Elevate Imaging Inc.",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Elevate Imaging",
+    "CompanyShortNameCN": "展影医疗",
+    "SiteUrl": "https://lili.test.elevateimaging.ai/login"
+  }
+
+}

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -16,6 +16,7 @@
 
     "AliyunOSS": {
       "regionId": "cn-shanghai",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
       "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
       "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
       "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
@@ -26,12 +27,17 @@
     },
 
     "MinIO": {
-      "endpoint": "http://192.168.3.68",
-      "port": "8001",
+      "endPoint": "hir-oss.uat.extimaging.com",
+      "port": "80",
       "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test"
+      "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"
+
     }
   },
 
@@ -44,7 +50,16 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60,
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
 
   },
   "SystemEmailSendConfig": {
@@ -53,8 +68,18 @@
     "FromEmail": "uat@extimaging.com",
     "FromName": "UAT_IRC",
     "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.uat.extimaging.com/login"
+    "SiteUrl": "http://irc.uat.extimaging.com/login",
+    "OrganizationName": "Extlmaging",
+    "OrganizationNameCN": "Extlmaging",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
+  },
+
+  "SystemPacsConfig": {
+    "Port": "11113",
+    "IP": "47.117.164.182"
   }
 
-
 }

IRaCIS.Core.API/appsettings.json

@@ -1,6 +1,6 @@
 {
   "JwtSetting": {
-    "SecurityKey": "SecurityKey_SHzyyl@2021",
+    "SecurityKey": "ShangHaiZhanYing_SecurityKey_SHzyyl@2021",
     "Issuer": "Extimaging",
     "Audience": "EICS",
     "TokenExpireDays": "7"
@@ -90,7 +90,13 @@
     "DicomStudyCodePrefix": "ST",
     "SystemSiteCodePrefix": "S",
     "DefaultPassword": "123456",
-    "DefaultInternalOrganizationName": "ExtImaging",
     "ImageShareExpireDays": 10
+  },
+
+  "EncrypteResponseConfig": {
+    "IsEnable": true,
+    "ApiPathList": [
+      "/test/get"
+    ]
   }
 }

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html

@@ -11,7 +11,7 @@
                 尊敬的 {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;'>              
@@ -23,7 +23,7 @@
                 </div>
                 <div>
                     首次登陆前，请通过该链接修改您的账户信息：
-                    <a href='{3}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <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>
@@ -32,7 +32,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html

@@ -11,20 +11,20 @@
                 Dear  {0} ,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Extimaging has added an account for you. The account information is as follows:
+                {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 name: {1}
+                    User ID: {1}
                 </div>
                 <div>
                     Role: {2}
                 </div>
                 <div>
-                    Before logging in for the first time, please modify your account information by this link：
-                    <a href='{3}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
-                        Initialize the account information
+                    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>
@@ -32,7 +32,7 @@
 
             <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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html

@@ -11,7 +11,7 @@
                 尊敬的 {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;'>
@@ -29,7 +29,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser_US.html

@@ -11,12 +11,12 @@
                 Dear {0} ,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Extimaging has reset your account password, and the account information is as follows:
+                {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 name: {1}
+                    User ID: {1}
                 </div>
                 <div>
                     Role: {2}
@@ -29,7 +29,7 @@
 
             <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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress.html

@@ -19,7 +19,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html

@@ -11,7 +11,7 @@
                 Dear：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Thank you for using Extensive Imaging Cloud System.
+                Thank you for using {company abbreviation} Cloud System.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 {0}。
@@ -19,7 +19,7 @@
 
             <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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
                 </div>
                 <div>
                     系统登录地址:
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <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>
@@ -43,7 +43,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the service provider of {1} trial（Protocol ID is {2}）, Extensive Imaging invites you to participate in the independent assessment work of this trial.
+                {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;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                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;'>
@@ -25,23 +25,26 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Login URL: {6}
+                    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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
                 </div>
                 <div>
                     首次登陆前，请通过该链接修改您的账户信息：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <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>
@@ -44,7 +44,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.
+                {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;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                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;'>
@@ -25,18 +25,18 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Before logging in for the first time, please modify your account information by this link：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
-                        Initialize the account information
+                    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>
@@ -44,7 +44,7 @@
 
             <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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject.html

@@ -11,7 +11,7 @@
                 尊敬的 {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;'>
@@ -41,7 +41,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html

@@ -11,7 +11,7 @@
                 Dear  {0} ,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Hello, the center survey form you filled in has been rejected. The details are as follows：
+                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;'>
@@ -22,7 +22,7 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {3}
+                    Study Name: {3}
                 </div>
                 <div>
                     Site ID: {4}
@@ -41,7 +41,7 @@
 
             <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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
                 </div>
                 <div>
                     系统登录地址:
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <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>
@@ -44,7 +44,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in related work of this trial.
+                {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;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                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;'>
@@ -25,23 +25,26 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Login URL: {6}
+                    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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
                 </div>
                 <div>
                     首次登陆前，请通过该链接修改您的账户信息：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <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>
@@ -44,7 +44,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.
+                {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;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                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;'>
@@ -25,18 +25,18 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Before logging in for the first time, please modify your account information by this link：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
-                        Initialize the account information
+                    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>
@@ -44,7 +44,7 @@
 
             <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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html

@@ -8,7 +8,7 @@
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
             <div style='line-height: 40px;font-size: 18px'>
-                Hello {0},
+               {0}您好,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 感谢您使用展影云平台。
@@ -21,7 +21,7 @@
             </div>
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html

@@ -8,21 +8,21 @@
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
             <div style='line-height: 40px;font-size: 18px'>
-                Hello {0},
+                Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Thank you for using Extensive Imaging’s cloud system!
+                {1}
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                {1}, and the verification code is <span style="font-weight:bold">{2}</span>.
+                The verification code is <span style="font-weight:bold">{2}</span>.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Please enter this verification code within 3 minutes for subsequent operations.
+                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;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs

@@ -1,5 +1,4 @@
-using EasyCaching.Core;
-using Hangfire;
+using Hangfire;
 using Hangfire.Storage;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service;
@@ -8,6 +7,8 @@ using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using SharpCompress.Common;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Application.Services.BackGroundJob
 {
@@ -15,156 +16,50 @@ namespace IRaCIS.Application.Services.BackGroundJob
     public interface IIRaCISHangfireJob
     {
 
-        Task MemoryCacheTrialStatusAsync();
+        //Task MemoryCacheTrialStatusAsync();
 
         Task InitHangfireJobTaskAsync();
 
     }
-    public class IRaCISCHangfireJob : IIRaCISHangfireJob
+    public class IRaCISCHangfireJob(ILogger<IRaCISCHangfireJob> _logger,
+         IRepository<Internationalization> _internationalizationRepository,
+         IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository
+        ) : IIRaCISHangfireJob
     {
         public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);
 
-        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 MemoryCacheTrialStatusAsync();
-
-            await MemoryCacheAnonymizeData();
-
-
-            //创建项目缓存 定时任务
-            HangfireJobHelper.AddOrUpdateInitCronJob<IIRaCISHangfireJob>("RecurringJob_Cache_TrialState", t => t.MemoryCacheTrialStatusAsync(), Cron.Daily());
-
-            //初始化
-
-            await InitInternationlizationDataAndWatchJsonFileAsync();
+            await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_internationalizationRepository);
 
             //创建邮件定时任务
             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文件变更 实时刷新数据
-            WatchJsonFile(usJsonPath);
-            WatchJsonFile(cnJsonPath);
-
-        }
-
-        public void WatchJsonFile(string filePath)
-        {
-            if (!File.Exists(filePath))
-            {
-                throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound"));
-            }
-
-            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
-            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
-            watcher.EnableRaisingEvents = true;
-
-        }
-
-
-        private void LoadJsonFile(string filePath)
-        {
-
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath);
-
-            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()
         {
@@ -206,6 +101,9 @@ namespace IRaCIS.Application.Services.BackGroundJob
 
 
         }
+
+
+
     }
 
 

IRaCIS.Core.Application/BaseService.cs

@@ -8,6 +8,8 @@ using Panda.DynamicWebApi;
 using Panda.DynamicWebApi.Attributes;
 using System.Diagnostics.CodeAnalysis;
 using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Mvc;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.Application
 {
@@ -17,20 +19,21 @@ namespace IRaCIS.Core.Application
 
     #region 非泛型版本
 
-    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
+    [TypeFilter(typeof(UnifiedApiResultFilter))]
+    [Authorize, DynamicWebApi]
     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
@@ -49,8 +52,6 @@ namespace IRaCIS.Core.Application
         [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,6 +59,9 @@ namespace IRaCIS.Core.Application
         [MemberNotNull(nameof(_hostEnvironment))]
         public IWebHostEnvironment _hostEnvironment { get; set; }
 
+        [MemberNotNull(nameof(_fusionCache))]
+        public IFusionCache _fusionCache { get; set; }
+
     }
     #endregion
 
@@ -73,28 +77,26 @@ namespace IRaCIS.Core.Application
         [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; }
 
-      
     }
 
-
-    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
+    [TypeFilter(typeof(UnifiedApiResultFilter))]
+    [Authorize, DynamicWebApi]
     public class BaseServiceTest<T> : IBaseServiceTest<T>, IDynamicWebApi where T : Entity
     {
         public IMapper _mapper { get; set; }
 
         public IUserInfo _userInfo { get; set; }
 
-        public IRepository _repository { get; set; }
-
         public IStringLocalizer _localizer { get; set; }
 
+        public IFusionCache _fusionCache { get; set; }
+
         public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
         {
             return new ResponseOutput<string>()

IRaCIS.Core.Application/BusinessFilter/EncreptApiResultFilter.cs

@@ -0,0 +1,71 @@
+using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.BusinessFilter
+{
+    public class EncreptApiResultFilter : IAsyncResultFilter
+    {
+
+        private readonly IOptionsMonitor<EncreptResponseOption> _encreptResponseMonitor;
+
+        public EncreptApiResultFilter(IOptionsMonitor<EncreptResponseOption> encreptResponseMonitor)
+        {
+            _encreptResponseMonitor = encreptResponseMonitor;
+        }
+
+        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+        {
+
+            if(_encreptResponseMonitor.CurrentValue.IsEnable)
+            {
+
+                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();
+
+        }
+    }
+}

IRaCIS.Core.Application/BusinessFilter/GlobalExceptionHandler.cs

@@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+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);
+        }
+    }
+}

IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs

@@ -1,4 +1,4 @@
-using EasyCaching.Core;
+using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.Application.Filter;
 
@@ -18,15 +19,15 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
 {
     public IStringLocalizer _localizer { get; set; }
 
-    private readonly IEasyCachingProvider _provider;
+    private readonly IFusionCache _fusionCache;
 
     private readonly IUserInfo _userInfo;
 
     private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
 
-    public LimitUserRequestAuthorization(IEasyCachingProvider provider, IUserInfo userInfo, IStringLocalizer localizer ,IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig)
+    public LimitUserRequestAuthorization(IFusionCache fusionCache, IUserInfo userInfo, IStringLocalizer localizer ,IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig)
     {
-        _provider = provider;
+        _fusionCache = fusionCache;
         _userInfo = userInfo;
         _verifyConfig = verifyConfig;
         _localizer = localizer;
@@ -35,6 +36,8 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
 
     public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
     {
+        var minutes = _verifyConfig.CurrentValue.AutoLoginOutMinutes;
+
         if (_verifyConfig.CurrentValue.OpenLoginLimit)
         {
             if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
@@ -58,41 +61,54 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
                     context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"]));
                 }
 
+
+
                 //2、在这里取缓存  进行比较  看是否有其他人进行了登陆，如果其他人登陆了，就把之前用户挤掉
-                var cacheUserToken = (await _provider.GetAsync<string>(_userInfo.Id.ToString())).Value;
+                var cacheUserToken = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserToken(_userInfo.Id));
+
+
 
                 //缓存中没有取到Token
                 if (string.IsNullOrWhiteSpace(cacheUserToken))
                 {
-                    //设置当前用户最新Token
-                    await _provider.SetAsync(_userInfo.Id.ToString(), _userInfo.UserToken, TimeSpan.FromDays(7));
-
                     cacheUserToken = _userInfo.UserToken;
 
+                    //设置当前用户最新Token
+                    await _fusionCache.SetAsync(CacheKeys.UserToken(_userInfo.Id), _userInfo.UserToken, TimeSpan.FromDays(7));
+
+                    //重启应用程序，所有人续期，不一下子踢出所有人
+                    await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.Id), 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));
 
+                    //过期了 需要自动退出
+                    if (string.IsNullOrEmpty(cacheTime))
+                    {
+                        context.HttpContext.Response.ContentType = "application/json";
+                        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));
+                    }
+                }
                 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)));
-
                 }
 
-
-
             }
         }
 
@@ -100,52 +116,3 @@ 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;
-//    }
-//}
-

IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -11,13 +12,13 @@ namespace IRaCIS.Core.Application.Filter
     {
         private readonly ILogger<ProjectExceptionFilter> _logger;
 
-		public IStringLocalizer _localizer;
+        public IStringLocalizer _localizer;
 
-		public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
+        public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
         {
             _logger = logger;
-			_localizer = localizer;
-		}
+            _localizer = localizer;
+        }
         public void OnException(ExceptionContext context)
         {
             //context.ExceptionHandled;//记录当前这个异常是否已经被处理过了
@@ -26,34 +27,51 @@ namespace IRaCIS.Core.Application.Filter
             {
                 if (context.Exception.GetType().Name == "DbUpdateConcurrencyException")
                 {
-                //---并发更新，当前不允许该操作
+                    //---并发更新，当前不允许该操作
                     context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ProjectException_ConcurrentUpdateNotAllowed"] + context.Exception.Message));
                 }
 
                 if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
                 {
-                    context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message,ApiResponseCodeEnum.BusinessValidationFailed));
+                    var error = context.Exception as BusinessValidationFailedException;
+
+                    var info = string.Empty;
+
+                    if (!string.IsNullOrWhiteSpace(error!.LocalizedKey) && StaticData.Log_Locoalize_Dic.ContainsKey(error!.LocalizedKey))
+                    {
+                        info = $"[{error!.LocalizedKey}]:{StaticData.Log_Locoalize_Dic[error!.LocalizedKey]}";
+                    }
+
+
+                    context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, "", error!.Code, localizedInfo: info));
+
+
+                    //warning 级别记录
+                    //_logger.LogWarning($"[{error!.LocalizedKey}]:{StaticData.Log_Locoalize_Dic[error!.LocalizedKey]}");
                 }
-                else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
+                else if (context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
                 {
-                    context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message, ApiResponseCodeEnum.DataNotExist));
+                    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;//标记当前异常已经被处理过了
 
-                _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message + context.Exception.StackTrace) : (context.Exception.InnerException?.Message + context.Exception.InnerException?.StackTrace));
 
+                //throw new Exception("test-result-exceptioin");
 
             }
             else
             {
                 //继续
             }
-            context.ExceptionHandled = true;//标记当前异常已经被处理过了
         }
     }
 }

IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs

@@ -1,10 +1,11 @@
-using EasyCaching.Core;
+using IRaCIS.Core.Application.Helper;
 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
@@ -14,49 +15,36 @@ namespace IRaCIS.Core.Application.Filter
     /// </summary>
     public class TrialResourceFilter : Attribute, IAsyncResourceFilter
     {
-        private readonly IEasyCachingProvider _provider;
         private readonly IUserInfo _userInfo;
-
+        private readonly IFusionCache _fusionCache;
         public IStringLocalizer _localizer;
-		private readonly List<string> _trialOptList=new List<string>();
+        private readonly IRepository<Trial> _trialRepository;
+        private readonly List<string> _trialOptList = new List<string>();
 
 
-        public TrialResourceFilter(IEasyCachingProvider provider, IStringLocalizer localizer , IUserInfo userInfo, string trialOpt = null, string trialOpt2 = null, string trialOpt3 = null)
+        public TrialResourceFilter(IFusionCache fusionCache, IRepository<Trial> trialRepository, IStringLocalizer localizer, IUserInfo userInfo, string trialOpt = null, string trialOpt2 = null, string trialOpt3 = null)
         {
-            _provider = provider;
+            _fusionCache = fusionCache;
             _userInfo = userInfo;
             _localizer = localizer;
-			//_trialOpt = trialOpt;
+            _trialRepository = trialRepository;
 
-			if (!string.IsNullOrWhiteSpace(trialOpt)) _trialOptList.Add(trialOpt.Trim());
+            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 TrialResourceFilter(IEasyCachingProvider provider, IUserInfo userInfo)
-        //{
-        //    _provider = provider;
-        //    _userInfo = userInfo;
-        //}
-
-
-
-
-
         //优先选择异步的方法
         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();
+            // 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();
 
             #region 处理新的用户类型，不能操作项目相关接口
 
             // 后期列举出具体的类型，其他任何用户类型，都不允许操作
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower()!= "TrialDocument/userConfirm".ToLower())
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower() != "TrialDocument/userConfirm".ToLower())
             {
                 //---对不起，您的账户没有操作权限。
                 context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_NoAccessPermission"]));
@@ -97,7 +85,7 @@ namespace IRaCIS.Core.Application.Filter
                 }
                 else
                 {
-                //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                    //---正则取请求Refer 中trialId 失败，请联系开发人员核查
                     context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
                 }
 
@@ -128,20 +116,20 @@ namespace IRaCIS.Core.Application.Filter
                     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;
+                        trialIdStr = matchResult.Value;
 
-                        if (!string.IsNullOrWhiteSpace(trialStatusStr))
+                        var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+
+                        if (string.IsNullOrWhiteSpace(trialStatusStr))
                         {
-                            trialIdStr = matchResult.Value;
+                            //数据库 检查该项目Id不对
+                            context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
                         }
-
-
                     }
                     else
                     {
-                //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                        //---正则取请求Refer 中trialId 失败，请联系开发人员核查
                         context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
                     }
 
@@ -153,34 +141,12 @@ namespace IRaCIS.Core.Application.Filter
             }
 
             //通过path 或者body 找到trialId 了  
-            if ( !string.IsNullOrWhiteSpace(trialIdStr))
+            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();
-                }
+                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)  )
+                if (trialStatusStr == StaticData.TrialState.TrialOngoing || _trialOptList.Any(t => t == TrialOpt.BeforeOngoingCantOpt))
                 {
 
                     await next.Invoke();
@@ -189,14 +155,14 @@ namespace IRaCIS.Core.Application.Filter
                 //  项目停止、或者完成  不允许操作
                 else
                 {
-                //---本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改
+                    //---本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改
                     context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_InterceptedProjectStatusRule"]));
 
                 }
 
             }
             //添加项目  签名系统文档的时候  不做拦截   但是更新项目  签名项目文档的时候需要拦截
-            else if (_trialOptList.Any(t => t == TrialOpt.AddOrUpdateTrial ||t ==TrialOpt.SignSystemDocNoTrialId))
+            else if (_trialOptList.Any(t => t == TrialOpt.AddOrUpdateTrial || t == TrialOpt.SignSystemDocNoTrialId))
             {
                 await next.Invoke();
             }

IRaCIS.Core.Application/BusinessFilter/UnifiedApiResultFilter.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Share;
+using Microsoft.Extensions.Logging;
 
 namespace IRaCIS.Application.Services.BusinessFilter
 {
@@ -8,8 +9,15 @@ namespace IRaCIS.Application.Services.BusinessFilter
     ///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
     /// by zhouhang 2021.09.12 周末
     /// </summary>
-    public class UnifiedApiResultFilter : Attribute, IAsyncResultFilter  
-    {             
+    public class UnifiedApiResultFilter : Attribute, IAsyncResultFilter
+    {
+        private readonly ILogger _logger;
+
+        public UnifiedApiResultFilter(ILogger<UnifiedApiResultFilter> logger)
+        {
+            _logger = logger;
+        }
+
         /// <summary>
         /// 异步版本
         /// </summary>
@@ -26,25 +34,15 @@ namespace IRaCIS.Application.Services.BusinessFilter
                 //是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<,>)))
+                    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);
 
@@ -64,18 +62,24 @@ namespace IRaCIS.Application.Services.BusinessFilter
                         objectResult.DeclaredType = apiResponse.GetType();
                     }
 
-                      
-                    //}
-                   
+
                 }
-                //如果不是200  是IResponseOutput  不处理
-                else if (statusCode != 200 && (objectResult.Value is IResponseOutput))
+                //如果是200  是IResponseOutput  记录下日志
+                else if (statusCode == 200 && (objectResult.Value is IResponseOutput))
                 {
+                    var result = objectResult.Value as IResponseOutput;
+
+                    if (!string.IsNullOrWhiteSpace(result.LocalizedInfo))
+                    {
+                        //统一在这里记录国际化的日志信息
+                        _logger.LogWarning($"{result.LocalizedInfo}");
+                    }
+                  
                 }
 
-                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;

IRaCIS.Core.Application/Helper/CacheHelper.cs

@@ -0,0 +1,75 @@
+using IRaCIS.Core.Domain.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+
+    public static class CacheKeys
+    {
+        public static string Trial(string trialIdStr) => $"TrialId:{trialIdStr}";
+
+        public static string TrialStudyMaxCode(Guid trialId) => $"TrialStudyMaxCode:{trialId}";
+
+        public static string TrialStudyUidUploading(Guid trialId, string studyUid) => $"TrialStudyUid:{trialId}_{studyUid}";
+
+        public static string TrialStudyUidDBLock(Guid trialId, string studyUid) => $"TrialStudyUidDBLock:{trialId}_{studyUid}";
+
+
+
+        public static string SystemAnonymization => $"SystemAnonymization";
+
+        public static string FrontInternational => $"FrontInternationalList";
+
+        //登录挤账号
+        public static string UserToken(Guid userId) => $"UserToken:{userId}";
+
+        //超时没请求接口自动退出
+        public static string UserAutoLoginOut(Guid userId) => $"UserAutoLoginOut:{userId}";
+
+        // 你可以为其他实体和模块定义更多的键
+
+        /// <summary>
+        /// 跳过阅片
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public static string SkipReadingCacheKey(Guid userId) => $"{userId}SkipReadingCache";
+
+
+        /// <summary>
+        /// 开始阅片时间
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public static string StartReadingTimeKey(Guid userId) => $"{userId}StartReadingTime";
+
+        /// <summary>
+        /// 开始休息时间
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public static string StartRestTime(Guid userId) => $"{userId}StartRestTime";
+
+    }
+
+    public static class CacheHelper
+    {
+        public static async Task<string?> GetTrialStatusAsync(Guid trialId, IRepository<Trial> _trialRepository)
+        {
+            var statusStr = await _trialRepository.Where(t => t.Id == trialId, ignoreQueryFilters: true).Select(t => t.TrialStatusStr).FirstOrDefaultAsync();
+
+            return statusStr;
+        }
+
+        public static async Task<List<SystemAnonymization>> GetSystemAnonymizationListAsync(IRepository<SystemAnonymization> _systemAnonymizationRepository)
+        {
+            var list = await _systemAnonymizationRepository.Where(t => t.IsEnable).ToListAsync();
+
+            return list;
+        }
+    }
+}

IRaCIS.Core.Application/Helper/EmailMaskHelper.cs

@@ -0,0 +1,44 @@
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public static class EmailMaskHelper
+    {
+
+        //显示位数：3分之2的位数，向上取整
+        //取哪几个个值：最后一位和前面几位
+        //其他：3个***。
+        //比如：hlj23@126.com
+        //为：hlj***3@126.com
+
+        //he@126.com
+        //为：h*** e@126.com
+
+        public static string MaskEmail(string email)
+        {
+
+            // 找到 "@" 符号的位置
+            int atIndex = email.IndexOf('@');
+
+            string visiblePartBefore = email.Substring(0, atIndex);
+
+            string afterAt = email.Substring(atIndex + 1);
+
+            int visibleLength = (int)Math.Ceiling((double)visiblePartBefore.Length * 2 / 3);
+
+            // 替换中间两位字符为星号
+            string hiddenPartBeforeAt = visiblePartBefore.Substring(0, visibleLength - 1) + "***" + visiblePartBefore.Last();
+
+
+            // 组合隐藏和可见部分
+            string hiddenEmail = hiddenPartBeforeAt + "@" + afterAt;
+
+            return hiddenEmail; 
+        }
+    }
+}

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -3,9 +3,9 @@ using DocumentFormat.OpenXml.Spreadsheet;
 using DocumentFormat.OpenXml.Wordprocessing;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
+using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
-using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
@@ -14,8 +14,9 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NPOI.HSSF.UserModel;
 using NPOI.XSSF.UserModel;
-using SkiaSharp;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
 using System.IO;
 
 namespace IRaCIS.Core.Application.Service;
@@ -25,19 +26,13 @@ public static class ExcelExportHelper
     //MiniExcel_Export
     public static async Task<IActionResult> DataExportAsync(string code, ExcelExportInfo data, string exportFileNamePrefix, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null)
     {
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         //判断是否有字典翻译
-
         object translateData = data;
 
         if (_dictionaryService != null && translateType != null)
         {
-
-            ////只标注单个的时候
-            //var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
-            //    .Select(c => new { c.Name, DicParentCode = ((DictionaryTranslateAttribute?)c.GetCustomAttributes(typeof(DictionaryTranslateAttribute), false)[0])?.DicParentCode }).ToList();
-
-
             //一个值 对应不同的字典翻译
             var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
                 .SelectMany(c =>
@@ -64,12 +59,18 @@ public static class ExcelExportHelper
                     var newObjList = new List<object>();
                     var no = 1;
 
-                    foreach (var item in dic[key] as IList )
+                    foreach (var item in dic[key] as IList)
                     {
-                        //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
-
                         var itemDic = item.ConvertToDictionary();
 
+                        //处理集合里面时间类型，根据当前语言将时间转变为字符串
+                        foreach (var itemValuePair in itemDic)
+                        {
+                            if (DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
+                            {
+                                itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result  );
+                            }
+                        }
 
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
@@ -81,7 +82,7 @@ public static class ExcelExportHelper
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
-                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t=>data.IsEn_US?t.Value:t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                                 }
                             }
                             //普通翻译 或者某一标准翻译
@@ -90,7 +91,7 @@ public static class ExcelExportHelper
                                 var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
 
-                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => data.IsEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                             }
 
 
@@ -106,6 +107,7 @@ public static class ExcelExportHelper
                     dic[key] = newObjList;
 
                 }
+
             }
 
 
@@ -119,7 +121,7 @@ public static class ExcelExportHelper
 
 
 
-        var (physicalPath, fileNmae) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
+        var (physicalPath, fileName) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
 
 
         //模板路径
@@ -141,7 +143,7 @@ public static class ExcelExportHelper
 
         if (sheetCount == 2)
         {
-            if (data.IsEn_US)
+            if (isEn_US)
             {
                 workbook.RemoveSheetAt(0);
             }
@@ -151,7 +153,7 @@ public static class ExcelExportHelper
             }
 
             var memoryStream2 = new MemoryStream();
-            workbook.Write(memoryStream2,true);
+            workbook.Write(memoryStream2, true);
 
             memoryStream2.Seek(0, SeekOrigin.Begin);
 
@@ -159,17 +161,12 @@ public static class ExcelExportHelper
         }
 
         // 文件名称 从sheet里面取
-        fileNmae = workbook.GetSheetName(0);
+        //fileNmae = workbook.GetSheetName(0);
         #endregion
 
-
-
-
-
-
         #region MiniExcel
 
-       var memoryStream = new MemoryStream();
+        var memoryStream = new MemoryStream();
 
         var config = new OpenXmlConfiguration()
         {
@@ -183,29 +180,18 @@ public static class ExcelExportHelper
 
         return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
         {
-            FileDownloadName = $"{exportFileNamePrefix}_{fileNmae/*.Substring(0, fileNmae.LastIndexOf('.'))*/}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
+            FileDownloadName = $"{(string.IsNullOrEmpty(exportFileNamePrefix) ? "" : exportFileNamePrefix + "_")}{Path.GetFileNameWithoutExtension(fileName)}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
         };
 
         #endregion
 
-        #region Magicodes  模板规则不一样
-
-        ////创建Excel导出对象
-        //IExportFileByTemplate exporter = new ExcelExporter();
-
-        ////根据模板导出
-        //var result = await exporter.ExportBytesByTemplate(exportInfo, tplPath);
-
-
-        //return new XlsxFileResult(bytes: result, fileDownloadName: $"{doc.Name}_{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx");
-        #endregion
-
     }
 
 
 
     public static async Task<(MemoryStream, string)> DataExport_NpoiTestAsync(string code, ExcelExportInfo data, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null)
     {
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
         //判断是否有字典翻译
 
         object translateData = data;
@@ -213,11 +199,6 @@ public static class ExcelExportHelper
         if (_dictionaryService != null && translateType != null)
         {
 
-            ////只标注单个的时候
-            //var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
-            //    .Select(c => new { c.Name, DicParentCode = ((DictionaryTranslateAttribute?)c.GetCustomAttributes(typeof(DictionaryTranslateAttribute), false)[0])?.DicParentCode }).ToList();
-
-
             //一个值 对应不同的字典翻译
             var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
                 .SelectMany(c =>
@@ -249,6 +230,15 @@ public static class ExcelExportHelper
                         //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
                         var itemDic = item.ConvertToDictionary();
 
+                        //处理集合里面时间类型，根据当前语言将时间转变为字符串
+                        foreach (var itemValuePair in itemDic)
+                        {
+                            if (DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
+                            {
+                                itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result);
+                            }
+                        }
+
                         foreach (var needTranslateProperty in needTranslatePropertyList)
                         {
                             //翻译的属性依赖其他属性
@@ -258,7 +248,7 @@ public static class ExcelExportHelper
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
-                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => data.IsEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                                 }
                             }
                             //普通翻译 或者某一标准翻译
@@ -267,7 +257,7 @@ public static class ExcelExportHelper
                                 var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
 
-                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => data.IsEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                             }
 
 
@@ -312,7 +302,7 @@ public static class ExcelExportHelper
 
         if (sheetCount == 2)
         {
-            if (data.IsEn_US)
+            if (isEn_US)
             {
                 workbook.RemoveSheetAt(0);
             }
@@ -322,7 +312,7 @@ public static class ExcelExportHelper
             }
 
             var memoryStream2 = new MemoryStream();
-            workbook.Write(memoryStream2,true);
+            workbook.Write(memoryStream2, true);
 
             memoryStream2.Seek(0, SeekOrigin.Begin);
 
@@ -330,7 +320,7 @@ public static class ExcelExportHelper
         }
 
         // 文件名称 从sheet里面取
-        fileName = workbook.GetSheetName(0);
+        //fileName = workbook.GetSheetName(0);
         #endregion
 
         #region MiniExcel
@@ -342,7 +332,7 @@ public static class ExcelExportHelper
             IgnoreTemplateParameterMissing = true,
         };
 
-        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, translateData, config);
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
 
         memoryStream.Seek(0, SeekOrigin.Begin);
 
@@ -357,4 +347,7 @@ public static class ExcelExportHelper
         #endregion
     }
 
+
+
+
 }

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json.Linq;
 using System.Configuration;
+using System.Globalization;
 using System.Text.RegularExpressions;
 
 namespace IRaCIS.Core.Application.Helper;
@@ -128,65 +129,6 @@ public static class FileStoreHelper
 
     #endregion
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="_hostEnvironment"></param>
-    /// <param name="_clinicalDataTrialSetRepository"></param>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    /// <exception cref="BusinessValidationFailedException"></exception>
-    public static async Task<(string PhysicalPath, string FileName)> GetSystemClinicalPathAsync(IWebHostEnvironment _hostEnvironment, IRepository<ClinicalDataSystemSet> _clinicalDataTrialSetRepository, Guid id)
-    {
-        var systemClinicalData = await _clinicalDataTrialSetRepository.FirstOrDefaultAsync(t => t.Id == id);
-
-        if (systemClinicalData == null || systemClinicalData.Path == string.Empty)
-        {
-                //---数据库没有找到对应的数据模板文件,请联系系统运维人员。
-            throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileNotFound"));
-        }
-
-        var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, systemClinicalData.Path);
-
-        if (!System.IO.File.Exists(filePath))
-        {
-                //---数据模板文件存储路径上未找对应文件,请联系系统运维人员。
-            throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileStoragePathInvalid"));
-        }
-
-        return (filePath, systemClinicalData.FileName);
-    }
-
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="_hostEnvironment"></param>
-    /// <param name="_clinicalDataTrialSetRepository"></param>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    /// <exception cref="BusinessValidationFailedException"></exception>
-    public static async Task<(string PhysicalPath, string FileName)> GetTrialClinicalPathAsync(IWebHostEnvironment _hostEnvironment, IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository, Guid id)
-    {
-        var trialClinicalData = await _clinicalDataTrialSetRepository.FirstOrDefaultAsync(t => t.Id == id);
-
-        if (trialClinicalData == null|| trialClinicalData.Path==string.Empty)
-        {
-                //---数据库没有找到对应的数据模板文件,请联系系统运维人员。
-            throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileNotFound"));
-        }
-
-        var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, trialClinicalData.Path);
-
-        if (!System.IO.File.Exists(filePath))
-        {
-                //---数据模板文件存储路径上未找对应文件,请联系系统运维人员。
-            throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileStoragePathInvalid"));
-        }
-
-        return (filePath, trialClinicalData.FileName);
-    }
-
 
     //通过编码获取通用文档具体物理路径  
 
@@ -194,6 +136,7 @@ public static class FileStoreHelper
     {
         var doc = await _commonDocumentRepository.FirstOrDefaultAsync(t => t.Code == code);
 
+        var isEn_US = CultureInfo.CurrentCulture.Name!= StaticData.CultureInfo.zh_CN;
         if (doc == null)
         {
                 //---数据库没有找到对应的数据模板文件,请联系系统运维人员。
@@ -208,7 +151,7 @@ public static class FileStoreHelper
             throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileStoragePathInvalid"));
         }
 
-        return (filePath, doc.Name.Trim('/'));
+        return (filePath, isEn_US? doc.Name.Trim('/'): doc.NameCN.Trim('/'));
     }
 
 
@@ -235,44 +178,6 @@ public static class FileStoreHelper
         return writeCount;
     }
 
-    // 获取项目签名文档存放路径
-
-    public static (string PhysicalPath, string RelativePath) GetTrialSignDocPath(IWebHostEnvironment _hostEnvironment, Guid trialId, string fileName)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        //文件类型路径处理
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.SignDocumentFolder);
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath);
-    }
-
-    // 获取系统签名文档存放路径
-    public static (string PhysicalPath, string RelativePath) GetSystemSignDocPath(IWebHostEnvironment _hostEnvironment, string fileName)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-
-        //文件类型路径处理
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.SignDocumentFolder);
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{ StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath);
-    }
 
     // 获取通用文档存放路径（excel模板 ）
 
@@ -295,238 +200,20 @@ public static class FileStoreHelper
         return (serverFilePath, relativePath);
     }
 
-    //获取系统通知文档存放路径
-
-    public static (string PhysicalPath, string RelativePath) GetSystemNoticePath(IWebHostEnvironment _hostEnvironment, string fileName)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        //文件类型路径处理
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.NoticeAttachment);
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{StaticData.Folder.NoticeAttachment}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath);
-    }
-
-    // 获取一致性核查路径
-    public static (string PhysicalPath, string RelativePath) GetTrialCheckFilePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid trialId)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        //上传根路径
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.UploadEDCData);
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
-        //存放核对表
-        var (trustedFileNameForFileStorage, realFileName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.UploadEDCData}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath);
-    }
-
-
-    public static (string PhysicalPath, string RelativePath, string FileRealName) GetClinicalTemplatePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid trialId)
-    {
-      
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, "ClinicalTemplate", trialId.ToString(), StaticData.Folder.TreatmenthistoryFolder);
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/ClinicalTemplate/{trialId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-
-    }
-
-
-    public  static (string PhysicalPath, string RelativePath, string FileRealName) GetReadClinicalDataPath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteId, Guid subjectId, Guid readingId)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), StaticData.Folder.Reading, readingId.ToString());
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{StaticData.Folder.Reading}/{readingId}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-
-    }
-
-    //获取临床数据存放路径
-    public static (string PhysicalPath, string RelativePath,string FileRealName) GetClinicalDataPath(IWebHostEnvironment _hostEnvironment, string fileName,Guid trialId,Guid siteId,Guid subjectId,Guid subjectVisitId)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(),siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.TreatmenthistoryFolder);
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-
-    }
-
-
-    public static (string PhysicalPath, string RelativePath, string FileRealName) GetClinicalDataPath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId , Guid subjectId)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(),  subjectId.ToString(),  StaticData.Folder.TreatmenthistoryFolder);
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{subjectId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-
-    }
-
-
-    /// <summary>
-    /// 上传截图
-    /// </summary>
-    /// <param name="_hostEnvironment"></param>
-    /// <param name="fileName"></param>
-    /// <param name="trialId"></param>
-    /// <param name="siteid"></param>
-    /// <param name="subjectId"></param>
-    /// <returns></returns>
-    public static (string PhysicalPath, string RelativePath, string FileRealName) GetUploadPrintscreenFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteid, Guid subjectId)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteid.ToString(), subjectId.ToString());
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteid}/{subjectId}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-    }
-
-
-    /// <summary>
-    /// 通用获取文件路径
-    /// </summary>
-    /// <param name="_hostEnvironment"></param>
-    /// <param name="fileName"></param>
-    /// <param name="trialId"></param>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    public static (string PhysicalPath, string RelativePath, string FileRealName) GetFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid id,string type)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), id.ToString(), type);
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{id}/{type}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-    }
-
-    public static (string PhysicalPath, string RelativePath, string FileRealName) GetMedicalReviewImage(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid taskMedicalReviewId)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), taskMedicalReviewId.ToString(), StaticData.Folder.MedicalReview);
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{taskMedicalReviewId}/{StaticData.Folder.MedicalReview}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-    }
-
-    //获取非dicom文件存放路径
-    public static (string PhysicalPath, string RelativePath, string FileRealName) GetNoneDicomFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteId, Guid subjectId, Guid subjectVisitId)
-    {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.NoneDicomFolder);
-
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.NoneDicomFolder}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath, fileRealName);
-    }
-
     // 获取 入组确认 PD 进展发送邮件Word|PDF 存放路径
 
-    public static (string PhysicalPath, string RelativePath, string FileRealName) GetSubjectEnrollConfirmOrPDEmailPath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteId, Guid subjectId,bool isChangeToPdfFormat=false)
+    public static (string PhysicalPath, string RelativePath, string FileRealName) GetSubjectEnrollConfirmOrPDEmailPath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid trialSiteId, Guid subjectId,bool isChangeToPdfFormat=false)
     {
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString());
+        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), trialSiteId.ToString(), subjectId.ToString());
 
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
         var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName, isChangeToPdfFormat);
 
 
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{trialSiteId}/{subjectId}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -541,7 +228,7 @@ public static class FileStoreHelper
         return Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.DicomFolder);
     }
 
-    public static (string PhysicalPath, string RelativePath) GetDicomInstanceFilePath(IWebHostEnvironment _hostEnvironment, Guid trialId, Guid siteId, Guid subjectId, Guid subjectVisitId, Guid studyId, Guid instanceId)
+    public static (string PhysicalPath, string RelativePath) GetDicomInstanceFilePath(IWebHostEnvironment _hostEnvironment, Guid trialId,  Guid subjectId, Guid subjectVisitId, Guid studyId, Guid instanceId)
     {
         #region 切换存储前
         //var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
@@ -552,7 +239,7 @@ public static class FileStoreHelper
 
         //加入访视层级  和Data
         var path = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(),
-            siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.DicomFolder, studyId.ToString());
+             subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.DicomFolder, studyId.ToString());
 
         if (!Directory.Exists(path))
         {
@@ -561,7 +248,7 @@ public static class FileStoreHelper
 
         var physicalPath = Path.Combine(path, instanceId.ToString() );
 
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.DicomFolder}/{studyId}/{instanceId}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.DicomFolder}/{studyId}/{instanceId}";
 
         //var physicalPath = Path.Combine(path, instanceId.ToString() + ".dcm");
 
@@ -629,49 +316,7 @@ public static class FileStoreHelper
 
 
 
-    // 获取医生通用文件存放路径
 
-    public static (string PhysicalPath, string RelativePath) GetDoctorOrdinaryFilePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid doctorId,string attachmentType)
-    {
-
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        //文件类型路径处理
-        var uploadFolderPath = Path.Combine(rootPath, "UploadFile", doctorId.ToString(), attachmentType);
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFileFolder}/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath);
-    }
-
-    public static (string PhysicalPath, string RelativePath) GetNonDoctorFilePath(IWebHostEnvironment _hostEnvironment, string fileName,  string attachmentType)
-    {
-
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-        //文件类型路径处理
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.UploadFileFolder, attachmentType);
-        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
-        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFileFolder}/{attachmentType}/{trustedFileNameForFileStorage}";
-
-        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
-        return (serverFilePath, relativePath);
-    }
 
     
 

IRaCIS.Core.Application/Helper/HolidayHelper.cs

@@ -0,0 +1,111 @@
+using RestSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+
+    #region 对接模型
+    public class HolidayCalendar
+    {
+        public string Name { get; set; }
+        public string Version { get; set; }
+        public string Generated { get; set; }
+        public string Timezone { get; set; }
+        public string Author { get; set; }
+        public string URL { get; set; }
+        public Dictionary<string, List<HolidayYear>> Years { get; set; }
+    }
+
+    public class HolidayYear
+    {
+        public string Name { get; set; }
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
+        public int Duration { get; set; }
+        public List<DateTime> CompDays { get; set; }
+        public string URL { get; set; }
+        public string Memo { get; set; }
+    }
+    #endregion
+
+
+
+
+    public class HolidayHelper
+    {
+        /// <summary>
+        /// github 链接：https://github.com/lanceliao/china-holiday-calender?tab=readme-ov-file 
+        /// 接口请求参考文档：https://www.koudingke.cn/docs/zh-Hans/net-lib-docs/latest/RestSharp/Usage/Usage
+        /// </summary>
+        private static RestClient _client => new RestClient("https://www.shuyz.com/githubfiles/china-holiday-calender/master/holidayAPI.json");
+
+        private static HolidayCalendar _holidayCalendar { get; set; }
+
+
+        private static List<DateTime> _holidays = new List<DateTime>();
+        private static List<DateTime> _compensatedWorkdays = new List<DateTime>();
+
+        static HolidayHelper()
+        {
+            _holidayCalendar = _client.Get<HolidayCalendar>(new RestRequest()) ?? new HolidayCalendar();
+
+            foreach (var year in _holidayCalendar.Years.Values.SelectMany(x => x))
+            {
+                // 添加节假日到假日集合
+                for (DateTime date = year.StartDate; date <= year.EndDate; date = date.AddDays(1))
+                {
+                    _holidays.Add(date);
+                }
+
+                // 添加补班日到补班日集合
+                foreach (var compDay in year.CompDays)
+                {
+                    _compensatedWorkdays.Add(compDay);
+                }
+            }
+
+        }
+
+        public static TimeSpan GetChinaWorkTimeSpan(DateTime startDate, DateTime endDate)
+        {
+            if (startDate > endDate)
+            {
+                throw new ArgumentException("结束日期必须大于或等于开始日期");
+            }
+
+            var diffTimeSpan = endDate - startDate;
+
+            // 初始化工作日数为0
+            int workdays = 0;
+
+            // 找出在给定日期范围内的假期和补班日
+            var filteredHolidays = _holidays.Where(d => d >= startDate && d <= endDate).ToList();
+            var filteredCompensatedWorkdays = _compensatedWorkdays.Where(d => d >= startDate && d <= endDate).ToList();
+
+            // 遍历日期范围，计算工作日 注意 这里是小于
+            for (DateTime date = startDate.Date; date < endDate.Date; date = date.AddDays(1))
+            {
+                // 判断是否为工作日
+                bool isWeekend = date.DayOfWeek == DayOfWeek.Saturday || date.DayOfWeek == DayOfWeek.Sunday;
+                bool isHoliday = filteredHolidays.Contains(date);
+                bool isCompensatedWorkday = filteredCompensatedWorkdays.Contains(date);
+
+                // 如果是补班日，或是平日（非假期，非周末），则算作工作日
+                if (isCompensatedWorkday || (!isWeekend && !isHoliday))
+                {
+                    workdays++;
+                }
+            }
+
+            return new TimeSpan(workdays, diffTimeSpan.Hours, diffTimeSpan.Minutes, diffTimeSpan.Seconds);
+
+
+        }
+
+
+    }
+}

IRaCIS.Core.Application/Helper/InternationalizationHelper.cs

@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using static BeetleX.Redis.Commands.HSCAN;
 using static IRaCIS.Core.Application.Service.Common.SystemMonitor;
 
 namespace IRaCIS.Core.Application.Helper
@@ -18,6 +17,9 @@ namespace IRaCIS.Core.Application.Helper
     {
         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 static void VerifyFolder()
         {
             if (!Directory.Exists(JsonFileFolder) ||
@@ -51,6 +53,9 @@ namespace IRaCIS.Core.Application.Helper
                         jsonObject[item.Code] = item.Value;
 
                         StaticData.En_US_Dic[item.Code] = item.Value;
+
+                        //日志记录该信息方便自己人看， 返回给客户的是配置的
+                        StaticData.Log_Locoalize_Dic[item.Code] = item.Description;
                     }                   
                 }
                 else
@@ -69,7 +74,7 @@ namespace IRaCIS.Core.Application.Helper
             }
         }
 
-        public static async Task AddOrUpdateJsonKeyValueAsync(string key, string value, string valueCN)
+        public static async Task AddOrUpdateJsonKeyValueAsync(string key, string value, string valueCN,string description)
         {
 
             VerifyFolder();
@@ -92,6 +97,9 @@ namespace IRaCIS.Core.Application.Helper
                     jsonObject[key] = value;
 
                     StaticData.En_US_Dic[key] = value;
+
+                    //日志记录该信息方便自己人看， 返回给客户的是配置的
+                    StaticData.Log_Locoalize_Dic[key] = description;
                 }
                 else
                 {
@@ -107,14 +115,16 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
-        public static async Task InitInternationlizationDataAndWatchJsonFileAsync(IRepository _repository)
+
+        public static async Task InitInternationlizationDataAndWatchJsonFileAsync(IRepository<Internationalization> _internationalizationRepository)
         {
             //查询数据库的数据
-            var toJsonList = await _repository.Where<Internationalization>(t => t.InternationalizationType == 1).Select(t => new
+            var toJsonList = await _internationalizationRepository.Where(t => t.InternationalizationType == 1).Select(t => new
             {
                 t.Code,
                 t.Value,
-                t.ValueCN
+                t.ValueCN,
+                t.Description
             }).ToListAsync();
 
             //组织成json 文件
@@ -128,6 +138,9 @@ namespace IRaCIS.Core.Application.Helper
             {
                 StaticData.En_US_Dic[tojsonItem.Code] = tojsonItem.Value;
                 StaticData.Zh_CN_Dic[tojsonItem.Code] = tojsonItem.ValueCN;
+
+                //日志记录该信息方便自己人看， 返回给客户的是配置的
+                StaticData.Log_Locoalize_Dic[tojsonItem.Code] = tojsonItem.Description;
             }
 
             File.WriteAllText(usJsonPath, JsonConvert.SerializeObject(StaticData.En_US_Dic));
@@ -136,29 +149,45 @@ namespace IRaCIS.Core.Application.Helper
 
             //监测Json文件变更 实时刷新数据
 
-            WatchJsonFile(usJsonPath);
-            WatchJsonFile(cnJsonPath);
-
-        }
-
-        public static void WatchJsonFile(string filePath)
-        {
-            if (!File.Exists(filePath))
+            if (!File.Exists(usJsonPath) || !File.Exists(cnJsonPath))
             {
-                throw new BusinessValidationFailedException("国际化Json文件不存在");
+                throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound"));
             }
 
-            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
-            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
-            watcher.EnableRaisingEvents = true;
+
+            //    //监测Json文件变更 实时刷新数据
+
+
+            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(StaticData.Folder.Resources + "\\" + StaticData.En_US_Json);
+
+
+            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(StaticData.Folder.Resources + "\\" + StaticData.Zh_CN_Json);
 
         }
 
 
+
         private static void LoadJsonFile(string filePath)
         {
-
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath);
+            Console.WriteLine("刷新json内存数据");
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath, false, false);
 
             IConfigurationRoot enConfiguration = builder.Build();
 
@@ -175,5 +204,11 @@ namespace IRaCIS.Core.Application.Helper
                 }
             }
         }
+
+
+
+
+
+
     }
 }

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -1,11 +1,9 @@
 using Aliyun.OSS;
-using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Minio.DataModel.Args;
 using Minio;
-using NPOI.HPSF;
 using SharpCompress.Common;
 using System;
 using System.Collections.Generic;
@@ -15,46 +13,73 @@ using System.Linq;
 using System.Security.AccessControl;
 using System.Text;
 using System.Threading.Tasks;
-using SkiaSharp;
+using System.Runtime.InteropServices;
+using System.Text.Json.Serialization;
+using Minio.ApiEndpoints;
+using System.Reactive.Linq;
+using IRaCIS.Core.Domain.Share;
+using static MassTransit.ValidationResultExtensions;
+using IRaCIS.Core.Infrastructure.NewtonsoftJson;
+using Amazon.Runtime;
+using Amazon.S3;
+using Amazon.S3.Model;
+using MassTransit.Caching.Internals;
 
 namespace IRaCIS.Core.Application.Helper
 {
+    #region 绑定和返回模型
+
+    [LowerCamelCaseJson]
     public class MinIOOptions : AWSOptions
     {
-        public int port { get; set; }
+        public int Port { get; set; }
 
     }
 
+
     public class AWSOptions
     {
-        public string endPoint { get; set; }
-        public bool useSSL { get; set; }
-        public string accessKey { get; set; }
-        public string secretKey { get; set; }
-        public string bucketName { get; set; }
-        public string viewEndpoint { get; set; }
+        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 endPoint { get; set; }
-        public string bucketName { get; set; }
+        public string RegionId { get; set; }
+        public string AccessKeyId { get; set; }
+        public string AccessKeySecret { get; set; }
 
-        public string roleArn { 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 string region { get; set; }
 
-        public string viewEndpoint { 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; }
@@ -65,27 +90,50 @@ namespace IRaCIS.Core.Application.Helper
     {
         public string ObjectStoreUse { get; set; }
 
-        public AliyunOSSOptions AliyunOSS { get; set; }
+
+        public AliyunOSSTempToken AliyunOSS { get; set; }
 
         public MinIOOptions MinIO { get; set; }
 
-        public AWSOptions AWS { 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 string Expiration { get; set; }
 
-        public string Region { get; set; }
-        public string BucketName { get; set; }
-        public string ViewEndpoint { 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
     {
@@ -94,15 +142,22 @@ namespace IRaCIS.Core.Application.Helper
         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);
-        public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath);
+        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);
     }
 
 
@@ -122,74 +177,89 @@ namespace IRaCIS.Core.Application.Helper
         /// <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)
+        public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
         {
+            var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
 
-
-            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}";
-            //var ossRelativePath = oosFolderPath + "/" + fileRealName;
-
-            using (var memoryStream = new MemoryStream())
+            try
             {
-                fileStream.Seek(0, SeekOrigin.Begin);
-
-                fileStream.CopyTo(memoryStream);
-
-                memoryStream.Seek(0, SeekOrigin.Begin);
-
-
-                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                using (var memoryStream = new MemoryStream())
                 {
-                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+                    fileStream.Seek(0, SeekOrigin.Begin);
 
-                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    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, aliConfig.AccessKeyId, aliConfig.AccessKeySecret);
 
 
 
-                    // 上传文件
-                    var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, memoryStream);
+                        // 上传文件
+                        var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, memoryStream);
 
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-                {
-                    var minIOConfig = ObjectStoreServiceOptions.MinIO;
+                    }
+                    else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+                    {
+                        var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
 
-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
-                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
-                        .Build();
+                        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);
+                        var putObjectArgs = new PutObjectArgs()
+                               .WithBucket(minIOConfig.BucketName)
+                               .WithObject(ossRelativePath)
+                               .WithStreamData(memoryStream)
+                               .WithObjectSize(memoryStream.Length);
 
-                    await minioClient.PutObjectAsync(putObjectArgs);
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-                {
-                    var minIOConfig = ObjectStoreServiceOptions.AWS;
+                        await minioClient.PutObjectAsync(putObjectArgs);
+                    }
+                    else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+                    {
+                        var awsConfig = ObjectStoreServiceOptions.AWS;
 
+                        // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+                        var credentials = new BasicAWSCredentials(awsConfig.AccessKeyId, awsConfig.SecretAccessKey);
 
-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
-                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
-                        .Build();
+                        //提供awsEndPoint（域名）进行访问配置
+                        var clientConfig = new AmazonS3Config
+                        {
+                            ServiceURL = awsConfig.EndPoint
+                        };
 
-                    var putObjectArgs = new PutObjectArgs()
-                           .WithBucket(minIOConfig.bucketName)
-                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream)
-                           .WithObjectSize(memoryStream.Length);
+                        var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
 
-                    await minioClient.PutObjectAsync(putObjectArgs);
-                }
-                else
-                {
-                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                        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;
@@ -203,25 +273,24 @@ namespace IRaCIS.Core.Application.Helper
         /// </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)
+        public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
         {
             var localFileName = Path.GetFileName(localFilePath);
 
-            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}";
-
-            //var ossRelativePath = oosFolderPath + "/" + localFileName;
+            var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}";
 
 
             if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
             {
                 var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
-                var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, aliConfig.AccessKeyId, aliConfig.AccessKeySecret);
 
                 // 上传文件
-                var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, localFilePath);
+                var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, localFilePath);
 
             }
             else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
@@ -229,12 +298,12 @@ namespace IRaCIS.Core.Application.Helper
                 var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
 
-                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
-                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                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)
+                       .WithBucket(minIOConfig.BucketName)
                        .WithObject(ossRelativePath)
                        .WithFileName(localFilePath);
 
@@ -242,19 +311,28 @@ namespace IRaCIS.Core.Application.Helper
             }
             else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
             {
-                var minIOConfig = ObjectStoreServiceOptions.AWS;
+                var awsConfig = ObjectStoreServiceOptions.AWS;
 
+                // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+                var credentials = new BasicAWSCredentials(awsConfig.AccessKeyId, awsConfig.SecretAccessKey);
 
-                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
-                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
-                    .Build();
+                //提供awsEndPoint（域名）进行访问配置
+                var clientConfig = new AmazonS3Config
+                {
+                    ServiceURL = awsConfig.EndPoint
+                };
 
-                var putObjectArgs = new PutObjectArgs()
-                       .WithBucket(minIOConfig.bucketName)
-                       .WithObject(ossRelativePath)
-                       .WithFileName(localFilePath);
+                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+                var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
+                {
+                    BucketName = awsConfig.BucketName,
+                    FilePath = localFilePath,
+                    Key = ossRelativePath,
+                };
+
+                await amazonS3Client.PutObjectAsync(putObjectRequest);
 
-                await minioClient.PutObjectAsync(putObjectArgs);
             }
             else
             {
@@ -264,9 +342,10 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
+
         public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
         {
-
+            
             ossRelativePath = ossRelativePath.TrimStart('/');
             try
             {
@@ -276,10 +355,10 @@ namespace IRaCIS.Core.Application.Helper
                 {
                     var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
-                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, aliConfig.AccessKeyId, aliConfig.AccessKeySecret);
 
                     // 上传文件
-                    var result = _ossClient.GetObject(aliConfig.bucketName, ossRelativePath);
+                    var result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
 
                     // 将下载的文件流保存到本地文件
                     using (var fs = File.OpenWrite(localFilePath))
@@ -293,12 +372,12 @@ namespace IRaCIS.Core.Application.Helper
                 {
                     var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
-                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                    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)
+                    .WithBucket(minIOConfig.BucketName)
                     .WithObject(ossRelativePath)
                     .WithFile(localFilePath);
 
@@ -307,18 +386,29 @@ namespace IRaCIS.Core.Application.Helper
                 }
                 else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
                 {
-                    var minIOConfig = ObjectStoreServiceOptions.AWS;
+                    var awsConfig = ObjectStoreServiceOptions.AWS;
 
-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
-                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
-                        .Build();
+                    // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+                    var credentials = new BasicAWSCredentials(awsConfig.AccessKeyId, awsConfig.SecretAccessKey);
+
+                    //提供awsEndPoint（域名）进行访问配置
+                    var clientConfig = new AmazonS3Config
+                    {
+                        ServiceURL = awsConfig.EndPoint
+                    };
+
+                    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);
 
-                    var getObjectArgs = new GetObjectArgs()
-                    .WithBucket(minIOConfig.bucketName)
-                    .WithObject(ossRelativePath)
-                    .WithFile(localFilePath);
 
-                    await minioClient.GetObjectAsync(getObjectArgs);
                 }
                 else
                 {
@@ -337,9 +427,230 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
+        public async Task<string> GetSignedUrl(string ossRelativePath)
+        {
+            ossRelativePath = ossRelativePath.TrimStart('/');
+            try
+            {
+
+
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, aliConfig.AccessKeyId, aliConfig.AccessKeySecret);
+
+                    // 生成签名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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}")
+                        .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
+                        .Build();
+
+                    var args = new PresignedGetObjectArgs()
+                        .WithBucket(minIOConfig.BucketName)
+                        .WithObject(ossRelativePath)
+                        .WithExpiry(3600);
+
+                    var presignedUrl = await minioClient.PresignedGetObjectAsync(args);
+
+                    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)
+        {
+            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+            {
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, aliConfig.AccessKeyId, aliConfig.AccessKeySecret);
+
+
+                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 BasicAWSCredentials(awsConfig.AccessKeyId, awsConfig.SecretAccessKey);
+
+                //提供awsEndPoint（域名）进行访问配置
+                var clientConfig = new AmazonS3Config
+                {
+                    ServiceURL = awsConfig.EndPoint
+                };
+
+                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("未定义的存储介质类型");
+            }
+        }
     }
 
 

IRaCIS.Core.Application/Helper/RSAHelper.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.Encodings;
+using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.Crypto.Generators;
+using Org.BouncyCastle.OpenSsl;
+using Org.BouncyCastle.Security;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    /// <summary>
+    /// https://www.cnblogs.com/NBDWDYS2214143926/p/13329231.html
+    /// </summary>
+    public class RSAHelper
+    {
+
+        public static AsymmetricCipherKeyPair GenerateRSAKeyPair(int keySize)
+        {
+            var keyGenerationParameters = new KeyGenerationParameters(new SecureRandom(), keySize);
+            var keyPairGenerator = new RsaKeyPairGenerator();
+            keyPairGenerator.Init(keyGenerationParameters);
+            return keyPairGenerator.GenerateKeyPair();
+        }
+
+        public static string ExportPublicKey(AsymmetricKeyParameter publicKey)
+        {
+            using (StringWriter sw = new StringWriter())
+            {
+                PemWriter pw = new PemWriter(sw);
+                pw.WriteObject(publicKey);
+                pw.Writer.Flush();
+                return sw.ToString();
+            }
+        }
+
+        public static string ExportPrivateKey(AsymmetricKeyParameter privateKey)
+        {
+            using (StringWriter sw = new StringWriter())
+            {
+                PemWriter pw = new PemWriter(sw);
+                pw.WriteObject(privateKey);
+                pw.Writer.Flush();
+                return sw.ToString();
+            }
+        }
+
+        /// <summary>
+        /// RSA解密
+        /// </summary>
+        /// <param name="privateKey">私钥</param>
+        /// <param name="decryptstring">待解密的字符串(Base64)</param>
+        /// <returns>解密后的字符串</returns>
+        public static string Decrypt(string privateKey, string decryptstring)
+        {
+            using (TextReader reader = new StringReader(privateKey))
+            {
+                dynamic key = new PemReader(reader).ReadObject();
+                var rsaDecrypt = new Pkcs1Encoding(new RsaEngine());
+                if (key is AsymmetricKeyParameter)
+                {
+                    key = (AsymmetricKeyParameter)key;
+                }
+                else if (key is AsymmetricCipherKeyPair)
+                {
+                    key = ((AsymmetricCipherKeyPair)key).Private;
+                }
+                rsaDecrypt.Init(false, key);  //这里加密是true；解密是false  
+
+                byte[] entData = Convert.FromBase64String(decryptstring);
+                entData = rsaDecrypt.ProcessBlock(entData, 0, entData.Length);
+                return Encoding.UTF8.GetString(entData);
+            }
+        }/// <summary>
+
+         /// 加密
+         /// </summary>
+         /// <param name="publicKey">公钥</param>
+         /// <param name="encryptstring">待加密的字符串</param>
+         /// <returns>加密后的Base64</returns>
+        public static string Encrypt(string publicKey, string encryptstring)
+        {
+            using (TextReader reader = new StringReader(publicKey))
+            {
+                AsymmetricKeyParameter key = new PemReader(reader).ReadObject() as AsymmetricKeyParameter;
+                Pkcs1Encoding pkcs1 = new Pkcs1Encoding(new RsaEngine());
+                pkcs1.Init(true, key);//加密是true；解密是false;
+                byte[] entData = Encoding.UTF8.GetBytes(encryptstring);
+                entData = pkcs1.ProcessBlock(entData, 0, entData.Length);
+                return Convert.ToBase64String(entData);
+            }
+        }
+    }
+}

IRaCIS.Core.Application/Helper/SendEmailHelper.cs

@@ -29,7 +29,7 @@ public static class SendEmailHelper
 
                 //await smtp.AuthenticateAsync("zhou941003@qq.com", "sqfhlpfdvnexbcab");
 
-                await smtp.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.SslOnConnect);
+                await smtp.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.Auto);
 
                 await smtp.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode);
 
@@ -40,11 +40,11 @@ public static class SendEmailHelper
 
             }
         }
-        catch (Exception )
+        catch (Exception ex)
         {
 
             //---邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员
-            throw new Exception(StaticData.International("SendEmail_SendFail"));
+            throw new Exception(StaticData.International("SendEmail_SendFail"),new Exception(ex.Message));
         }
 
 
@@ -52,15 +52,19 @@ public static class SendEmailHelper
 
     public static async Task<bool> TestEmailConfigAsync(SystemEmailSendConfig _systemEmailConfig)
     {
-        using (var client = new MailKit.Net.Smtp.SmtpClient())
+        using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
         {
+            using (var client = new MailKit.Net.Smtp.SmtpClient())
+            {
 
-            await client.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.SslOnConnect);
+                await client.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.Auto, cts.Token);
 
-            await client.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode);
+                await client.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode, cts.Token);
 
-            await client.DisconnectAsync(true);
+                await client.DisconnectAsync(true);
+            }
         }
+       
 
         return true;
     }
@@ -133,7 +137,7 @@ public static class SendEmailHelper
 
             smtp.ServerCertificateValidationCallback = (s, c, h, e) => true;
 
-            await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.SslOnConnect);
+            await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.Auto);
 
             await smtp.AuthenticateAsync(sMTPEmailConfig.UserName, sMTPEmailConfig.AuthorizationCode);
 

IRaCIS.Core.Application/Helper/WordTempleteHelper.cs

@@ -0,0 +1,101 @@
+using IRaCIS.Core.Domain.Share;
+using NPOI.XWPF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xceed.Document.NET;
+using Xceed.Words.NET;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    /// <summary>
+    /// 利用DocX 库 处理word国际化模板
+    /// </summary>
+    public static class WordTempleteHelper
+    {
+        public static void DocX_GetInternationalTempleteStream(string filePath, Stream memoryStream)
+        {
+
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+            using (DocX document = DocX.Load(filePath))
+            {
+                // 查找书签
+                var bookmarkEn_Start = document.Bookmarks.FirstOrDefault(b => b.Name == StaticData.CultureInfo.en_US_bookMark);
+
+                if (bookmarkEn_Start != null)
+                {
+                    // 获取书签的起始位置
+                    //int bookmarkCNStartPos = bookmarkCn_Start.Paragraph.StartIndex;
+
+                    var bookmarkENStartPos = bookmarkEn_Start.Paragraph.StartIndex;
+
+                    // 创建一个要删除段落的列表
+                    List<Paragraph> paragraphsToRemove = new List<Paragraph>();
+
+                    foreach (var item in document.Paragraphs)
+                    {
+                        //中文模板在前，英文在后，英文模板，就删除英文之前的，中文模板就删除英文之后的
+
+                        if (isEn_US ? item.EndIndex < bookmarkENStartPos : item.StartIndex >= bookmarkENStartPos)
+                        {
+                            paragraphsToRemove.Add(item);
+                        }
+                    }
+
+                    foreach (var paragraph in paragraphsToRemove)
+                    {
+                        document.RemoveParagraph(paragraph);
+                    }
+
+                }
+
+                // 保存修改
+                document.SaveAs(memoryStream);
+            }
+        }
+
+
+        public static void Npoi_GetInternationalTempleteStream(string filePath, Stream memoryStream)
+        {
+
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+            using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+            {
+                XWPFDocument doc = new XWPFDocument(fs);
+
+                // 查找包含指定书签的段落及其索引
+                var bookmarkParagraph = doc.Paragraphs
+                    .FirstOrDefault(p => p.GetCTP().GetBookmarkStartList().Any(b => b.name == StaticData.CultureInfo.en_US_bookMark));
+
+                if (bookmarkParagraph != null)
+                {
+                    int bookmarkIndex = doc.Paragraphs.IndexOf(bookmarkParagraph);
+
+                    if (isEn_US)
+                    {
+                        // 从书签所在段落开始，删除之前的所有段落
+                        for (int i = bookmarkIndex - 1; i >= 0; i--)
+                        {
+                            doc.RemoveBodyElement(i);
+                        }
+                    }
+                    else
+                    {
+                        // 删除书签之后的所有段落
+                        for (int i = doc.Paragraphs.Count - 1; i >= bookmarkIndex; i--)
+                        {
+                            doc.RemoveBodyElement(i);
+                        }
+                    }
+                }
+                doc.Write(memoryStream);
+            }
+        }
+
+    }
+}

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -42,7 +42,7 @@
 	<ItemGroup>
 		<None Remove="IRaCIS.Core.Application.xml" />
 		<None Remove="Resources\en-US.json" />
-		<None Remove="Resources\zh-CN.json" />
+		<None Remove="Resources\zh_ch.json" />
 		<None Remove="Service\Allocation\TaskConsistentRuleService.cs~RF1603d47.TMP" />
 		<None Remove="Service\Reading\ReadingImageTask\ReadingImageTaskService.cs~RF2f9323.TMP" />
 		<None Remove="Service\Reading\ReadingImageTask\ReadingJudgeTaskService.cs~RF198afd23.TMP" />
@@ -50,11 +50,6 @@
 
 
 	<ItemGroup>
-	  <Content Include="Resources\zh-CN.json">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	    <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-	    <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-	  </Content>
 	  <Content Include="Resources\en-US.json">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	    <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
@@ -63,46 +58,44 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />	
-		<PackageReference Include="FreeSpire.Doc" Version="11.6.0" />
-		<PackageReference Include="Hangfire.Core" Version="1.8.7" />
-		<PackageReference Include="BeetleX.BNR" Version="1.0.1" />
-		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
-		<PackageReference Include="EasyCaching.Redis" Version="1.9.2" />
-		<PackageReference Include="EasyCaching.InMemory" Version="1.9.2" />
-		<PackageReference Include="ExcelDataReader" Version="3.6.0" />
-		<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
-		<PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
-		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.3" />
-		<PackageReference Include="fo-dicom" Version="5.1.2" />
-		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.2" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.11.0" />
-		<PackageReference Include="Magicodes.IE.Core" Version="2.7.4.5" />
-		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.4.5">
+		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
+		<PackageReference Include="AWSSDK.S3" Version="3.7.402.4" />
+		<PackageReference Include="DocX" Version="3.0.1" />	
+		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
+		<PackageReference Include="Hangfire.Core" Version="1.8.14" />
+		<PackageReference Include="ExcelDataReader" Version="3.7.0" />
+		<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
+		<PackageReference Include="DistributedLock.Redis" Version="1.0.3" />
+		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
+		<PackageReference Include="fo-dicom" Version="5.1.3" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.14.5" />
+		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
+		<PackageReference Include="MailKit" Version="4.2.0" />
+		<PackageReference Include="MimeKit" Version="4.2.0" />
+		<PackageReference Include="MiniExcel" Version="1.34.1" />
+		<PackageReference Include="Minio" Version="6.0.3" />
+		<PackageReference Include="MiniWord" Version="0.8.0" />
+		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5">
-		  <TreatAsUsed>true</TreatAsUsed>
-		</PackageReference>
-		<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.5" />
-		<PackageReference Include="MailKit" Version="4.3.0" />
-		<PackageReference Include="MediatR" Version="12.2.0" />
-		<PackageReference Include="MimeKit" Version="4.3.0" />
-		<PackageReference Include="MiniExcel" Version="1.31.3" />
-		<PackageReference Include="Minio" Version="6.0.1" />
-		<PackageReference Include="MiniWord" Version="0.7.0" />
-		<PackageReference Include="My.Extensions.Localization.Json" Version="3.2.0">
-		  <TreatAsUsed>true</TreatAsUsed>
-		</PackageReference>
-		<PackageReference Include="NPOI" Version="2.6.2" />
-		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.1" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.12" />
-		<PackageReference Include="WinSCP" Version="6.1.2" />
+		<PackageReference Include="NPOI" Version="2.7.1" />
+		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
+		<PackageReference Include="RestSharp" Version="112.0.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
+		<PackageReference Include="MassTransit.AspNetCore" Version="7.3.1" />
+		<PackageReference Include="ZiggyCreatures.FusionCache" Version="1.3.0" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Update="Resources\ip2region.xdb">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+
 </Project>