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/**

.editorconfig

@@ -126,6 +126,15 @@ csharp_style_deconstructed_variable_declaration = true:suggestion
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 
+
+dotnet_diagnostic.CS1570.severity = none
+dotnet_diagnostic.CS1587.severity = none
+dotnet_diagnostic.CS8619.severity = none
+dotnet_diagnostic.CS8620.severity = none
+dotnet_diagnostic.CS8632.severity = none
+dotnet_diagnostic.CS8604.severity = none
+dotnet_diagnostic.CS1998.severity = none
+
 [*.vb]
 #### 命名样式 ####
 

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

@@ -0,0 +1,80 @@
+{
+  "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-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": "106.14.89.110",
+      "port": "9001",
+      "useSSL": false,
+      "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": 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,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
+
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "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

@@ -11,24 +11,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Application", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Domain.Share", "IRaCIS.Core.Domain.Share\IRaCIS.Core.Domain.Share.csproj", "{7CBC76F5-3817-46B7-8D9D-79253A89B578}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.JWT.RS256", "ZhiZhunAuthenticationCenter\IRaCIS.JWT.RS256.csproj", "{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Test", "IRaCIS.Core.Test\IRaCIS.Core.Test.csproj", "{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infra.EFCore", "IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj", "{6D8115E5-84D6-424B-8F8D-0C2D40347A8C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infrastructure", "IRaCIS.Core.Infrastructure\IRaCIS.Core.Infrastructure.csproj", "{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IRaCIS.AuthenticationCenter", "IRaCIS.AuthenticationCenter", "{481329D6-B8A0-491F-A398-1DF66A0FBB62}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.IdentityServer4", "IRaCIS.Core.IdentityServer4\IRaCIS.Core.IdentityServer4.csproj", "{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.IdentityServer4.MVC", "IRaCIS.Core.IdentityServer4.MVC\IRaCIS.Core.IdentityServer4.MVC.csproj", "{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F852ABFB-88AC-48BE-B876-2228BE2373D6}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
+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
@@ -52,10 +41,6 @@ Global
 		{7CBC76F5-3817-46B7-8D9D-79253A89B578}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CBC76F5-3817-46B7-8D9D-79253A89B578}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CBC76F5-3817-46B7-8D9D-79253A89B578}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -68,23 +53,14 @@ 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
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.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
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39} = {481329D6-B8A0-491F-A398-1DF66A0FBB62}
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674} = {481329D6-B8A0-491F-A398-1DF66A0FBB62}
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C} = {481329D6-B8A0-491F-A398-1DF66A0FBB62}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BCC2EB19-3914-489B-B1D7-B7303E0218A3}
 	EndGlobalSection

IRaCIS.Core.API/2Program.cs

@@ -1,231 +0,0 @@
-//using Autofac;
-//using Autofac.Extensions.DependencyInjection;
-//using IRaCIS.Core.API;
-//using IRaCIS.Core.Application.Filter;
-//using IRaCIS.Core.Application.MediatR.Handlers;
-//using LogDashboard;
-//using MassTransit;
-//using MassTransit.NewIdProviders;
-//using MediatR;
-//using Microsoft.AspNetCore.Builder;
-//using Microsoft.AspNetCore.Http.Features;
-//using Microsoft.AspNetCore.HttpOverrides;
-//using Microsoft.AspNetCore.SignalR;
-//using Microsoft.Extensions.Configuration;
-//using Microsoft.Extensions.DependencyInjection;
-//using Microsoft.Extensions.Hosting;
-//using Serilog;
-//using System;
-
-//var builder = WebApplication.CreateBuilder(args);
-
-
-//    //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
-//    var config = new ConfigurationBuilder()
-//                .AddEnvironmentVariables()
-//                .Build();
-
-//    var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
-
-//    if (string.IsNullOrWhiteSpace(enviromentName))
-//    {
-
-//        var index = Array.IndexOf(args, "--env");
-//        enviromentName = index > -1
-//            ? args[index + 1]
-//            : "Development";
-//    }
- 
-
-//    NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
-
-
-
-
-//builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory())
-//    .ConfigureContainer<ContainerBuilder>(containerBuilder =>
-//    {
-//        containerBuilder.RegisterModule<AutofacModuleSetup>();
-//    })
-//    .UseWindowsService().UseSerilog();
-
-
-
-//// Add services to the container.
-
-////本地化
-//builder.Services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
-
-//// 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
-//builder.Services.AddControllers(options =>
-//{
-//    //options.Filters.Add<LogActionFilter>();
-//    options.Filters.Add<ModelActionFilter>();
-//    options.Filters.Add<ProjectExceptionFilter>();
-//    //options.Filters.Add<UnitOfWorkFilter>();
-
-//    //if (_configuration.GetSection("BasicSystemConfig").GetValue<bool>("OpenLoginLimit"))
-//    //{
-//    //    options.Filters.Add<LimitUserRequestAuthorization>();
-
-//    //}
-
-
-//}).AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
-
-////动态WebApi + UnifiedApiResultFilter  省掉控制器代码
-//builder.Services.AddDynamicWebApiSetup();
-////AutoMapper
-//builder.Services.AddAutoMapperSetup();
-////EF ORM  QueryWithNoLock
-//builder.Services.AddEFSetup(builder.Configuration);
-////Http 响应压缩
-//builder.Services.AddResponseCompressionSetup();
-////Swagger Api 文档
-//builder.Services.AddSwaggerSetup();
-////JWT Token 验证
-//builder.Services.AddJWTAuthSetup(builder.Configuration);
-//// MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
-//builder.Services.AddMediatR(typeof(ConsistencyVerificationHandler).Assembly);
-//// EasyCaching 缓存
-//builder.Services.AddEasyCachingSetup();
-
-////services.AddDistributedMemoryCache();
-
-////// hangfire  定时任务框架  有界面，更友好~
-//builder.Services.AddhangfireSetup(builder.Configuration);
-//////  QuartZ 定时任务框架  使用了hangfire 暂时不用，后续需要可以打开，已经配好
-////builder.Services.AddQuartZSetup(_configuration);
-
-//// 保护上传文件
-////services.AddStaticFileAuthorizationSetup();
-
-
-//////HttpReports 暂时废弃
-////services.AddHttpReports().AddHttpTransport();
-////Serilog 日志可视化 LogDashboard日志
-//builder.Services.AddLogDashboardSetup();
-////上传限制 配置
-//builder.Services.Configure<FormOptions>(options =>
-//{
-//    options.MultipartBodyLengthLimit = int.MaxValue;
-//    options.ValueCountLimit = int.MaxValue;
-//    options.ValueLengthLimit = int.MaxValue;
-//});
-////IP 限流 可设置白名单 或者黑名单
-////services.AddIpPolicyRateLimitSetup(_configuration);
-////用户类型 策略授权
-//builder.Services.AddAuthorizationPolicySetup(builder.Configuration);
-
-//builder.Services.AddJsonConfigSetup(builder.Configuration);
-
-////转发头设置  获取真实IP 
-//builder.Services.Configure<ForwardedHeadersOptions>(options =>
-//{
-//    options.ForwardedHeaders =
-//        ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-//});
-////Dicom影像渲染图片  跨平台
-//builder.Services.AddDicomSetup();
-
-//// 实时应用
-//builder.Services.AddSignalR();
-
-
-//builder.Services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
-
-//builder.Services.AddControllers();
-//// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-////builder.Services.AddEndpointsApiExplorer();
-////builder.Services.AddSwaggerGen();
-
-////SerilogExtension.AddSerilogSetup(enviromentName, builder.Host.confi);
-
-
-//var app = builder.Build();
-
-//// Configure the HTTP request pipeline.
-
-////本地化
-//app.UseLocalization();
-
-//app.UseForwardedHeaders();
-
-
-////不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
-//app.UseStaticFiles();
-
-//app.UseIRacisHostStaticFileStore(app.Environment);
-
-////LogDashboard
-//app.UseLogDashboard("/LogDashboard");
-
-////hangfire
-////app.UseHangfireConfig(app.Environment);
-
-//////暂时废弃
-////app.UseHttpReports();
-
-//////限流 中间件
-////app.UseIpRateLimiting();
-
-////响应压缩
-//app.UseResponseCompression();
-
-//if (app.Environment.IsDevelopment())
-//{
-//    app.UseDeveloperExceptionPage();
-//}
-//else
-//{
-
-//    //app.UseHsts();
-//}
-
-//SwaggerSetup.Configure(app, app.Environment);
-
-//Console.WriteLine("当前环境： " + builder.Environment.EnvironmentName);
-
-////app.UseMiddleware<AuthMiddleware>();
-
-//// 特殊异常处理 比如 404 
-//app.UseStatusCodePagesWithReExecute("/Error/{0}");
-
-
-
-
-//////serilog 记录请求的用户信息
-//app.UseSerilogConfig(app.Environment);
-
-//app.UseRouting();
-
-//app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
-
-
-//app.UseAuthentication();
-////app.UseJwtBearerQueryString();
-//app.UseAuthorization();
-
-//////文件伺服  必须带Token 访问
-//////app.UseIRacisHostStaticFileStore(env);
-
-
-
-////app.UseEndpoints(endpoints =>
-////{
-
-
-////    endpoints.MapControllers();
-
-////    endpoints.MapHub<UploadHub>("/UploadHub")/*.RequireCors(t=>t.WithOrigins(new string[] {"null"}).AllowAnyMethod().AllowAnyHeader().AllowCredentials())*/;
-////});
-
-
-
-//app.MapControllers();
-//app.MapHub<UploadHub>("/UploadHub")/*.RequireCors(t=>t.WithOrigins(new string[] {"null"}).AllowAnyMethod().AllowAnyHeader().AllowCredentials())*/;
-
-
-//app.Run();
-
-//测试同步

IRaCIS.Core.API/AnonymizeTagSetting.json

