😊小优化

Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj

@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\项目列表\万人调查\Daming.WanrenDC.App\Daming.WanrenDC.App.csproj" />
     <ProjectReference Include="..\Admin.NET.Core\Admin.NET.Core.csproj" />
   </ItemGroup>
 
@@ -57,9 +58,6 @@
     <None Update="Configuration\OSS.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Configuration\SnowId.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Configuration\Swagger.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

Admin.NET/Admin.NET.Application/Configuration/App.json

@@ -30,6 +30,11 @@
         "WithExposedHeaders": [ "Content-Disposition", "X-Pagination", "access-token", "x-access-token" ], // 如果前端不代理且是axios请求
         "SignalRSupport": true // 启用 SignalR 跨域支持
     },
+    "SnowId": {
+        "WorkerId": 1, // 机器码 全局唯一
+        "WorkerIdBitLength": 1, // 机器码位长 默认值6，取值范围 [1, 19]
+        "SeqBitLength": 6 // 序列数位长 默认值6，取值范围 [3, 21]（建议不小于4）
+    },
     "Cryptogram": {
         "CryptoType": "SM2", // 密码加密算法 MD5、SM2（国密）
         "PublicKey": "04F6E0C3345AE42B51E06BF50B98834988D54EBC7460FE135A48171BC0629EAE205EEDE253A530608178A98F1E19BB737302813BA39ED3FA3C51639D7A20C7391A", // 公钥

Admin.NET/Admin.NET.Application/Configuration/SnowId.json

@@ -1,9 +0,0 @@
-{
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
-
-    "SnowId": {
-        "WorkerId": 1, // 机器码 全局唯一
-        "WorkerIdBitLength": 1, // 机器码位长 默认值6，取值范围 [1, 19]
-        "SeqBitLength": 6 // 序列数位长 默认值6，取值范围 [3, 21]（建议不小于4）
-    }
-}

Admin.NET/Admin.NET.Application/GlobalUsings.cs

@@ -5,5 +5,5 @@ global using Furion.DynamicApiController;
 global using Mapster;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.Extensions.DependencyInjection;
-global using System.Threading.Tasks;
-global using SqlSugar;
+global using SqlSugar;
+global using System.Threading.Tasks;

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

@@ -20,9 +20,9 @@
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.6.10" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.6.10" />
-    <PackageReference Include="Furion.Pure" Version="4.8.6.10" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.6.11" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.6.11" />
+    <PackageReference Include="Furion.Pure" Version="4.8.6.11" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.1" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2" />

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

@@ -4363,7 +4363,7 @@
             <param name="accessToken"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysAuthService.Logout">
+        <member name="M:Admin.NET.Core.Service.SysAuthService.LogoutAsync">
             <summary>
             退出系统
             </summary>

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -1,5 +1,6 @@
 using Furion.SpecificationDocument;
 using Lazy.Captcha.Core;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Caching.Memory;
 
 namespace Admin.NET.Core.Service;
@@ -168,13 +169,13 @@ public class SysAuthService : IDynamicApiController, ITransient
     /// </summary>
     [ApiDescriptionSettings(Name = "Logout")]
     [DisplayName("退出系统")]
-    public void Logout()
+    public async Task LogoutAsync()
     {
         if (string.IsNullOrWhiteSpace(_userManager.Account))
             throw Oops.Oh(ErrorCodeEnum.D1011);
 
-        // 置空响应报文头
-        _httpContextAccessor.HttpContext.SetTokensOfResponseHeaders(null, null);
+        _httpContextAccessor.HttpContext.SignoutToSwagger();
+        await _httpContextAccessor.HttpContext.SignOutAsync();
     }
 
     /// <summary>