diff --git a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs index 06133e9f9..513c47b73 100644 --- a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs +++ b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs @@ -12,12 +12,30 @@ namespace IRaCIS.Core.API public static void UseIRacisHostStaticFileStore(this IApplicationBuilder app, IWebHostEnvironment env) { + var iRaCISDataFolder = Path.Combine(Directory.GetParent(env.ContentRootPath.TrimEnd('\\')).FullName, StaticData.IRaCISDataFolder); + + if (!Directory.Exists(iRaCISDataFolder)) + { + Directory.CreateDirectory(iRaCISDataFolder); + } + + app.UseStaticFiles(new StaticFileOptions + { + FileProvider = new PhysicalFileProvider(iRaCISDataFolder), + RequestPath = $"/{StaticData.IRaCISDataFolder}" + }); + + + + #region 后期废弃 + + var uploadPath = Path.Combine(Directory.GetParent(env.ContentRootPath.TrimEnd('\\')).FullName, StaticData.UploadFileFolder); var dicomPath = Path.Combine(Directory.GetParent(env.ContentRootPath.TrimEnd('\\')).FullName, StaticData.TrialDataFolder); var systemDataFolder = Path.Combine(Directory.GetParent(env.ContentRootPath.TrimEnd('\\')).FullName, StaticData.SystemDataFolder); - + if (!Directory.Exists(uploadPath)) { Directory.CreateDirectory(uploadPath); @@ -32,7 +50,7 @@ namespace IRaCIS.Core.API { Directory.CreateDirectory(systemDataFolder); } - + app.UseStaticFiles(new StaticFileOptions { FileProvider = new PhysicalFileProvider(uploadPath), @@ -70,6 +88,9 @@ namespace IRaCIS.Core.API //}); #endregion + #endregion + + diff --git a/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs index 91424eea5..8b4d713ca 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs @@ -60,16 +60,19 @@ namespace IRaCIS.Core.API return Task.CompletedTask; } - var cookieToken = context.Request.Cookies["access_token"]; + //仅仅是访问文件的时候才会去取token认证 前端对cookie设置了有效期 - if (!String.IsNullOrWhiteSpace(cookieToken)) + if (!context.Request.Path.ToString().Contains("IRaCISData")) { - context.Token = cookieToken; + var cookieToken = context.Request.Cookies["access_token"]; - return Task.CompletedTask; + if (!String.IsNullOrWhiteSpace(cookieToken)) + { + context.Token = cookieToken; + } } - return Task.CompletedTask; + } }; diff --git a/IRaCIS.Core.Domain.Share/_StaticData.cs b/IRaCIS.Core.Domain.Share/_StaticData.cs index f7fac6678..bb37225b4 100644 --- a/IRaCIS.Core.Domain.Share/_StaticData.cs +++ b/IRaCIS.Core.Domain.Share/_StaticData.cs @@ -33,7 +33,11 @@ public static readonly string NoticeAttachment = "NoticeAttachment"; public static readonly string UploadEDCData = "UploadEDCData"; - + + + + public static readonly string IRaCISDataFolder = "IRaCISData"; + public static readonly string DicomFolder = "Dicom";