@@ -1,106 +0,0 @@
-{
-  "needAnonymizeTag": [
-    { //PatientsName
-      "Group": "0010",
-      "Element": "0010",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // PatientID
-      "Group": "0010",
-      "Element": "0020",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // IssuerOfPatientID
-      "Group": "0010",
-      "Element": "0021",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // PatientsBirthDate
-      "Group": "0010",
-      "Element": "0030",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // PatientsBirthTime
-      "Group": "0010",
-      "Element": "0032",
-      "ReplaceValue": "",
-      "Enable": false
-    },
-    { // PatientsSex
-      "Group": "0010",
-      "Element": "0040",
-      "ReplaceValue": "",
-      "Enable": false
-    },
-    { // OtherPatientIDs
-      "Group": "0010",
-      "Element": "1000",
-      "ReplaceValue": "",
-      "Enable": false
-    },
-    { // OtherPatientNames
-      "Group": "0010",
-      "Element": "1001",
-      "ReplaceValue": "",
-      "Enable": false
-    },
-    { // OtherPatientNames
-      "Group": "0010",
-      "Element": "1005",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // PatientBirthName
-      "Group": "0010",
-      "Element": "1005",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // PatientsAge
-      "Group": "0010",
-      "Element": "1010",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // PatientsAddress
-      "Group": "0010",
-      "Element": "1040",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { // PatientsMothersBirthName
-      "Group": "0010",
-      "Element": "1060",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { 
-      "Group": "0010",
-      "Element": "2150",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    { 
-      "Group": "0010",
-      "Element": "2152",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    {
-      "Group": "0010",
-      "Element": "2154",
-      "ReplaceValue": "",
-      "Enable": true
-    },
-    {
-      "Group": "0012",
-      "Element": "0040",
-      "ReplaceValue": "XXX",
-      "Enable": true
-    }
-  ]
-}

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -1,9 +1,5 @@
 using System;
 using System.Net.Http;
-using EasyCaching.Core;
-using gRPC.ZHiZHUN.AuthServer.protos;
-using Grpc.Net.Client;
-using Grpc.Net.Client.Configuration;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
@@ -24,6 +20,23 @@ using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Infrastructure;
 using System.Linq;
 using Microsoft.Extensions.Logging;
+using MassTransit;
+using Microsoft.AspNetCore.Hosting;
+using IRaCIS.Core.Application.Helper;
+using Microsoft.Extensions.Options;
+using IRaCIS.Core.Application.Contracts;
+using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
+using 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
 {
@@ -47,9 +60,10 @@ 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)
         {
             var education = await _educationService.GetEducation(doctorId);
@@ -59,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),
@@ -70,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,
@@ -89,88 +103,180 @@ 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,
-            [FromServices] ITokenService _tokenService, [FromServices] IConfiguration configuration)
+        public async Task<IResponseOutput> Login(UserLoginDTO loginUser,
+            [FromServices] IFusionCache _fusionCache,
+            [FromServices] IUserService _userService,
+            [FromServices] ITokenService _tokenService,
+            [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 };
+
+                loginReturn.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(loginReturn.BasicInfo));
 
 
-                //////这一句是让grpc支持本地 http  如果本地访问部署在服务器上，那么是访问不成功的 
-                //AppContext.SetSwitch(
-                //    "System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
+                // 创建一个 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 访问
+                };
 
-                //#endregion
+                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 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, new GrpcChannelOptions
+                    //{
+                    //    HttpHandler = httpHandler,
+                    //    ServiceConfig = new ServiceConfig { MethodConfigs = { defaultMethodConfig } }
 
-                //});
-                ////var channel = GrpcChannel.ForAddress(grpcAdress);
-                //var grpcClient = new TokenGrpcService.TokenGrpcServiceClient(channel);
+                    //});
+                    ////var channel = GrpcChannel.ForAddress(grpcAdress);
+                    //var grpcClient = new TokenGrpcService.TokenGrpcServiceClient(channel);
 
-                //var userInfo = returnModel.Data.BasicInfo;
+                    //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
-                //});
+                    //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;
+                    //returnModel.Data.JWTStr = tokenResponse.Token;
 
-                #endregion
+                    #endregion
 
-                returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
+                    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 provider.SetAsync(userId.ToString(), returnModel.Data.JWTStr, TimeSpan.FromDays(7));
-            return returnModel;
+
+
         }
 
 
 
+
+
         [HttpGet, Route("imageShare/ShareImage")]
         [AllowAnonymous]
         public IResponseOutput ShareImage([FromServices] ITokenService _tokenService)
@@ -190,29 +296,209 @@ namespace IRaCIS.Api.Controllers
             return ResponseOutput.Ok("/showdicom?studyId=f7b67793-8155-0223-2f15-118f2642efb8&type=Share&token=" + token);
         }
 
+        [HttpGet("user/GetObjectStoreToken")]
+        public async Task<IResponseOutput> GetObjectStoreTokenAsync([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options)
+        {
+            var serviceOption = options.CurrentValue;
+
+            if (Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedEnum) && parsedEnum == ObjectStoreUse.AliyunOSS)
+            {
+
+                var ossOptions = serviceOption.AliyunOSS;
+
+                var client = new Client(new AlibabaCloud.OpenApiClient.Models.Config()
+                {
+                    AccessKeyId = ossOptions.AccessKeyId,
+                    AccessKeySecret = ossOptions.AccessKeySecret,
+                    //AccessKeyId = "LTAI5tJV76pYX5yPg1N9QVE8",
+                    //AccessKeySecret = "roRNLa9YG1of4pYruJGCNKBXEWTAWa",
+
+                    Endpoint = "sts.cn-hangzhou.aliyuncs.com"
+                });
+
+                var assumeRoleRequest = new AlibabaCloud.SDK.Sts20150401.Models.AssumeRoleRequest();
+                // 将<YOUR_ROLE_SESSION_NAME>设置为自定义的会话名称，例如oss-role-session。
+                assumeRoleRequest.RoleSessionName = $"session-name-{NewId.NextGuid()}";
+                // 将<YOUR_ROLE_ARN>替换为拥有上传文件到指定OSS Bucket权限的RAM角色的ARN。
+                assumeRoleRequest.RoleArn = ossOptions.RoleArn;
+                //assumeRoleRequest.RoleArn = "acs:ram::1899121822495495:role/webdirect";
+                assumeRoleRequest.DurationSeconds = ossOptions.DurationSeconds;
+                var runtime = new AlibabaCloud.TeaUtil.Models.RuntimeOptions();
+                var response = client.AssumeRoleWithOptions(assumeRoleRequest, runtime);
+                var credentials = response.Body.Credentials;
+
+                var tempToken = new AliyunOSSTempToken()
+                {
+                    AccessKeyId = credentials.AccessKeyId,
+                    AccessKeySecret = credentials.AccessKeySecret,
+                    Expiration = credentials.Expiration,
+                    SecurityToken = credentials.SecurityToken,
+
+
+                    Region = ossOptions.Region,
+                    BucketName = ossOptions.BucketName,
+                    EndPoint = ossOptions.EndPoint,
+                    ViewEndpoint = ossOptions.ViewEndpoint,
+
+                };
+
+                var awstempToken = await GetAWSTemToken(serviceOption);
+
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse,  AliyunOSS = tempToken,AWS= awstempToken });
+
+
+            }
+            else if (Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedValue) && parsedValue == ObjectStoreUse.MinIO)
+            {
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO});
+            }
+            else
+            {
+                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 });
+            }
+
+        }
+
+
+        private async Task<AWSTempToken> GetAWSTemToken(ObjectStoreServiceOptions serviceOption)
+        {
+            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 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);
 
+            var lang = decodeUrl.Substring(decodeUrl.IndexOf("lang=") + "lang=".Length, 2);
+
             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+ $"?ErrorMessage={System.Web.HttpUtility.UrlEncode("您的初始化链接已过期")} ";
+                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.    Return")} ";
             }
 
             return Redirect(decodeUrl);
@@ -224,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();
@@ -245,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

@@ -12,23 +12,19 @@ using IRaCIS.Core.Application.Service.Inspection.DTO;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Application.Auth;
+using Microsoft.Extensions.Localization;
 
 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;
-
-        public FinancialChangeController(ITrialService trialService, ICalculateService calculateService
-            )
-        {
-            _trialService = trialService;
-            _calculateService = calculateService;
-        }
+       
 
 
         //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
@@ -50,7 +46,7 @@ namespace IRaCIS.Core.API.Controllers.Special
         /// <param name="param"></param>
         /// <returns>新记录Id</returns>
         [HttpPost, Route("trial/addOrUpdateTrial")]
-        [Authorize(Policy = IRaCISPolicy.PM_APM)]
+        //[Authorize(Policy = IRaCISPolicy.PM_APM)]
 
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput<Trial>>  AddOrUpdateTrial(TrialCommand param)
@@ -124,7 +120,8 @@ namespace IRaCIS.Core.API.Controllers.Special
 
             if (isLock)
             {
-                return ResponseOutput.NotOk("Expenses have been settled and workload can not be reset.");
+                //---Expenses have been settled and workload can not be reset.
+                return ResponseOutput.NotOk(_localizer["Financial_ChargeSettled"]);
             }
 
             var deleteResult = await _trialWorkloadService.DeleteWorkload(id);
@@ -300,7 +297,8 @@ namespace IRaCIS.Core.API.Controllers.Special
         {
             if (!ModelState.IsValid)
             {
-                return ResponseOutput.NotOk("Invalid parameter.");
+                //---Invalid parameter.
+                return ResponseOutput.NotOk(_localizer["Financial_InvalidParameter"]);
             }
             return await _calculateService.CalculateMonthlyPayment(param, User.FindFirst("id").Value);
         }

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -11,6 +11,7 @@ using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using IRaCIS.Core.Application.Service.Inspection.Interface;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.Service.Reading.Interface;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
@@ -25,75 +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 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,
-            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._subjectService = _subjectService;
-            this._readingClinicalDataService = _readingClinicalDataService;
-            this._subjectVisitService = subjectVisitService;
-            this._qCOperationService = qCOperationService;
-            this._clinicalDataService = clinicalDataService;
-            this._visitPlanService = visitPlanService;
-            this._dataInspectionRepository = dataInspectionRepository;
-        }
-
-
-
-
+       
         #region 获取稽查数据
         /// <summary>
         /// 获取稽查数据
@@ -233,6 +178,111 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
+        /// <summary>
+        /// CRC签名临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCSignClinicalData")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCSignClinicalData(DataInspectionDto<CRCSignClinicalDataInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCSignClinicalData(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+        /// <summary>
+        /// CRC确认临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+        /// <summary>
+        /// CRC撤销临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCCancelConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCCancelConfirmClinical(DataInspectionDto<CRCCancelConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCCancelConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+        /// <summary>
+        /// PM确认临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/PMConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> PMConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.PMConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+        /// <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" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> SubmitClinicalFormAndSign(DataInspectionDto<SubmitClinicalFormInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.SubmitClinicalForm(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
         /// <summary>
         /// 提交阅片裁判问题
         /// </summary>
@@ -310,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>
@@ -327,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/GrpcToken.proto

@@ -1,16 +1,16 @@
-// 使用的是proto3版本
+// 使用的是proto3版本
 syntax = "proto3";
-// 定义命名空间，后续生成代码时就会生成对应的命名空间
+// 定义命名空间，后续生成代码时就会生成对应的命名空间
 option csharp_namespace = "gRPC.ZHiZHUN.AuthServer.protos";
 
 /*
-每一句需要用分号结尾
-message 用来定义请求和返回数据格式
-tag message后面的值数字代表是字段的标识(tag),不是赋值，
+每一句需要用分号结尾
+message 用来定义请求和返回数据格式
+tag message后面的值数字代表是字段的标识(tag),不是赋值，
 */
 
 
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message GetTokenReuqest{
 	string id=1;
 	string userName=2;
@@ -22,48 +22,48 @@ message GetTokenReuqest{
 
 }
 
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message  GetTokenResponse {
 	int32  code=1;
 	string token =2;
 }
 
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service TokenGrpcService{
-	// 获取token
+	// 获取token
 	rpc GetUserToken(GetTokenReuqest) returns (GetTokenResponse);
 
 }
 
 /*
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message AddUserReuqest{
 	string name=1;
 	int32 age=2;
 	bool isBoy=3;
 }
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message ResultResponse {
 	int32 code=1;
 	string msg =2;
 }
-//传递的查询条件信息格式，可理解为平时传入的查询条件对象
+//传递的查询条件信息格式，可理解为平时传入的查询条件对象
 message QueryUserReuqest{
 	string name=1;
 }
-//查询返回的用户信息格式，可理解为返回的类
+//查询返回的用户信息格式，可理解为返回的类
 message UserInfoResponse {
 	string name=1;
 	int32 age=2;
 	string gender=3;
 }
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service UserService{
-	// 新增用户
+	// 新增用户
 	rpc AddUser(AddUserReuqest) returns (ResultResponse);
-	// 查询用户
+	// 查询用户
 	rpc GetAllUser(QueryUserReuqest) returns (UserInfoResponse);
 }
 */

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>false</SignAssembly>
     <UserSecretsId>354572d4-9e15-4099-807c-63a2d29ff9f2</UserSecretsId>
     <LangVersion>default</LangVersion>
@@ -14,7 +14,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>.\IRaCIS.Core.API.xml</DocumentationFile>
-    <NoWarn>1701;1702;1591;</NoWarn>
+    <NoWarn>1701;1702;1591;1570;</NoWarn>
     <OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
 
@@ -24,12 +24,7 @@
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="wwwroot\**" />
-    <EmbeddedResource Remove="UploadFile\**" />
-    <EmbeddedResource Remove="wwwroot\**" />
- 
-  </ItemGroup>
+
 
   <ItemGroup>
     <Content Remove="web.config" />
@@ -66,31 +61,23 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
-    <PackageReference Include="EasyCaching.InMemory" Version="1.7.0" />
-    <PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.7.0" />
-    <PackageReference Include="EntityFrameworkCore.Triggered.Extensions" Version="3.2.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.21.8" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.49.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.50.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Hangfire.Tags.SqlServer" Version="1.8.1" />
+    <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
+    <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
+    <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.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="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
-    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
-    <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.2.0" />
-    <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.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -103,33 +90,54 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="NLog.config">
+    <Content Update="wwwroot\EmailTemplate\AdminAddUser_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\AdminResetUser_US.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Update="wwwroot\EmailTemplate\AdminResetUser.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Update="wwwroot\EmailTemplate\EmailConfigTest.html">
+    <Content Update="wwwroot\EmailTemplate\SubjectEnrollConfirmOrPDProgress_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialDoctorExistJoin_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialDoctorFirstJoin.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Update="wwwroot\EmailTemplate\TrialSiteSurveyReject.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialSiteSurveyReject_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Update="wwwroot\EmailTemplate\TrialDoctorExistJoin.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialUserExistJoin_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Update="wwwroot\EmailTemplate\TrialUserExistJoin.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Update="wwwroot\EmailTemplate\AdminAddUser.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Update="wwwroot\EmailTemplate\TrialDoctorFirstJoin.html">
+    <Content Update="wwwroot\EmailTemplate\TrialDoctorFirstJoin_US.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Update="wwwroot\EmailTemplate\SubjectEnrollConfirmOrPDProgress.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="wwwroot\EmailTemplate\TrialUserFirstJoin_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="wwwroot\EmailTemplate\UserOptCommon_US.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Update="wwwroot\EmailTemplate\UserOptCommon.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -142,7 +150,7 @@
     <Folder Include="Properties\PublishProfiles\" />
   </ItemGroup>
 
-  <ProjectExtensions><VisualStudio><UserProperties anonymizetagsetting_1json__JsonSchema="http://json.schemastore.org/jovo-language-model" properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 
 
 </Project>

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,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})">
@@ -139,6 +139,48 @@
             <param name="opt"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCSignClinicalData(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCSignClinicalDataInDto})">
