diff --git a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs index 513c47b73..a6c61ef22 100644 --- a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs +++ b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs @@ -1,4 +1,5 @@ -using IRaCIS.Core.Domain.Share; +using IRaCIS.Core.Application.Helper; +using IRaCIS.Core.Domain.Share; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.FileProviders; @@ -9,10 +10,10 @@ namespace IRaCIS.Core.API public static class IRacisHostFileStore { - public static void UseIRacisHostStaticFileStore(this IApplicationBuilder app, IWebHostEnvironment env) + public static void UseIRacisHostStaticFileStore(this IApplicationBuilder app, IWebHostEnvironment _hostEnvironment) { - - var iRaCISDataFolder = Path.Combine(Directory.GetParent(env.ContentRootPath.TrimEnd('\\')).FullName, StaticData.IRaCISDataFolder); + + var iRaCISDataFolder = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); if (!Directory.Exists(iRaCISDataFolder)) { @@ -30,10 +31,10 @@ namespace IRaCIS.Core.API #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 uploadPath = Path.Combine(Directory.GetParent(_hostEnvironment.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); + //var systemDataFolder = Path.Combine(Directory.GetParent(env.ContentRootPath.TrimEnd('\\')).FullName, StaticData.SystemDataFolder); if (!Directory.Exists(uploadPath)) @@ -41,34 +42,34 @@ namespace IRaCIS.Core.API Directory.CreateDirectory(uploadPath); } - if (!Directory.Exists(dicomPath)) - { - Directory.CreateDirectory(dicomPath); - } + //if (!Directory.Exists(dicomPath)) + //{ + // Directory.CreateDirectory(dicomPath); + //} - if (!Directory.Exists(systemDataFolder)) - { - Directory.CreateDirectory(systemDataFolder); - } + //if (!Directory.Exists(systemDataFolder)) + //{ + // Directory.CreateDirectory(systemDataFolder); + //} - app.UseStaticFiles(new StaticFileOptions - { - FileProvider = new PhysicalFileProvider(uploadPath), - RequestPath = $"/{StaticData.UploadFileFolder}" - }); + //app.UseStaticFiles(new StaticFileOptions + //{ + // FileProvider = new PhysicalFileProvider(uploadPath), + // RequestPath = $"/{StaticData.UploadFileFolder}" + //}); - app.UseStaticFiles(new StaticFileOptions - { - FileProvider = new PhysicalFileProvider(dicomPath), - RequestPath = $"/{StaticData.TrialDataFolder}" - }); + //app.UseStaticFiles(new StaticFileOptions + //{ + // FileProvider = new PhysicalFileProvider(dicomPath), + // RequestPath = $"/{StaticData.TrialDataFolder}" + //}); - app.UseStaticFiles(new StaticFileOptions - { - FileProvider = new PhysicalFileProvider(systemDataFolder), - RequestPath = $"/{StaticData.SystemDataFolder}" - }); + //app.UseStaticFiles(new StaticFileOptions + //{ + // FileProvider = new PhysicalFileProvider(systemDataFolder), + // RequestPath = $"/{StaticData.SystemDataFolder}" + //}); #region 兼容之前的文档能查看