From 541d2ab34cce62be319cbdcd5d89953fcb0960e4 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 27 May 2022 17:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Controllers/DownLoadController.cs             | 4 +++-
 IRaCIS.Core.API/Startup.cs                                    | 4 +++-
 .../_ServiceExtensions/Authorization/JWTAuthSetup.cs          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.API/Controllers/DownLoadController.cs b/IRaCIS.Core.API/Controllers/DownLoadController.cs
index cb12affde..218d24ea6 100644
--- a/IRaCIS.Core.API/Controllers/DownLoadController.cs
+++ b/IRaCIS.Core.API/Controllers/DownLoadController.cs
@@ -16,6 +16,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.EntityFrameworkCore;
+using IRaCIS.Core.Application.Helper;
 
 namespace IRaCIS.Core.API.Controllers
 {
@@ -71,7 +72,8 @@ namespace IRaCIS.Core.API.Controllers
                 throw new Exception("当前code 没要找到对应的文件");
             }
 
-            var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName;
+            var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+
 
             var filePath = Path.Combine(rootPath, doc.Path.Trim('/'));
 
diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs
index 7c8db9ca1..102969299 100644
--- a/IRaCIS.Core.API/Startup.cs
+++ b/IRaCIS.Core.API/Startup.cs
@@ -159,6 +159,8 @@ namespace IRaCIS.Core.API
             //����Ҫ token ���ʵľ�̬�ļ�  wwwroot css, JavaScript, and images don't require authentication.
             app.UseStaticFiles();
 
+            app.UseIRacisHostStaticFileStore(env);
+
             //LogDashboard
             app.UseLogDashboard("/LogDashboard");
 
@@ -203,7 +205,7 @@ namespace IRaCIS.Core.API
             app.UseAuthorization();
 
             //�ļ��ŷ�  �����Token ����
-            app.UseIRacisHostStaticFileStore(env);
+            //app.UseIRacisHostStaticFileStore(env);
 
             app.UseEndpoints(endpoints =>
             {
diff --git a/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs
index 12bcc9e1f..1b7984ebb 100644
--- a/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs
+++ b/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs
@@ -61,7 +61,7 @@ namespace IRaCIS.Core.API
                          
                            //仅仅是访问文件的时候才会去取token认证  前端对cookie设置了有效期
 
-                           if (context.Request.Path.ToString().Contains("IRaCISData")|| context.Request.Path.ToString().Contains("SystemData") )
+                           if (context.Request.Path.ToString().Contains("IRaCISData") || context.Request.Path.ToString().Contains("SystemData") )
                            {
                                var cookieToken = context.Request.Cookies["access_token"];