+            <summary>
+            CRC签名临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCConfirmClinicalInDto})">
+            <summary>
+            CRC确认临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCCancelConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCCancelConfirmClinicalInDto})">
+            <summary>
+            CRC撤销临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.PMConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCConfirmClinicalInDto})">
+            <summary>
+            PM确认临床数据
+            </summary>
+            <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>
+            提交结构化录入并签名
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitJudgeVisitTaskResult(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeVisitTaskResult})">
             <summary>
             提交阅片裁判问题
@@ -173,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  批量提交
@@ -230,167 +278,68 @@
         <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.UploadVisitClinicalData(System.Guid)">
-            <summary>
-            上传临床数据  多文件
-            </summary>
-            <param name="subjectVisitId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadClinicalTemplate(System.Nullable{System.Guid})">
-            <summary>
-            上传临床数据模板
-            </summary>
-            <param name="trialId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadReadClinicalData(System.Guid,System.Guid,System.Guid)">
-            <summary>
-            上传阅片临床数据
-            </summary>
-            <param name="trialId"></param>
-            <param name="subjectId"></param>
-            <param name="readingId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadPrintscreen(System.Guid)">
-            <summary>
-            上传截图
-            </summary>
-            <param name="subjectId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadReadingAnswerImage(System.Guid,System.Guid)">
-            <summary>
-            上传Reading问题的图像
-            </summary>
-            <param name="trialId"></param>
-            <param name="visitTaskId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadJudgeTaskImage(System.Guid,System.Guid)">
-            <summary>
-            上传裁判任务的图像
-            </summary>
-            <param name="trialId"></param>
-            <param name="visitTaskId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadMedicalReviewImage(System.Guid,System.Guid)">
-            <summary>
-            上传医学审核图片
-            </summary>
-            <param name="trialId"></param>
-            <param name="taskMedicalReviewId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(Microsoft.AspNetCore.Http.IFormCollection,System.Guid,System.Guid,System.Guid,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="formCollection"></param>
-            <param name="subjectVisitId"></param>
-            <param name="noneDicomStudyId"></param>
-            <param name="studyMonitorId"></param>
+            <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)">
+        <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>
         <member name="T:IRaCIS.Core.API.Controllers.FileController">
             <summary>医生文件上传下载</summary>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.UploadOrdinaryFile(System.String,System.Guid)">
+        <member name="M:IRaCIS.Core.API.Controllers.FileController.GetOfficialResume(IRaCIS.Core.API.Controllers.GetDoctorPathCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Attachment})">
             <summary>
-            上传文件[FileUpload]
+            New  医生首页 多选 获取多个医生信息+文件路径列表  医生压缩包名称  doctorCode + "_" + doctorName _(时间戳或者随机的Guid)
             </summary>
-            <param name="attachmentType">附件类型</param>
-            <param name="doctorId">医生Id</param>
-            <returns>返回文件信息</returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.UploadNonDoctorFile(System.String)">
-            <summary>
-            上传文件（ 不是医生个人的文件）[FileUpload]
-            例如：阅片章程等
-            </summary>
-            <param name="type">文件类型</param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadAttachment(System.Guid[])">
+        <member name="M:IRaCIS.Core.API.Controllers.FileController.GetTrialDoctorOfficialResume(IRaCIS.Core.API.Controllers.GetDoctorPathCommand,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Attachment})">
             <summary>
-            下载多个医生的所有附件
+            New  项目入组  勾选获取简历路径
             </summary>
-            <param name="doctorIds"></param>
+            <param name="command"></param>
+            <param name="_doctorService"></param>
+            <param name="_attachmentrepository"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadOfficialResume(System.Int32,System.Guid[])">
+        <member name="M:IRaCIS.Core.API.Controllers.FileController.GetDoctorAttachment(IRaCIS.Core.API.Controllers.GetDoctoreAttachPathCommand,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Attachment})">
             <summary>
-            下载医生官方简历
+            new  医生详情  勾选或者下载文件路径
             </summary>
-            <param name="language"></param>
-            <param name="doctorIds"></param>
+            <param name="command"></param>
+            <param name="_doctorService"></param>
+            <param name="_attachmentrepository"></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.UploadDownLoadController.LocalFilePreview(System.String)">
-            <summary>  缩略图 </summary>
-        </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>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadTrialClinicalFile(System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataTrialSet})">
-            <summary>
-            下载项目临床数据文件
-            </summary>
-            <param name="clinicalDataTrialSetId"></param>
-            <param name="_clinicalDataTrialSetRepository"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadSystemClinicalFile(System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataSystemSet})">
-            <summary>
-            下载系统临床数据文件
-            </summary>
-            <param name="clinicalDataSystemSetId"></param>
-            <param name="_clinicalDataSystemSetRepository"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadTrialDoc(System.Guid)">
-             <summary>
-            上传项目签名文档
-             </summary>
-             <param name="trialId"></param>
-             <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadSysTemDoc">
-            <summary>
-            上传系统签名文档
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadCommonDoc">
             <summary>
             上传通用文档  比如一致性核查的 比如导出的excel 模板
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadSystemNoticeDoc">
+        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.Upload(IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadFileType)">
             <summary>
-            上传系统通知文档
+            1：数据上传  2：导出、 3：邮件附件  4：邮件Html     通过 ----new
             </summary>
             <returns></returns>
         </member>
@@ -399,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>
             创建属性
@@ -407,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>
@@ -449,113 +406,5 @@
             <param name="withPrivate"></param>
             <returns></returns>
         </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.GrpcTokenReflection">
-            <summary>Holder for reflection information generated from Protos/GrpcToken.proto</summary>
-        </member>
-        <member name="P:gRPC.ZHiZHUN.AuthServer.protos.GrpcTokenReflection.Descriptor">
-            <summary>File descriptor for Protos/GrpcToken.proto</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest">
-            <summary>
-            新增用户时需要传递数据消息， 可理解为一个类
-            </summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.IdFieldNumber">
-            <summary>Field number for the "id" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.UserNameFieldNumber">
-            <summary>Field number for the "userName" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.RealNameFieldNumber">
-            <summary>Field number for the "realName" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.ReviewerCodeFieldNumber">
-            <summary>Field number for the "reviewerCode" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.UserTypeEnumIntFieldNumber">
-            <summary>Field number for the "userTypeEnumInt" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.UserTypeShortNameFieldNumber">
-            <summary>Field number for the "userTypeShortName" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.IsAdminFieldNumber">
-            <summary>Field number for the "isAdmin" field.</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.GetTokenResponse">
-            <summary>
-            新增时返回的消息格式
-            </summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenResponse.CodeFieldNumber">
-            <summary>Field number for the "code" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenResponse.TokenFieldNumber">
-            <summary>Field number for the "token" field.</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService">
-            <summary>
-            service 用标识定义服务的，里面写对应的方法
-            </summary>
-        </member>
-        <member name="P:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.Descriptor">
-            <summary>Service descriptor</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient">
-            <summary>Client for TokenGrpcService</summary>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor(Grpc.Core.ChannelBase)">
-            <summary>Creates a new client for TokenGrpcService</summary>
-            <param name="channel">The channel to use to make remote calls.</param>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor(Grpc.Core.CallInvoker)">
-            <summary>Creates a new client for TokenGrpcService that uses a custom <c>CallInvoker</c>.</summary>
-            <param name="callInvoker">The callInvoker to use to make remote calls.</param>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor">
-            <summary>Protected parameterless constructor to allow creation of test doubles.</summary>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor(Grpc.Core.ClientBase.ClientBaseConfiguration)">
-            <summary>Protected constructor to allow creation of configured clients.</summary>
-            <param name="configuration">The client configuration.</param>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserToken(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.Metadata,System.Nullable{System.DateTime},System.Threading.CancellationToken)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="headers">The initial metadata to send with the call. This parameter is optional.</param>
-            <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
-            <param name="cancellationToken">An optional token for canceling the call.</param>
-            <returns>The response received from the server.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserToken(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.CallOptions)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="options">The options for the call.</param>
-            <returns>The response received from the server.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserTokenAsync(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.Metadata,System.Nullable{System.DateTime},System.Threading.CancellationToken)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="headers">The initial metadata to send with the call. This parameter is optional.</param>
-            <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
-            <param name="cancellationToken">An optional token for canceling the call.</param>
-            <returns>The call object.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserTokenAsync(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.CallOptions)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="options">The options for the call.</param>
-            <returns>The call object.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.NewInstance(Grpc.Core.ClientBase.ClientBaseConfiguration)">
-            <summary>Creates a new instance of client from given <c>ClientBaseConfiguration</c>.</summary>
-        </member>
     </members>
 </doc>

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/NLog.config

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      autoReload="true"
-      throwExceptions="false"
-      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
-	<variable name="myvar" value="myvalue"/>
-
-	<targets>
-
-		<target xsi:type="file" name="File" fileName="${basedir}/logs/${shortdate}/${level}.log"
-		        layout="${longdate}||${level}||${logger}||${message}||${exception:format=ToString:innerFormat=ToString:maxInnerExceptionLevel=10:separator=\r\n}||end" />
-	</targets>
-
-	<rules>
-		<logger name="*" minlevel="Debug" writeTo="file" />
-	</rules>
-</nlog>

IRaCIS.Core.API/Program.cs

