From 8a1970bb3db45c531b4c8c93a949cfdba179c816 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 3 Nov 2023 12:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE=E5=BD=B1?=
 =?UTF-8?q?=E5=83=8F=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Properties/launchSettings.json       |  2 +-
 IRaCIS.Core.API/Startup.cs                           | 11 ++++-------
 .../IRacisHostFile/MultiDiskStaticFilesMiddleware.cs | 12 +++++++++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json
index aed031839..9016eb3ac 100644
--- a/IRaCIS.Core.API/Properties/launchSettings.json
+++ b/IRaCIS.Core.API/Properties/launchSettings.json
@@ -36,7 +36,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Staging"
       },
-      "applicationUrl": "http://localhost:6200"
+      "applicationUrl": "http://localhost:6100"
     },
     "IRaCIS.Production": {
       "commandName": "Project",
diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs
index 21772cf98..dcd24c696 100644
--- a/IRaCIS.Core.API/Startup.cs
+++ b/IRaCIS.Core.API/Startup.cs
@@ -179,6 +179,7 @@ namespace IRaCIS.Core.API
             //²»ÐèÒª token ·ÃÎʵľ²Ì¬Îļþ  wwwroot css, JavaScript, and images don't require authentication.
             app.UseStaticFiles();
 
+            app.UseMiddleware<MultiDiskStaticFilesMiddleware>();
 
             //LogDashboard
             app.UseLogDashboard("/LogDashboard");
@@ -186,8 +187,7 @@ namespace IRaCIS.Core.API
             //hangfire
             app.UseHangfireConfig(env);
 
-            ////ÔÝʱ·ÏÆú
-            //app.UseHttpReports();
+
 
             ////ÏÞÁ÷ Öмä¼þ
             //app.UseIpRateLimiting();
@@ -204,7 +204,6 @@ namespace IRaCIS.Core.API
             }
             Console.WriteLine("µ±Ç°»·¾³£º " + env.EnvironmentName);
 
-            //app.UseMiddleware<AuthMiddleware>();
 
             // ÌØÊâÒì³£´¦Àí ±ÈÈç 404 
             app.UseStatusCodePagesWithReExecute("/Error/{0}");
@@ -221,15 +220,13 @@ namespace IRaCIS.Core.API
             app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
 
             //app.UseIRacisHostStaticFileStore(env);
-            app.UseMiddleware<MultiDiskStaticFilesMiddleware>();
+
+
 
 
             app.UseAuthentication();
-            //app.UseJwtBearerQueryString();
             app.UseAuthorization();
 
-            ////ÎļþËÅ·þ  ±ØÐë´øToken ·ÃÎÊ
-            ////app.UseIRacisHostStaticFileStore(env);
 
             app.UseEndpoints(endpoints =>
             {
diff --git a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs
index e8137fbd8..681419848 100644
--- a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs
+++ b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs
@@ -1,8 +1,11 @@
-using IRaCIS.Core.Application.Helper;
+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;
@@ -11,6 +14,7 @@ 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;
@@ -147,6 +151,12 @@ namespace IRaCIS.Core.API
                         return;
                     }
                 }
+
+                // 如果没有找到文件，返回404
+                context.Response.StatusCode = 404;
+                context.Response.ContentType = "application/json";
+
+                await context.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk("File not found")));
             }