Преглед изворни кода

1、升级Furion v4.2.0 2、修复Nginx转发真实IP获取

zuohuaijun пре 3 година
родитељ
комит
c4e37aebe0

+ 5 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -25,17 +25,17 @@
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
     <PackageReference Include="Caching.CSRedis" Version="3.8.3" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.1.14" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.1.14" />
-    <PackageReference Include="Furion.Pure" Version="4.1.14" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.2.0" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.2.0" />
+    <PackageReference Include="Furion.Pure" Version="4.2.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
     <PackageReference Include="NETCore.MailKit" Version="2.1.0" />
-    <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.6" />
+    <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.7" />
     <PackageReference Include="QuestPDF" Version="2022.6.3" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.16.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.11.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.1" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.2.1" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.19" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 7 - 0
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -3727,6 +3727,13 @@
             <param name="dataScopeType"></param>
             <returns></returns>
         </member>
+        <member name="M:Admin.NET.Core.Service.SysCacheService.DelByParentKeyAsync(System.String)">
+            <summary>
+             根据父键清空
+            </summary>
+            <param name="key"></param>
+            <returns></returns>
+        </member>
         <member name="T:Admin.NET.Core.Service.CodeGenConfigService">
             <summary>
             代码生成详细配置服务

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Cache/ISysCacheService.cs

@@ -37,6 +37,6 @@ public interface ISysCacheService
     Task<int?> GetMaxDataScopeType(long userId);
 
     Task SetMaxDataScopeType(long userId, int dataScopeType);
-    
+
     Task DelByParentKeyAsync(string key);
 }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

@@ -302,7 +302,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     }
 
     /// <summary>
-    ///  根据父键清空   
+    ///  根据父键清空
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>

+ 1 - 1
Admin.NET/Admin.NET.UnitTest/Admin.NET.UnitTest.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Pure.Xunit" Version="4.1.14" />
+    <PackageReference Include="Furion.Pure.Xunit" Version="4.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="xunit" Version="2.4.2" />

+ 9 - 0
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -5,6 +5,7 @@ using Furion.SpecificationDocument;
 using IGeekFan.AspNetCore.Knife4jUI;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -51,6 +52,12 @@ public class Startup : AppStartup
             })
             .AddInjectWithUnifyResult<AdminResultProvider>();
 
+        // Nginx转发实际IP
+        services.Configure<ForwardedHeadersOptions>(options =>
+        {
+            options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+        });
+
         // 限流服务
         services.AddInMemoryRateLimiting();
         services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
@@ -158,10 +165,12 @@ public class Startup : AppStartup
         if (env.IsDevelopment())
         {
             app.UseDeveloperExceptionPage();
+            app.UseForwardedHeaders();
         }
         else
         {
             app.UseExceptionHandler("/Home/Error");
+            app.UseForwardedHeaders();
             app.UseHsts();
         }