@@ -1,158 +0,0 @@
-using System;
-using Autofac.Extensions.DependencyInjection;
-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;
-
-namespace IRaCIS.Core.API
-{
-    public class Program
-    {
-        public readonly string environment;
-        public static async Task Main(string[] args)
-        {
-            try
-            {
-                //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
-                var config = new ConfigurationBuilder()
-                            .AddEnvironmentVariables()
-                            .Build();
-
-                var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
-
-                if (string.IsNullOrWhiteSpace(enviromentName))
-                {
-
-                    var index = Array.IndexOf(args, "--env");
-                    enviromentName = index > -1
-                        ? args[index + 1]
-                        : "Development";
-                }
-
-                //Dicom 浏览
-                //ImageManager.SetImplementation(WinFormsImageManager.Instance);
-
-                var host = CreateHostBuilder(args)
-                    .UseEnvironment(enviromentName) //命令行传入环境
-                    .ConfigureAppConfiguration((hostContext, config) =>
-                    {
-
-                        //Console.WriteLine(hostContext.HostingEnvironment.EnvironmentName);                
-                        config.AddJsonFile("appsettings.json", false, true)
-                                  .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
-                    })
-                    .Build();
-
-
-
-                NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
-
-
-
-
-                //// Serilog 
-                SerilogExtension.AddSerilogSetup(enviromentName, host.Services);
-
-                //缓存项目的状态  匿名化数据
-                await InitCache(host);
-
-
-
-                host.Run();
-
-                Log.Logger.Warning($"当前环境：{enviromentName}");
-
-            }
-            catch (Exception e)
-            {
-
-                Log.Logger.Error(e.InnerException is null ? e.Message + e.StackTrace : e.InnerException?.Message + e.InnerException?.StackTrace);
-            }
-
-
-
-            #region Nlog 废弃
-            //var logger = NLog.Web.NLogBuilder.ConfigureNLog("NLog.config").GetCurrentClassLogger();
-            //try
-            //{
-            //    var ihostBuilder = CreateHostBuilder(args);
-
-            //    ihostBuilder.UseEnvironment(environment);
-
-            //    ihostBuilder.ConfigureAppConfiguration((hostContext, config) =>
-            //    {
-
-            //        //Console.WriteLine(hostContext.HostingEnvironment.EnvironmentName);                
-            //        config.AddJsonFile("appsettings.json", false, true)
-            //              .AddJsonFile($"appsettings.{environment}.json", false, true);
-            //    });
-
-            //    var host = ihostBuilder.Build();
-
-            //    CacheTrialStatus(host);
-
-            //    host.Run();
-
-            //}
-            //catch (Exception exception)
-            //{
-            //    //NLog: catch setup errors
-            //    logger.Error(exception, "Stopped program because of exception");
-            //}
-            //finally
-            //{
-            //    // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
-            //    NLog.LogManager.Shutdown();
-            //}
-
-            #endregion
-
-
-
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .UseWindowsService()
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.ConfigureKestrel((context, options) =>
-                     {
-                         //设置应用服务器Kestrel请求体最大为1GB // if don't set default value is: 30 MB
-                         options.Limits.MaxRequestBodySize = long.MaxValue;
-                         options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(30);
-                         options.Limits.RequestHeadersTimeout = TimeSpan.FromMinutes(20);
-
-                     });
-                    //webBuilder.UseSerilog();//在宿主机启动的时候配置serilog,与微软ILogger进行整合
-                    webBuilder.UseStartup<Startup>();
-                }).UseSerilog()
-                .UseServiceProviderFactory(new AutofacServiceProviderFactory());//使用Autofac替代本身容器
-                                                                                //ConfigureLogging(logging =>
-                                                                                //{
-                                                                                //    logging.ClearProviders();
-                                                                                //    logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
-                                                                                //})
-                                                                                //.UseNLog()
-                                                                                // NLog: Setup NLog for Dependency injection;
-
-
-
-
-        private static async Task InitCache(IHost host)
-        {
-            var _mediator = host.Services.GetService(typeof(IMediator)) as IMediator;
-
-            await _mediator.Send(new AnonymizeCacheRequest());
-
-            await _mediator.Send(new TrialStateCacheRequest());
-        }
-
-    }
-}

IRaCIS.Core.API/Progranm.cs

@@ -0,0 +1,388 @@
+using System;
+using Autofac.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+using System.Threading.Tasks;
+using MassTransit;
+using MassTransit.NewIdProviders;
+using System.IO;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Application.Helper;
+using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Builder;
+using IRaCIS.Core.API;
+using Autofac;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.DependencyInjection;
+using IRaCIS.Core.Application.Filter;
+using Microsoft.AspNetCore.HttpOverrides;
+using IRaCIS.Application.Services.BackGroundJob;
+using LogDashboard;
+using FellowOakDicom.Network;
+using IRaCIS.Core.Application.Service.ImageAndDoc;
+using IP2Region.Net.Abstractions;
+using IP2Region.Net.XDB;
+using IRaCIS.Core.Application.BusinessFilter;
+using Microsoft.AspNetCore.Http;
+using IRaCIS.Core.Infrastructure.Extention;
+using Newtonsoft.Json;
+using Microsoft.AspNetCore.Diagnostics;
+using IRaCIS.Core.Application.MassTransit.Command;
+using IRaCIS.Core.Application.MassTransit.Consumer;
+
+AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
+#region 获取环境变量
+//以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
+var config = new ConfigurationBuilder()
+            .AddEnvironmentVariables()
+            .Build();
+
+var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
+
+if (string.IsNullOrWhiteSpace(enviromentName))
+{
+
+    var index = Array.IndexOf(args, "--env");
+    enviromentName = index > -1
+        ? args[index + 1]
+        : "Development";
+}
+#endregion
+
+var builder = WebApplication.CreateBuilder(new WebApplicationOptions
+{
+    EnvironmentName = enviromentName
+});
+
+#region 兼容windows 服务命令行的方式
+
+//foreach (var arg in args)
+//{
+//    Console.WriteLine(arg);
+//}
+
+int urlsIndex = Array.FindIndex(args, arg => arg != null && arg.StartsWith("--urls"));
+
+if (urlsIndex > -1)
+{
+    var url = args[urlsIndex].Substring("--urls=".Length);
+    Console.WriteLine(url);
+    builder.WebHost.UseUrls(url);
+}
+
+#endregion
+
+#region 主机配置
+
+
+NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
+
+builder.Configuration.AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), "appsettings.json", false, true)
+                     .AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), $"appsettings.{enviromentName}.json", false, true);
+
+builder.Host
+            .UseServiceProviderFactory(new AutofacServiceProviderFactory())
+            .ConfigureContainer<ContainerBuilder>(containerBuilder =>
+            {
+                containerBuilder.RegisterModule<AutofacModuleSetup>();
+            })
+            .UseWindowsService().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<LogActionFilter>();
+    options.Filters.Add<ModelActionFilter>();
+    options.Filters.Add<ProjectExceptionFilter>();
+    options.Filters.Add<UnitOfWorkFilter>();
+    options.Filters.Add<EncreptApiResultFilter>(10);
+    options.Filters.Add<LimitUserRequestAuthorization>();
+
+
+})
+    .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  省掉控制器代码
+builder.Services.AddDynamicWebApiSetup();
+//AutoMapper
+builder.Services.AddAutoMapperSetup();
+//EF ORM  QueryWithNoLock
+builder.Services.AddEFSetup(_configuration,enviromentName);
+//Http 响应压缩
+builder.Services.AddResponseCompressionSetup();
+//Swagger Api 文档
+builder.Services.AddSwaggerSetup();
+//JWT Token 验证
+builder.Services.AddJWTAuthSetup(_configuration);
+
+// MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
+//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);
+
+// hangfire  定时任务框架  有界面，更友好~
+builder.Services.AddhangfireSetup(_configuration);
+
+
+//Serilog 日志可视化 LogDashboard日志
+builder.Services.AddLogDashboardSetup();
+
+
+builder.Services.AddJsonConfigSetup(_configuration);
+//转发头设置  获取真实IP 
+builder.Services.Configure<ForwardedHeadersOptions>(options =>
+{
+    options.ForwardedHeaders =
+        ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+});
+//Dicom影像渲染图片  跨平台
+builder.Services.AddDicomSetup();
+
+// 实时应用
+builder.Services.AddSignalR();
+
+builder.Services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
+
+
+builder.Services.AddSingleton<ISearcher>(new Searcher(CachePolicy.Content, Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "ip2region.xdb")));
+
+//builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
+//builder.Services.AddProblemDetails();
+
+#region  历史废弃配置
+//builder.Services.AddMemoryCache();
+////上传限制 配置
+//builder.Services.Configure<FormOptions>(options =>
+//{
+//    options.MultipartBodyLengthLimit = int.MaxValue;
+//    options.ValueCountLimit = int.MaxValue;
+//    options.ValueLengthLimit = int.MaxValue;
+//});
+//IP 限流 可设置白名单 或者黑名单
+//services.AddIpPolicyRateLimitSetup(_configuration);
+// 用户类型 策略授权
+//services.AddAuthorizationPolicySetup(_configuration);
+#endregion
+
+#endregion
+
+var app = builder.Build();
+var env = app.Environment;
+
+#region 配置中间件
+
+
+// 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();
+
+app.UseForwardedHeaders();
+
+//响应压缩
+app.UseResponseCompression();
+
+
+//不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
+app.UseStaticFiles();
+
+
+
+//LogDashboard
+app.UseLogDashboard("/LogDashboard");
+
+//hangfire
+app.UseHangfireConfig(env);
+
+#region 暂时废弃
+
+//app.UseMiddleware<MultiDiskStaticFilesMiddleware>();
+////限流 中间件
+//app.UseIpRateLimiting();
+//if (env.IsDevelopment())
+//{
+//    app.UseDeveloperExceptionPage();
+//}
+//else
+//{
+//    //app.UseHsts();
+//}
+#endregion
+
+
+
+
+
+SwaggerSetup.Configure(app, env);
+
+
+////serilog 记录请求的用户信息
+app.UseSerilogConfig(env);
+
+app.UseRouting();
+
+app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
+
+//app.UseIRacisHostStaticFileStore(env);
+
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.MapHub<UploadHub>("/UploadHub");
+app.MapHealthChecks("/health");
+
+
+// Serilog 
+SerilogExtension.AddSerilogSetup(enviromentName, app.Services);
+
+
+var hangfireJobService = app.Services.GetRequiredService<IIRaCISHangfireJob>();
+
+await hangfireJobService.InitHangfireJobTaskAsync();
+
+
+
+#endregion
+
+try
+{
+    #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
+
+
+    Log.Logger.Warning($"ContentRootPath：{env.ContentRootPath}");
+
+
+    string parentDirectory = Path.GetFullPath(Path.Combine(env.ContentRootPath, ".."));
+
+
+    Log.Logger.Warning($"ContentRootPath——parentDirectory：{parentDirectory}");
+
+    //Log.Logger.Warning($"ContentRootPath——GetParent：{Directory.GetParent(env.ContentRootPath).Parent.FullName}");
+    //Log.Logger.Warning($"ContentRootPath——xx：{Path.GetDirectoryName(Path.GetDirectoryName(env.ContentRootPath))}");
+
+
+    app.Run();
+
+}
+catch (Exception e)
+{
+
+    Log.Logger.Error(e.InnerException is null ? e.Message + e.StackTrace : e.InnerException?.Message + e.InnerException?.StackTrace);
+}
+
+
+

IRaCIS.Core.API/Properties/launchSettings.json

@@ -13,14 +13,30 @@
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Test_IRC"
       }
     },
-    "IRaCIS.Development": {
+    "IRaCIS.Test_IRC": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Test_IRC"
+      },
+      "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:6100"
     },
@@ -30,29 +46,30 @@
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
       "publishAllPorts": true
     },
-    "IRaCIS.Staging": {
+    "IRaCIS.Uat_IRC": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Staging"
+        "ASPNETCORE_ENVIRONMENT": "Uat_IRC"
       },
-      "applicationUrl": "http://localhost:6200"
+      "applicationUrl": "http://localhost:6100"
     },
-    "IRaCIS.Production": {
+    "IRaCIS.Prod_IRC": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Production"
+        "ASPNETCORE_ENVIRONMENT": "Prod_IRC"
       },
-      "applicationUrl": "http://localhost:6300"
+      "applicationUrl": "http://localhost:6100"
     },
-    "IRaCIS.CertificateApply": {
+    "IRaCIS.US_Uat_IRC": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "CertificateApply"
+        "ASPNETCORE_ENVIRONMENT": "US_Uat_IRC"
       },
-      "applicationUrl": "http://localhost:6400"
+      "applicationUrl": "http://localhost:6100"
     }
+
   }
 }

IRaCIS.Core.API/Protos/GrpcToken.proto

@@ -1,16 +1,16 @@
-// 使用的是proto3版本
+// 使用的是proto3版本
 syntax = "proto3";
