* 升级 Furion 至最新版

* 调整 Program.cs 未最新版 Serve.Run()
* 提取项目配置选项注册到独立文件
* 修正单文件发布在 .NET 6.0.6 版本异常

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,15 +20,15 @@
 
   <ItemGroup>
     <PackageReference Include="Caching.CSRedis" Version="3.8.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.6.2" />
-    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.6.2" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.6.2" />
-    <PackageReference Include="Furion.Pure" Version="3.6.2" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.6.5" />
+    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.6.5" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.6.5" />
+    <PackageReference Include="Furion.Pure" Version="3.6.5" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.5" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.14.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.15.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.10.0" />
     <PackageReference Include="SqlSugarCore" Version="5.0.9.1" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.18" />

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -103,6 +103,11 @@
             常量下拉框
             </summary>
         </member>
+        <member name="F:Admin.NET.Core.CacheConst.SwaggerLogin">
+            <summary>
+            swagger登录缓存
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.ClaimConst">
             <summary>
             Claim相关常量

Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.xml

@@ -18,5 +18,12 @@
             <param name="httpContext"></param>
             <returns></returns>
         </member>
+        <member name="M:Admin.NET.Web.Core.ProjectOptions.AddProjectOptions(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
+            <summary>
+            注册项目配置选项
+            </summary>
+            <param name="services"></param>
+            <returns></returns>
+        </member>
     </members>
 </doc>

Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs

@@ -0,0 +1,28 @@
+using Admin.NET.Core;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Admin.NET.Web.Core;
+
+public static class ProjectOptions
+{
+    /// <summary>
+    /// 注册项目配置选项
+    /// </summary>
+    /// <param name="services"></param>
+    /// <returns></returns>
+    public static IServiceCollection AddProjectOptions(this IServiceCollection services)
+    {
+        services.AddConfigurableOptions<ConnectionStringsOptions>();
+        services.AddConfigurableOptions<RefreshTokenOptions>();
+        services.AddConfigurableOptions<SnowIdOptions>();
+        services.AddConfigurableOptions<CacheOptions>();
+        services.AddConfigurableOptions<OSSProviderOptions>();
+        services.AddConfigurableOptions<UploadOptions>();
+        services.AddConfigurableOptions<WechatOptions>();
+        services.AddConfigurableOptions<WechatPayOptions>();
+        services.AddConfigurableOptions<PayCallBackOptions>();
+        services.AddConfigurableOptions<CodeGenOptions>();
+
+        return services;
+    }
+}

Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -16,16 +16,8 @@ namespace Admin.NET.Web.Core
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddConfigurableOptions<ConnectionStringsOptions>();
-            services.AddConfigurableOptions<RefreshTokenOptions>();
-            services.AddConfigurableOptions<SnowIdOptions>();
-            services.AddConfigurableOptions<CacheOptions>();
-            services.AddConfigurableOptions<OSSProviderOptions>();
-            services.AddConfigurableOptions<UploadOptions>();
-            services.AddConfigurableOptions<WechatOptions>();
-            services.AddConfigurableOptions<WechatPayOptions>();
-            services.AddConfigurableOptions<PayCallBackOptions>();
-            services.AddConfigurableOptions<CodeGenOptions>();
+            // 统一配置项目选项注册
+            services.AddProjectOptions();
 
             services.AddSqlSugarSetup(App.Configuration);
 

Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -4,22 +4,23 @@
 		<TargetFramework>net6.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
+		<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <Compile Remove="logs\**" />
-	  <Compile Remove="publish\**" />
-	  <Content Remove="logs\**" />
-	  <Content Remove="publish\**" />
-	  <EmbeddedResource Remove="logs\**" />
-	  <EmbeddedResource Remove="publish\**" />
-	  <None Remove="logs\**" />
-	  <None Remove="publish\**" />
+		<Compile Remove="logs\**" />
+		<Compile Remove="publish\**" />
+		<Content Remove="logs\**" />
+		<Content Remove="publish\**" />
+		<EmbeddedResource Remove="logs\**" />
+		<EmbeddedResource Remove="publish\**" />
+		<None Remove="logs\**" />
+		<None Remove="publish\**" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <None Remove="Admin.NET.db" />
-	  <None Remove="Test.db" />
+		<None Remove="Admin.NET.db" />
+		<None Remove="Test.db" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -27,33 +28,33 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Update="wwwroot\Template\data.data.ts.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\dataModal.vue.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\Dto.cs.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\Entity.cs.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\index.vue.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\Input.cs.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\Manage.js.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\Output.cs.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="wwwroot\Template\Service.cs.vm">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
+		<Content Update="wwwroot\Template\data.data.ts.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\dataModal.vue.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\Dto.cs.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\Entity.cs.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\index.vue.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\Input.cs.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\Manage.js.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\Output.cs.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\Template\Service.cs.vm">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
 	</ItemGroup>
 
 </Project>

Admin.NET/Admin.NET.Web.Entry/Program.cs

@@ -1,4 +1,2 @@
-var builder = WebApplication.CreateBuilder(args).Inject();
-builder.Host.UseSerilogDefault();
-var app = builder.Build();
-app.Run();
+Serve.Run(RunOptions.Default
+    .ConfigureBuilder(builder => builder.Host.UseSerilogDefault()));

Admin.NET/Admin.NET.Web.Entry/SingleFilePublish.cs

@@ -32,7 +32,6 @@ public class SingleFilePublish : ISingleFilePublish
             "Admin.NET.Application",
             "Admin.NET.Core",
             "Admin.NET.Web.Core",
-            "Furion.Extras.ObjectMapper.Mapster"    // 修复单文件 Mapster 不能映射问题
         };
     }
 }