-// 定义命名空间，后续生成代码时就会生成对应的命名空间
+// 定义命名空间，后续生成代码时就会生成对应的命名空间
 option csharp_namespace = "gRPC.ZHiZHUN.AuthServer.protos";
 
 /*
-每一句需要用分号结尾
-message 用来定义请求和返回数据格式
-tag message后面的值数字代表是字段的标识(tag),不是赋值，
+每一句需要用分号结尾
+message 用来定义请求和返回数据格式
+tag message后面的值数字代表是字段的标识(tag),不是赋值，
 */
 
 
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message GetTokenReuqest{
 	string id=1;
 	string userName=2;
@@ -22,48 +22,48 @@ message GetTokenReuqest{
 
 }
 
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message  GetTokenResponse {
 	int32  code=1;
 	string token =2;
 }
 
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service TokenGrpcService{
-	// 获取token
+	// 获取token
 	rpc GetUserToken(GetTokenReuqest) returns (GetTokenResponse);
 
 }
 
 /*
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message AddUserReuqest{
 	string name=1;
 	int32 age=2;
 	bool isBoy=3;
 }
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message ResultResponse {
 	int32 code=1;
 	string msg =2;
 }
-//传递的查询条件信息格式，可理解为平时传入的查询条件对象
+//传递的查询条件信息格式，可理解为平时传入的查询条件对象
 message QueryUserReuqest{
 	string name=1;
 }
-//查询返回的用户信息格式，可理解为返回的类
+//查询返回的用户信息格式，可理解为返回的类
 message UserInfoResponse {
 	string name=1;
 	int32 age=2;
 	string gender=3;
 }
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service UserService{
-	// 新增用户
+	// 新增用户
 	rpc AddUser(AddUserReuqest) returns (ResultResponse);
-	// 查询用户
+	// 查询用户
 	rpc GetAllUser(QueryUserReuqest) returns (UserInfoResponse);
 }
 */

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/Startup.cs

@@ -1,242 +0,0 @@
-using Autofac;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
-using IRaCIS.Core.Application.Filter;
-using LogDashboard;
-using MediatR;
-using IRaCIS.Core.Application.MediatR.Handlers;
-using Microsoft.Extensions.Logging;
-using AspNetCoreRateLimit;
-using Microsoft.AspNetCore.HttpOverrides;
-using IRaCIS.Core.Infra.EFCore;
-using System.Globalization;
-using Microsoft.AspNetCore.Localization;
-using Localization;
-using Magicodes.ExporterAndImporter.Core.Filters;
-using IRaCIS.Core.Application.MediatR.CommandAndQueries;
-using IRaCIS.Core.Infra.EFCore.Common;
-using Invio.Extensions.Authentication.JwtBearer;
-using Microsoft.AspNetCore.SignalR;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.StaticFiles;
-
-namespace IRaCIS.Core.API
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
-        public ILogger<Startup> _logger { get; }
-
-        public IConfiguration _configuration { get; }
-
-        //// ConfigureContainer is where you can register things directly
-        //// with Autofac. This runs after ConfigureServices so the things
-        //// here will override registrations made in ConfigureServices.
-        //// Don't build the container; that gets done for you by the factory.
-        // for castle
-        public void ConfigureContainer(ContainerBuilder containerBuilder)
-        {
-            containerBuilder.RegisterModule<AutofacModuleSetup>();
-
-            #region  Test
-            //containerBuilder.RegisterType<ClinicalDataService>().PropertiesAutowired().InstancePerLifetimeScope();//注册仓储
-
-            //var container = containerBuilder.Build();
-
-            //// Now you can resolve services using Autofac. For example,
-            //// this line will execute the lambda expression registered
-            //// to the IConfigReader service.
-            //using (var scope = container.BeginLifetimeScope())
-            //{
-            //    var reader = scope.Resolve<BaseService>();
-
-            //    var test = scope.Resolve<ClinicalDataService>();
-            //    var test2 = scope.Resolve<IClinicalDataService>();
-
-            //    var test3 = scope.Resolve<IEFUnitOfWork<IRaCISDBContext>>();
-            //}
-            #endregion
-        }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            //本地化
-            services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
-
-            // 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
-            services.AddControllers(options =>
-            {
-                //options.Filters.Add<LogActionFilter>();
-                options.Filters.Add<ModelActionFilter>();
-                options.Filters.Add<ProjectExceptionFilter>();
-                options.Filters.Add<UnitOfWorkFilter>();
-
-                if (_configuration.GetSection("BasicSystemConfig").GetValue<bool>("OpenLoginLimit"))
-                {
-                    options.Filters.Add<LimitUserRequestAuthorization>();
-
-                }
-
-
-            })
-
-                .AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
-
-            services.AddOptions().Configure<SystemEmailSendConfig>( _configuration.GetSection("SystemEmailSendConfig"));
-            services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
-
-
-
-            //动态WebApi + UnifiedApiResultFilter  省掉控制器代码
-            services.AddDynamicWebApiSetup();
-            //AutoMapper
-            services.AddAutoMapperSetup();
-            //EF ORM  QueryWithNoLock
-            services.AddEFSetup(_configuration);
-            //Http 响应压缩
-            services.AddResponseCompressionSetup();
-            //Swagger Api 文档
-            services.AddSwaggerSetup();
-            //JWT Token 验证
-            services.AddJWTAuthSetup(_configuration);
-            // MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
-            services.AddMediatR(typeof(ConsistencyVerificationHandler).Assembly);
-            // EasyCaching 缓存
-            services.AddEasyCachingSetup();
-
-            //services.AddDistributedMemoryCache();
-
-            // hangfire  定时任务框架  有界面，更友好~
-            services.AddhangfireSetup(_configuration);
-            //  QuartZ 定时任务框架  使用了hangfire 暂时不用，后续需要可以打开，已经配好
-            services.AddQuartZSetup(_configuration);
-
-            // 保护上传文件
-            //services.AddStaticFileAuthorizationSetup();
-
-
-            ////HttpReports 暂时废弃
-            //services.AddHttpReports().AddHttpTransport();
-            //Serilog 日志可视化 LogDashboard日志
-            services.AddLogDashboardSetup();
-            //上传限制 配置
-            services.Configure<FormOptions>(options =>
-            {
-                options.MultipartBodyLengthLimit = int.MaxValue;
-                options.ValueCountLimit = int.MaxValue;
-                options.ValueLengthLimit = int.MaxValue;
-            });
-            //IP 限流 可设置白名单 或者黑名单
-            //services.AddIpPolicyRateLimitSetup(_configuration);
-            // 用户类型 策略授权
-            services.AddAuthorizationPolicySetup(_configuration);
-
-            services.AddJsonConfigSetup(_configuration);
-            //转发头设置  获取真实IP 
-            services.Configure<ForwardedHeadersOptions>(options =>
-            {
-                options.ForwardedHeaders =
-                    ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-            });
-            //Dicom影像渲染图片  跨平台
-            services.AddDicomSetup();
-
-            // 实时应用
-            services.AddSignalR();
-
-
-            services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
-
-            //services.AddSingleton<IImportResultFilter, ImportResultFilteTest>();
-
-            services.AddMemoryCache();
-
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            //本地化
-            app.UseLocalization();
-
-            app.UseForwardedHeaders();
-
-            //响应压缩
-            app.UseResponseCompression();
-
-            //app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
-
-            //不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
-            app.UseStaticFiles();
-
-
-            //LogDashboard
-            app.UseLogDashboard("/LogDashboard");
-
-            //hangfire
-            app.UseHangfireConfig(env);
-
-            ////暂时废弃
-            //app.UseHttpReports();
-
-            ////限流 中间件
-            //app.UseIpRateLimiting();
-
-
-
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                //app.UseHsts();
-            }
-            Console.WriteLine("当前环境： " + env.EnvironmentName);
-
-            //app.UseMiddleware<AuthMiddleware>();
-
-            // 特殊异常处理 比如 404 
-            app.UseStatusCodePagesWithReExecute("/Error/{0}");
-
-            SwaggerSetup.Configure(app, env);
-            
-
-
-            ////serilog 记录请求的用户信息
-            app.UseSerilogConfig(env);
-
-            app.UseRouting();
-
-            app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
-
-            app.UseIRacisHostStaticFileStore(env);
-
-
-
-            app.UseAuthentication();
-            //app.UseJwtBearerQueryString();
-            app.UseAuthorization();
-
-            ////文件伺服  必须带Token 访问
-            ////app.UseIRacisHostStaticFileStore(env);
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-
-                endpoints.MapHub<UploadHub>("/UploadHub");
-            });
-
-        }
-    }
-}

IRaCIS.Core.API/Utility/MultipartRequestHelper.cs

@@ -14,7 +14,8 @@ namespace IRaCIS.Core.API.Utility
 
             if (string.IsNullOrWhiteSpace(boundary))
             {
-                throw new InvalidDataException("Missing content-type boundary.");
+                throw new InvalidDataException(
+                    "Missing content-type boundary.");
             }
 
             if (boundary.Length > lengthLimit)

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/Hangfire/HangfireConfig.cs

@@ -1,40 +0,0 @@
-using Hangfire;
-using Hangfire.Dashboard;
-using IRaCIS.Application.Services.BackGroundJob;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-
-namespace IRaCIS.Core.API
-{
-  
-
-    public static class HangfireConfig
-    {
-
-        public static void UseHangfireConfig(this IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            app.UseHangfireDashboard("/api/hangfire", new DashboardOptions()
-            {
-                //直接访问，没有带token 获取不到用户身份信息，所以这种自定义授权暂时没法使用
-                //Authorization = new[] { new hangfireAuthorizationFilter() }
-
-                //本地请求 才能看
-                Authorization = new[] { new LocalRequestsOnlyAuthorizationFilter() }
-
-            });
-
-            #region hangfire
-            //// 延迟任务执行  1秒之后执行  有时启动没运行  换成添加到队列中
-            //BackgroundJob.Schedule<ICacheTrialStatusJob>(t => t.MemoryCacheTrialStatus(), TimeSpan.FromSeconds(1));
-            ////添加到后台任务队列，
-            //BackgroundJob.Enqueue<ICacheTrialStatusJob>(t => t.MemoryCacheTrialStatus());
-
-            //周期性任务，1天执行一次
-
-            RecurringJob.AddOrUpdate<IIRaCISCacheHangfireJob>(t => t.ProjectStartCache(), Cron.Daily);
-
-            #endregion
-
-        }
-    }
-}

IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs

@@ -0,0 +1,66 @@
+using Hangfire;
+using Hangfire.Dashboard;
+using Hangfire.Dashboard.BasicAuthorization;
+using IRaCIS.Application.Services.BackGroundJob;
+using IRaCIS.Core.API.Filter;
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+
+namespace IRaCIS.Core.API
+{
+
+
+    public static class HangfireConfig
+    {
+
+        public static void UseHangfireConfig(this IApplicationBuilder app, IWebHostEnvironment env)
+        {
+
+
+            app.UseHangfireDashboard("/back/hangfire", new DashboardOptions()
+            {
+
+
+
+                Authorization = new IDashboardAuthorizationFilter[] { /*new hangfireAuthorizationFilter(),*/
+
+                new BasicAuthAuthorizationFilter(new BasicAuthAuthorizationFilterOptions(){
+                            SslRedirect=false,
+                            RequireSsl=false,
+                            Users=new BasicAuthAuthorizationUser[]{
+                                  new BasicAuthAuthorizationUser(){
+                                      Login="admin",
+                                      PasswordClear="admin",
+
+                                  }
+                             }
+
+                      })
+                },
+
+                DashboardTitle ="后台任务管理",
+
+
+                //Authorization = new BasicAuthAuthorizationFilter[] {
+                //      new BasicAuthAuthorizationFilter(new BasicAuthAuthorizationFilterOptions(){
+                //            SslRedirect=false,
+                //            RequireSsl=false,
+                //            Users=new BasicAuthAuthorizationUser[]{
+                //                  new BasicAuthAuthorizationUser(){
+                //                      Login="admin",
+                //                      PasswordClear="test",
+
+                //                  }
+                //             }
+
+                //      })
+                //}
+
+            });
+
+
+
+        }
+    }
+}

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

@@ -12,8 +12,8 @@ namespace IRaCIS.Core.API
 
         public static void UseIRacisHostStaticFileStore(this IApplicationBuilder app, IWebHostEnvironment _hostEnvironment)
         {
-      
-           var iRaCISDataFolder = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+
+            var iRaCISDataFolder = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
             if (!Directory.Exists(iRaCISDataFolder))
             {
@@ -26,13 +26,7 @@ namespace IRaCIS.Core.API
                 RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}",
                 ServeUnknownFileTypes = true,
                 DefaultContentType = "application/octet-stream"
-
-           //     // Set up custom content types - associating file extension to MIME type
-           //var provider = new FileExtensionContentTypeProvider();
-           // // Add new mappings
-           // provider.Mappings[".myapp"] = "application/x-msdownload";
-
-        });
+            });
         }
     }
 }

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

@@ -1,14 +1,21 @@
-using IRaCIS.Core.Domain.Share;
+using Azure;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileProviders.Physical;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.VisualBasic;
+using Newtonsoft.Json;
+using SharpCompress.Common;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -21,15 +28,22 @@ namespace IRaCIS.Core.API
     {
         private readonly RequestDelegate _next;
         private readonly IWebHostEnvironment _hostingEnv;
-        private readonly StaticFileOptions _options;
         private readonly ILoggerFactory _loggerFactory;
 
-        public MultiDiskStaticFilesMiddleware(RequestDelegate next, IWebHostEnvironment hostingEnv, StaticFileOptions options, ILoggerFactory loggerFactory)
+        private string iRaCISDefaultDataFolder = string.Empty;
+
+        public MultiDiskStaticFilesMiddleware(RequestDelegate next, IWebHostEnvironment hostingEnv,  ILoggerFactory loggerFactory)
         {
             _next = next;
             _hostingEnv = hostingEnv;
-            _options = options;
             _loggerFactory = loggerFactory;
+
+            iRaCISDefaultDataFolder = FileStoreHelper.GetIRaCISRootDataFolder(_hostingEnv);
+
+            if (!Directory.Exists(iRaCISDefaultDataFolder))
+            {
+                Directory.CreateDirectory(iRaCISDefaultDataFolder);
+            }
         }
 
         public async Task Invoke(HttpContext context)
@@ -37,54 +51,145 @@ namespace IRaCIS.Core.API
             var path = context.Request.Path.Value;
             var isIRacisFile = path.StartsWith($"/{StaticData.Folder.IRaCISDataFolder}");
 
-            var isDicomFile = path.Contains($"{StaticData.Folder.DicomFolder}");
+            var isDicomFile = isIRacisFile && path.Contains($"{StaticData.Folder.DicomFolder}");
 
-            var isFind = false;
+
+
+            //先从默认里面去找
             if (isIRacisFile)
             {
 
+
+
+                #region 方式二
+
+                //var defaultFileProvider = new PhysicalFileProvider(iRaCISDefaultDataFolder);
+
+                //var staticFileOptions = new StaticFileOptions
+                //{
+                //    FileProvider = defaultFileProvider,
+                //    RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}",
+                //    ServeUnknownFileTypes = true,
+                //    DefaultContentType = "application/octet-stream"
+                //};
+
+                //var a = defaultFileProvider.GetFileInfo(context.Request.Path).Exists;
+
+                //var staticFileMiddleware = new StaticFileMiddleware(_next, _hostingEnv, Options.Create(staticFileOptions), _loggerFactory);
+                //await staticFileMiddleware.Invoke(context);
+
+                #endregion
+
+
+
+                #region 文档上传默认会加wwwroot 奇怪...
+
+                var defaultFileProvider = new PhysicalFileProvider(FileStoreHelper.GetIRaCISRootPath(_hostingEnv));
+
+                if (defaultFileProvider.GetFileInfo(path).Exists)
+                {
+
+                    var actrualPath = defaultFileProvider.GetFileInfo(path).PhysicalPath;                
+
+                    await context.Response.SendFileAsync(new PhysicalFileInfo(new FileInfo(actrualPath)));
+
+                    return;
+                }
+                #endregion
+
             }
+
+            //没找到  
+            //dicom影像，从多个文件夹尝试，因为会存在切换磁盘
             if (isDicomFile)
             {
+                var defaultRoot = Path.GetPathRoot(iRaCISDefaultDataFolder);
 
+                //除默认部署路径的其他路径
+                var disks = DriveInfo.GetDrives()
+                .Where(d => d.IsReady && d.DriveType == DriveType.Fixed)/*.Where(t => !t.Name.Contains("C") && !t.Name.Contains("c"))*/
+                .OrderBy(d => d.AvailableFreeSpace)
+                .Select(d => d.RootDirectory.FullName)
+                .ToArray().Where(t=>!t.Contains(defaultRoot));
+
+
+                foreach (var item in disks)
+                {
+                    var otherFileStoreFolder = Path.Combine(item, _hostingEnv.EnvironmentName);
+
+                    if (!Directory.Exists(otherFileStoreFolder))
+                    {
+                        continue;
+                    }
+                 
+                    var otherFileProvider= new PhysicalFileProvider(otherFileStoreFolder);
+
+                  
+
+                    if (otherFileProvider.GetFileInfo(path).Exists)
+                    {
+
+                        var actrualPath = otherFileProvider.GetFileInfo(path).PhysicalPath;
+
+                        //方式一
+                        await context.Response.SendFileAsync( new PhysicalFileInfo(new FileInfo(actrualPath)));
+
+                        #region 方式二  报错  otherFileProvider 应该还包含/{StaticData.Folder.IRaCISDataFolder} 这一层级
+                        //var otherStaticFileOptions = new StaticFileOptions
+                        //{
+                        //    FileProvider = otherFileProvider,
+                        //    RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}",
+                        //    ServeUnknownFileTypes = true,
+                        //    DefaultContentType = "application/octet-stream"
+                        //};
+                        //var staticFileMiddleware = new StaticFileMiddleware(_next, _hostingEnv, Options.Create(otherStaticFileOptions), _loggerFactory);
+                        //await staticFileMiddleware.Invoke(context);
+                        #endregion
+
+
+
+                        return;
+                    }
+                }
+
+                // 如果没有找到文件，返回404
+                context.Response.StatusCode = 404;
+                context.Response.ContentType = "application/json";
+
+                await context.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk("File not found")));
             }
-
-           
+   
 
             // 如果所有磁盘都不存在所请求的文件，则将请求传递给下一个中间件组件。
             await _next.Invoke(context);
         }
 
-        private async Task ServeFileAsync(HttpContext context, IFileInfo fileInfo)
-        {
-            var response = context.Response;
-            response.ContentType = GetContentType(fileInfo.PhysicalPath);
 
-            using (var fileStream = fileInfo.CreateReadStream())
-            {
-                await fileStream.CopyToAsync(response.Body);
-            }
-        }
 
-        private string[] GetDisks()
-        {
-            // 获取系统中所有可用的磁盘
-            return DriveInfo.GetDrives()
-                .Where(d => d.IsReady && d.DriveType == DriveType.Fixed)
-                .Select(d => d.RootDirectory.FullName)
-                .ToArray();
-        }
 
-        private static string GetContentType(string path)
-        {
-            var provider = new FileExtensionContentTypeProvider();
-            if (!provider.TryGetContentType(path, out var contentType))
-            {
-                contentType = "application/octet-stream";
-            }
 
-            return contentType;
-        }
+
+        //private static string GetContentType(string path)
+        //{
+        //    var provider = new FileExtensionContentTypeProvider();
+        //    if (!provider.TryGetContentType(path, out var contentType))
+        //    {
+        //        contentType = "application/octet-stream";
+        //    }
+
+        //    return contentType;
+        //}
+
+        //private async Task ServeFileAsync(HttpContext context, IFileInfo fileInfo)
+        //{
+        //    var response = context.Response;
+        //    response.ContentType = GetContentType(fileInfo.PhysicalPath);
+
+        //    using (var fileStream = fileInfo.CreateReadStream())
+        //    {
+        //        await fileStream.CopyToAsync(response.Body);
+        //    }
+        //}
     }
 
 

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/SerilogConfig.cs

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.API
             app.UseSerilogRequestLogging(opts
               =>
             {
-                opts.MessageTemplate = "{TokenUserRealName} {TokenUserType}  {ClientIp} {RequestIP}  {Host} {Protocol} {RequestMethod} {RequestPath} {RequestBody} responded {StatusCode} in {Elapsed:0.0000} ms";
+                opts.MessageTemplate = "{TokenUserRealName} {TokenUserTypeShortName}  {ClientIp} {LocalIP} {Host} {Protocol} {RequestMethod} {RequestPath} {RequestBody} responded {StatusCode} in {Elapsed:0.0000} ms";
                 opts.EnrichDiagnosticContext = SerilogHelper.EnrichFromRequest;
             });
 

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

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Infrastructure.Extention;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Http;
 using Serilog;
 using System;
@@ -19,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());
+            //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)
@@ -41,9 +44,9 @@ namespace IRaCIS.Core.API
             // Set the content-type of the Response at this point
             diagnosticContext.Set("ContentType", httpContext.Response.ContentType);
 
-            diagnosticContext.Set("TokenUserRealName", httpContext?.User?.FindFirst("realName")?.Value);
+            diagnosticContext.Set("TokenUserRealName", httpContext?.User?.FindFirst(JwtIRaCISClaimType.RealName)?.Value);
 
-            diagnosticContext.Set("TokenUserType", httpContext?.User?.FindFirst("userTypeEnumName")?.Value);
+            diagnosticContext.Set("TokenUserTypeShortName", httpContext?.User?.FindFirst(JwtIRaCISClaimType.UserTypeShortName)?.Value);
 
             // Retrieve the IEndpointFeature selected for the request
             var endpoint = httpContext.GetEndpoint();

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

@@ -1,6 +1,7 @@
 using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
@@ -12,9 +13,14 @@ namespace IRaCIS.Core.API
 {
     public class ApiResponseHandler : AuthenticationHandler<AuthenticationSchemeOptions>
     {
-        public ApiResponseHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
+        public IStringLocalizer _localizer;
+		public ApiResponseHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
+			IStringLocalizer localizer,
+			ILoggerFactory logger, UrlEncoder encoder) : base(options, logger, encoder)
         {
-        }
+            _localizer = localizer;
+
+		}
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         {
@@ -24,14 +30,16 @@ namespace IRaCIS.Core.API
         {
             Response.ContentType = "application/json";
             Response.StatusCode = StatusCodes.Status401Unauthorized;
-            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk("您无权访问该接口", ApiResponseCodeEnum.NoToken)));
+                //---您无权访问该接口
+            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["ApiResponse_NoAccess"], ApiResponseCodeEnum.NoToken)));
         }
 
         protected override async Task HandleForbiddenAsync(AuthenticationProperties properties)
         {
             Response.ContentType = "application/json";
             Response.StatusCode = StatusCodes.Status403Forbidden;
-            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk("您的权限不允许进行该操作",ApiResponseCodeEnum.HaveTokenNotAccess)));
+                //---您的权限不允许进行该操作
+            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["ApiResponse_Permission"],ApiResponseCodeEnum.HaveTokenNotAccess)));
         }
 
     }

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,7 +1,5 @@
 using Autofac;
-using Autofac.Extras.DynamicProxy;
 using IRaCIS.Core.Application;
-using IRaCIS.Core.Application.AOP;
 using IRaCIS.Core.Application.BackGroundJob;
 using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Http;
@@ -11,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;
@@ -31,10 +28,6 @@ namespace IRaCIS.Core.API
 
             containerBuilder.RegisterType<Repository>().As<IRepository>().InstancePerLifetimeScope();
 
-            //containerBuilder.RegisterType<Mapper>().As<IMapper>().InstancePerLifetimeScope();
-
-            //containerBuilder.RegisterGeneric(typeof(EFUnitOfWork<>))
-            //    .As(typeof(IEFUnitOfWork<>)).InstancePerLifetimeScope();//注册仓储
 
             #endregion
 
@@ -50,31 +43,21 @@ namespace IRaCIS.Core.API
             #endregion
 
 
-            //containerBuilder.RegisterType<BaseService>().As<IBaseService>().PropertiesAutowired().InstancePerLifetimeScope();
-            //containerBuilder.RegisterType<DictionaryService>().As<IDictionaryService>().InstancePerLifetimeScope();
+
 
 
 
             Assembly application = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "IRaCIS.Core.Application.dll");
             containerBuilder.RegisterAssemblyTypes(application).Where(t => t.FullName.Contains("Service"))
-                .PropertiesAutowired().AsImplementedInterfaces().EnableClassInterceptors();
-
-            //Assembly infrastructure = Assembly.Load("IRaCIS.Core.Infra.EFCore");
-            //containerBuilder.RegisterAssemblyTypes(infrastructure).AsImplementedInterfaces();
-
-            containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
-            containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
+                .PropertiesAutowired().AsImplementedInterfaces();
 
 
-            //containerBuilder.RegisterType<Dictionary>().InstancePerLifetimeScope();
-            //Autofac 注册拦截器  需要注意的是生成api上服务上的动态代理AOP失效    间接掉用不影响
-            //containerBuilder.RegisterType<TrialStatusAutofacAOP>();
-            //containerBuilder.RegisterType<UserAddAOP>();
-            //containerBuilder.RegisterType<QANoticeAOP>();
-            //containerBuilder.RegisterType<LogService>().As<ILogService>().SingleInstance();
+
+            //containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
+            //containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
 
 
-            //注册hangfire任务  依赖注入
+           //注册hangfire任务  依赖注入
             containerBuilder.RegisterType<ObtainTaskAutoCancelJob>().As<IObtainTaskAutoCancelJob>().InstancePerDependency();
 
 

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -1,27 +1,65 @@
-using IRaCIS.Core.Application.Triggers;
+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();
 
@@ -37,6 +75,7 @@ namespace IRaCIS.Core.API
                     triggerOptions.AddTrigger<AddSubjectTrigger>();
                     triggerOptions.AddTrigger<ChallengeStateTrigger>();
                     triggerOptions.AddTrigger<SubjectStateTrigger>();
+                    triggerOptions.AddTrigger<AddCRCCliniaclDataTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitCheckPassedTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitFinalVisitTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitTrigger>();
@@ -44,8 +83,11 @@ namespace IRaCIS.Core.API
                     triggerOptions.AddTrigger<TableQuestionRowTrigger>();
                     //triggerOptions.AddTrigger<AddlTrialUserTrigger>();
                     triggerOptions.AddTrigger<VisitTaskIsFrontTaskNeedSignButNotSignTrigger>();
+                    triggerOptions.AddTrigger<VisitTaskIbeforeTrigger>();
+
+                    triggerOptions.AddTrigger<UserLogTrigger>();
+
 
-                    
 
 
 
@@ -54,6 +96,19 @@ 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 =>
+            {
+                //var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
+
+                return new SqlDistributedSynchronizationProvider(configuration.GetSection("ConnectionStrings:RemoteNew").Value);
+            });
 
             //services.AddAssemblyTriggers(typeof(SubjectVisitImageDateTrigger).Assembly);
         }

IRaCIS.Core.API/_ServiceExtensions/EasyCachingSetup.cs

@@ -1,18 +1,24 @@
-using EasyCaching.Core;
-using EasyCaching.Interceptor.Castle;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace IRaCIS.Core.API
 {
-    public  static class EasyCachingSetup
+    public static class EasyCachingSetup
     {
-        public static void AddEasyCachingSetup(this IServiceCollection services)
+        public static void AddEasyCachingSetup(this IServiceCollection services, IConfiguration configuration)
         {
-            services.AddEasyCaching(options =>
-            {
-                options.UseInMemory();
-            });
-            services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultInMemoryName);
+            //services.AddEasyCaching(options =>
+            //{
+            //    options.UseInMemory();
+
+            //    //options.UseRedis(configuration, EasyCachingConstValue.DefaultRedisName).WithMessagePack(EasyCachingConstValue.DefaultRedisName); 
+
+
+            //});
+
+            ////services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultRedisName);
+
+            //services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultInMemoryName);
         }
     }
 }

IRaCIS.Core.API/_ServiceExtensions/MiniProfilerConfigure.cs

@@ -1,81 +0,0 @@
-//using System;
-//using Microsoft.Extensions.DependencyInjection;
-//using StackExchange.Profiling.Storage;
-
-//namespace IRaCIS.Core.API
-//{
-//    public class MiniProfilerConfigure
-//    {
-//        public static void ConfigureMiniProfiler(IServiceCollection services)
-//        {
-
-//            services.AddMiniProfiler(options =>
-//            {
-//                // All of this is optional. You can simply call .AddMiniProfiler() for all defaults
-
-//                // (Optional) Path to use for profiler URLs, default is /mini-profiler-resources
-//                options.RouteBasePath = "/profiler";
-
-//                //// (Optional) Control storage
-//                //// (default is 30 minutes in MemoryCacheStorage)
-//                (options.Storage as MemoryCacheStorage).CacheDuration = TimeSpan.FromMinutes(10);
-
-//                //// (Optional) Control which SQL formatter to use, InlineFormatter is the default
-//                //options.SqlFormatter = new StackExchange.Profiling.SqlFormatters.InlineFormatter();
-
-//                //// (Optional) To control authorization, you can use the Func<HttpRequest, bool> options:
-//                //// (default is everyone can access profilers)
-//                //options.ResultsAuthorize = request => MyGetUserFunction(request).CanSeeMiniProfiler;
-//                //options.ResultsListAuthorize = request => MyGetUserFunction(request).CanSeeMiniProfiler;
-//                //// Or, there are async versions available:
-//                //options.ResultsAuthorizeAsync = async request => (await MyGetUserFunctionAsync(request)).CanSeeMiniProfiler;
-//                //options.ResultsAuthorizeListAsync = async request => (await MyGetUserFunctionAsync(request)).CanSeeMiniProfilerLists;
-
-//                //// (Optional)  To control which requests are profiled, use the Func<HttpRequest, bool> option:
-//                //// (default is everything should be profiled)
-//                //options.ShouldProfile = request => MyShouldThisBeProfiledFunction(request);
-
-//                //// (Optional) Profiles are stored under a user ID, function to get it:
-//                //// (default is null, since above methods don't use it by default)
-//                //options.UserIdProvider = request => MyGetUserIdFunction(request);
-
-//                //// (Optional) Swap out the entire profiler provider, if you want
-//                //// (default handles async and works fine for almost all applications)
-//                //options.ProfilerProvider = new MyProfilerProvider();
-
-//                //// (Optional) You can disable "Connection Open()", "Connection Close()" (and async variant) tracking.
-//                //// (defaults to true, and connection opening/closing is tracked)
-//                //options.TrackConnectionOpenClose = true;
-
-//                //// (Optional) Use something other than the "light" color scheme.
-//                //// (defaults to "light")
-//                //options.ColorScheme = StackExchange.Profiling.ColorScheme.Auto;
-
-//                //// The below are newer options, available in .NET Core 3.0 and above:
-
-//                //// (Optional) You can disable MVC filter profiling
-//                //// (defaults to true, and filters are profiled)
-//                //options.EnableMvcFilterProfiling = true;
-//                //// ...or only save filters that take over a certain millisecond duration (including their children)
-//                //// (defaults to null, and all filters are profiled)
-//                //// options.MvcFilterMinimumSaveMs = 1.0m;
-
-//                //// (Optional) You can disable MVC view profiling
-//                //// (defaults to true, and views are profiled)
-//                //options.EnableMvcViewProfiling = true;
-//                //// ...or only save views that take over a certain millisecond duration (including their children)
-//                //// (defaults to null, and all views are profiled)
-//                //// options.MvcViewMinimumSaveMs = 1.0m;
-
-//                //// (Optional) listen to any errors that occur within MiniProfiler itself
-//                //// options.OnInternalError = e => MyExceptionLogger(e);
-
-//                //// (Optional - not recommended) You can enable a heavy debug mode with stacks and tooltips when using memory storage
-//                //// It has a lot of overhead vs. normal profiling and should only be used with that in mind
-//                //// (defaults to false, debug/heavy mode is off)
-//                ////options.EnableDebugMode = true;
-//            });
-//            //.AddEntityFramework();
-//        }
-//    }
-//}

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/NullToEmptyStringValueProvider.cs

@@ -28,7 +28,7 @@ namespace IRaCIS.Core.API
             if(_MemberInfo.PropertyType == typeof(string))
             {
                 //去掉前后空格
-                _MemberInfo.SetValue(target, value==null?string.Empty: value.ToString()==string.Empty? value:value.ToString().Trim());
+                _MemberInfo.SetValue(target, value==null?string.Empty: value.ToString()==string.Empty? value:value/*.ToString().Trim()*/);
               
             }
             else

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

@@ -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/QuartZSetup.cs

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

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;
 
@@ -19,31 +19,33 @@ namespace IRaCIS.Core.API
                     // 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)
+                   .MinimumLevel.Override("System.Net.Http.HttpClient.HttpReports", LogEventLevel.Warning)                  
                    .Enrich.WithClientIp()
-                   .Enrich.WithClientAgent()
                    .Enrich.FromLogContext()
-                   
+                   .Filter.ByExcluding(logEvent =>logEvent.Properties.ContainsKey("RequestPath") && logEvent.Properties["RequestPath"].ToString().Contains("/health"))
+
                    //控制台 方便调试 问题   我们显示记录日志 时 获取上下文的ip 和用户名 用户类型
                    .WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Warning,
-                outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3} ] {LocalIP} {ClientIp}  {TokenUserRealName} {TokenUserType} {Message:lj} {Properties:j}{NewLine} {Exception}")
+                                    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} || {SourceContext:l} ||  {Message} ||{Exception}  ||end {NewLine}");
+                                    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会默认创建一些列。                
 
-            if (environment == "Production")
-            {
-                config.WriteTo.Email(new EmailConnectionInfo()
-                {
-                    EmailSubject = "系统警告,请速速查看!",//邮件标题
-                    FromEmail = "iracis_grr@163.com",//发件人邮箱
-                    MailServer = "smtp.163.com",//smtp服务器地址
-                    NetworkCredentials = new NetworkCredential("iracis_grr@163.com", "XLWVQKZAEKLDWOAH"),//两个参数分别是发件人邮箱与客户端授权码
-                    Port = 25,//端口号
-                    ToEmail = "872297557@qq.com"//收件人
-                }, restrictedToMinimumLevel: LogEventLevel.Error,
-                outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff}  [ {Level} {ClientIp} {ClientAgent}  {TokenUserRealName} {TokenUserType} ] || [path: {RequestPath}  arguments: {RequestBody}] {SourceContext:l}  || {Message} || {Exception} ||end {NewLine})");
-            }
+            //if (environment == "Production")
+            //{
+            //    config.WriteTo.Email(new EmailConnectionInfo()
+            //    {
+            //        EmailSubject = "系统警告,请速速查看!",//邮件标题
+            //        FromEmail = "test@extimaging.com",//发件人邮箱
+            //        MailServer = "smtp.qiye.aliyun.com",//smtp服务器地址
+            //        NetworkCredentials = new NetworkCredential("test@extimaging.com", "SHzyyl2021"),//两个参数分别是发件人邮箱与客户端授权码
+            //        Port = 465,//端口号
+            //        ToEmail = "872297557@qq.com"//收件人
+            //    }, restrictedToMinimumLevel: LogEventLevel.Error,
+            //    outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff}  [ {Level} {ClientIp} {ClientAgent}  {TokenUserRealName} {TokenUserType} ] || [path: {RequestPath}  arguments: {RequestBody}] {SourceContext:l}  || {Message} || {Exception} ||end {NewLine})");
+            //}
 
             //扩展方法 获取上下文的ip 用户名 用户类型
             Log.Logger = config.Enrich.WithHttpContextInfo(serviceProvider).CreateLogger();

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

@@ -1,55 +0,0 @@
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace IRaCIS.Core.API
-{
-    public class JsonPatchDocumentFilter : IDocumentFilter
-    {
-        public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-        {
-            var schemas = swaggerDoc.Components.Schemas.ToList();
-            foreach (var item in schemas)
-            {
-                if (item.Key.StartsWith("Operation") || item.Key.StartsWith("JsonPatchDocument"))
-                    swaggerDoc.Components.Schemas.Remove(item.Key);
-            }
-
-            swaggerDoc.Components.Schemas.Add("Operation", new OpenApiSchema
-            {
-                Type = "object",
-                Properties = new Dictionary<string, OpenApiSchema>
-                {
-                    { "op", new OpenApiSchema { Type = "string" } },
-                    {"value", new OpenApiSchema{ Type = "object", Nullable = true } },
-                    { "path", new OpenApiSchema { Type = "string" } }
-                }
-            });
-
-            swaggerDoc.Components.Schemas.Add("JsonPatchDocument", new OpenApiSchema
-            {
-                Type = "array",
-                Items = new OpenApiSchema
-                {
-                    Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = "Operation" }
-                },
-                Description = "Array of operations to perform"
-            });
-
-            foreach (var path in swaggerDoc.Paths.SelectMany(p => p.Value.Operations)
-                .Where(p => p.Key == Microsoft.OpenApi.Models.OperationType.Patch))
-            {
-                foreach (var item in path.Value.RequestBody.Content.Where(c => c.Key != "application/json-patch+json"))
-                    path.Value.RequestBody.Content.Remove(item.Key);
-
-                var response = path.Value.RequestBody.Content.SingleOrDefault(c => c.Key == "application/json-patch+json");
-
-                response.Value.Schema = new OpenApiSchema
-                {
-                    Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = "JsonPatchDocument" }
-                };
-            }
-        }
-    }
-}

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

@@ -18,7 +18,6 @@ namespace IRaCIS.Core.API
     {
         public static void AddSwaggerSetup(this IServiceCollection services)
         {
-            services.AddSwaggerExamplesFromAssemblyOf<JsonPatchUserRequestExample>();
 
             services.AddSwaggerGen(options =>
             {
@@ -63,7 +62,6 @@ namespace IRaCIS.Core.API
                 // 在header中添加token，传递到后台
                 options.OperationFilter<SecurityRequirementsOperationFilter>();
 
-                options.DocumentFilter<JsonPatchDocumentFilter>();
 
                 // 添加登录按钮
                 options.AddSecurityDefinition("bearerAuth", new OpenApiSecurityScheme()

IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs

@@ -1,13 +1,13 @@
 using Hangfire;
 using Hangfire.SqlServer;
-using Hangfire.Tags.SqlServer;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Runtime.InteropServices;
 
 namespace IRaCIS.Core.API
 {
-    public  static class hangfireSetup
+    public static class hangfireSetup
     {
         public static void AddhangfireSetup(this IServiceCollection services, IConfiguration configuration)
         {
@@ -15,24 +15,39 @@ namespace IRaCIS.Core.API
 
             services.AddHangfire(hangFireConfig =>
             {
-                //指定存储介质
-                hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()
+                //本地window 调试 使用内存，服务器部署使用数据库，防止服务器任务调度到本地
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    SchemaName = "hangfire",
-                    CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
-                    SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
-                    QueuePollInterval = TimeSpan.Zero,
-                    UseRecommendedIsolationLevel = true,
-                    UsePageLocksOnDequeue = true,
-                    DisableGlobalLocks = true
-                });
+                    hangFireConfig.UseInMemoryStorage();
 
-                hangFireConfig.UseTagsWithSql(); //nuget引入Hangfire.Tags.SqlServer
+                }
+                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();
 
             });
 
-            services.AddHangfireServer();
+            services.AddHangfireServer(option =>
+            {
+                option.Queues = new[] { "immediately_once", "default", "sys_init", "not_immediately_once" };
+            });
 
         }
     }

IRaCIS.Core.API/appsettings.CertificateApply.json

@@ -1,33 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Certificate;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
-
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

IRaCIS.Core.API/appsettings.Development.json

@@ -1,33 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
-
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -0,0 +1,70 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=47.117.164.182,1434;Database=Event_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=47.117.164.182,1434;Database=Event_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-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"
+    }
+  },
+
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": true,
+
+    "OpenSignDocumentBeforeWork": true,
+
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
+  },
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "uat@extimaging.com",
+    "FromName": "UAT_IRC",
+    "AuthorizationCode": "SHzyyl2021",
+    "SiteUrl": "http://irc.event.extimaging.com/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
+  }
+
+
+}

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -0,0 +1,77 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "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=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",
+      "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"
+    }
+  },
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": true,
+
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
+
+    "AutoLoginOutMinutes": 360,
+
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "IRC@extimaging.com",
+    "FromName": "IRC",
+    "AuthorizationCode": "ExtImg@2022",
+    "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.Production.json

@@ -1,39 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  //"RootUrl": "http://123.56.181.144:8060/",
-  "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.193.237,1433;Database=IRaCIS.Production;User ID=sa;Password=zhanying2021;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.193.237,1433;Database=Hangfire.IRaCIS.Production;User ID=sa;Password=zhanying2021;TrustServerCertificate=true"
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true
-  },
-  //"SystemEmailSendConfig": {
-  //  "Port": 465,
-  //  "Host": "smtp.163.com",
-  //  "FromEmail": "zhou941003@qq.com",
-  //  "FromName": "hangZhou",
-  //  "AuthorizationCode": "sqfhlpfdvnexbcab"
-  //}
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "IRC@extimaging.com",
-    "FromName": "IRC",
-    "AuthorizationCode": "ExtImg@2022"
-  }
-
-
-}

IRaCIS.Core.API/appsettings.Staging.json

@@ -1,31 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Verify;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true
-
-  },
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "uat@extimaging.com",
-    "FromName": "UAT_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-
-}

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -0,0 +1,98 @@
+{
+  "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": "AliyunOSS",
+
+    "AliyunOSS": {
+      "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": "hir-oss.test.extimaging.com",
+      "Port": "443",
+      "UseSSL": true,
+      "AccessKey": "fbStsVYCIPKHQneeqMwD",
+      "SecretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      "BucketName": "irc-test",
+      "ViewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
+    },
+    "AWS": {
+      "Region": "us-east-1",
+      "EndPoint": "s3.us-east-1.amazonaws.com",
+      "UseSSL": true,
+      "RoleArn": "arn:aws:iam::471112624751:role/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
+    }
+  },
+
+  "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.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.USDemo.json

@@ -1,33 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=47.90.161.85,1433\\MSSQLSERVER;Database=IRaCIS_Demo_US;User ID=sa;Password=zhanying2021;TrustServerCertificate=true",
-    "Hangfire": "Server=47.90.161.85,1433\\MSSQLSERVER;Database=Hangfire.IRaCIS_Demo_US;User ID=sa;Password=zhanying2021;TrustServerCertificate=true"
-
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

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

@@ -0,0 +1,85 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "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"
+  },
+  "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"
+    },
+
+    "MinIO": {
+      "endPoint": "hir-oss.uat.extimaging.com",
+      "port": "80",
+      "useSSL": false,
+      "viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
+      //"port": "443",
+      //"useSSL": true,
+      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
+      "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
+      "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
+      "bucketName": "irc-uat"
+
+    }
+  },
+
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": true,
+
+    "OpenSignDocumentBeforeWork": true,
+
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60,
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90
+
+  },
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "uat@extimaging.com",
+    "FromName": "UAT_IRC",
+    "AuthorizationCode": "SHzyyl2021",
+    "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,8 +1,8 @@
 {
   "JwtSetting": {
-    "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f",
-    "Issuer": "IRaCIS",
-    "Audience": "ZhiZhun",
+    "SecurityKey": "ShangHaiZhanYing_SecurityKey_SHzyyl@2021",
+    "Issuer": "Extimaging",
+    "Audience": "EICS",
     "TokenExpireDays": "7"
   },
   "IpRateLimiting": {
@@ -55,11 +55,32 @@
         "EnableReadDeepClone": true,
         "EnableWriteDeepClone": false
       }
+    },
+    "redis": {
+      "MaxRdSecond": 120,
+      "EnableLogging": false,
+      "LockMs": 5000,
+      "SleepMs": 300,
+      "dbconfig": {
+        "Password": "xc@123456",
+        "IsSsl": false,
+        "SslHost": null,
+        "ConnectionTimeout": 5000,
+        "AllowAdmin": true,
+        "Endpoints": [
+          {
+            "Host": "47.117.164.182",
+            "Port": 6379
+          }
+        ],
+        "Database": 0
+      }
     }
   },
-  "UpdateConfig": {
-    "test": "123456",
-    "test1": "12345678"
+  "IRaCISImageStore": {
+    "SwitchingMode": "RemainingDiskCapacity",
+    "SwitchingRatio": 80,
+    "NotificationEmail": "872297557@qq.com"
   },
   "IRaCISBasicConfig": {
     "DoctorCodePrefix": "RE",
@@ -69,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>
@@ -31,8 +31,8 @@
 
 
             <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;">上海展影医疗科技有限公司</div>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

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

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear  {0} ,
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation} has created an account for you. The account information is as follows:
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>              
+                <div>
+                    User ID: {1}
+                </div>
+                <div>
+                    Role: {2}
+                </div>
+                <div>
+                    Before logging in for the first time, please modify the account information through this link：
+                    <a href='{3}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    Initialize account information
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

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;'>
@@ -28,8 +28,8 @@
 
 
             <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;">上海展影医疗科技有限公司</div>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

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

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0} ,
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation} has reset your account password, and the account information is as follows:
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    User ID: {1}
+                </div>
+                <div>
+                    Role: {2}
+                </div>
+                <div>
+                    Password: {3}
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

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

@@ -18,8 +18,8 @@
             </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;">上海展影医疗科技有限公司</div>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

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

@@ -8,20 +8,20 @@
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
             <div style='line-height: 40px;font-size: 18px'>
-               您好：
+                Dear：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                感谢您使用展影云平台。
+                Thank you for using {company abbreviation} Cloud System.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 {0}。
             </div>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>
 </body>
-</html>
+</html>

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

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

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0},
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1} , {2}).
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                Your account information is as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {3}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {1}
+                </div>
+                <div>
+                    User ID: {4}
+                </div>
+                <div>
+                    Role: {5}
+                </div>
+                <div>
+                    Login URL: 
+					<a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        Click to login
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

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>
@@ -43,8 +43,8 @@
 
 
             <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;">上海展影医疗科技有限公司</div>
+                <div>祝您顺利！</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

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

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear {0},
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                Your account information is  as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {3}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {1}
+                </div>
+                <div>
+                    User ID: {4}
+                </div>
+                <div>
+                    Role: {5}
+                </div>
+                <div>
+                    Before logging in for the first time, please modify the account information through this link：
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                     Initialize account information
+                    </a>
+                </div>
+            </div>
+
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

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

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

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta charset='UTF-8'>
+    <title>Title</title>
+</head>
+<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6'>
+        <div style='padding-top: 20px;'>
+            <div style='line-height: 40px;font-size: 18px'>
+                Dear  {0} ,
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+                The site survey form you filled in has been rejected. The details are as follows：
+            </div>
+            <span style="color: #00D1B2"></span>
+            <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
+                <div>
+                    Trial ID: {1}
+                </div>
+                <div>
+                    Protocol ID: {2}
+                </div>
+                <div>
+                    Study Name: {3}
+                </div>
+                <div>
+                    Site ID: {4}
+                </div>
+                <div>
+                    Site name: {5}
+                </div>
+                <div>
+                    Reason for rejection: {6}
+                </div>
+
+            </div>
+            <a href='{7}' style='margin-left:60px;font-size:14px;padding: 10px;text-decoration: none;display:{8} ;height: 40px;width: 140px;background: #00D1B2;color:#fff;border-radius: 5px;line-height: 40px;text-align: center;margin-bottom: 100px;'>
+                Login and view
+            </a>
+
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 14px;">{company}</div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>