diff --git a/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptcha.cs b/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptcha.cs index de95096..a976a9d 100644 --- a/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptcha.cs +++ b/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptcha.cs @@ -1,7 +1,7 @@ using Furion; using Furion.DependencyInjection; +using Furion.DistributedIDGenerator; using Furion.JsonSerialization; -using Furion.Snowflake; using Microsoft.Extensions.Caching.Memory; using System; using System.Collections.Generic; @@ -105,7 +105,7 @@ namespace Ewide.Core bitmap.Dispose(); ms.Dispose(); rtnResult.repData.originalImageBase64 = Convert.ToBase64String(ms.GetBuffer()); //"data:image/jpg;base64," + - rtnResult.repData.token = IDGenerator.NextId().ToString(); + rtnResult.repData.token = IDGen.NextID().ToString(); // 缓存验证码正确位置集合 var cacheOptions = new MemoryCacheEntryOptions().SetSlidingExpiration(TimeSpan.FromSeconds(30)); diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index 1070fe2..3764d24 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -2616,12 +2616,13 @@ - + 处理输出状态码 + diff --git a/Api/Ewide.Core/Extension/XnRestfulResultProvider.cs b/Api/Ewide.Core/Extension/XnRestfulResultProvider.cs index 4996707..1e6aaff 100644 --- a/Api/Ewide.Core/Extension/XnRestfulResultProvider.cs +++ b/Api/Ewide.Core/Extension/XnRestfulResultProvider.cs @@ -57,8 +57,9 @@ namespace Ewide.Core /// /// /// + /// /// - public async Task OnResponseStatusCodes(HttpContext context, int statusCode) + public async Task OnResponseStatusCodes(HttpContext context, int statusCode,UnifyResultStatusCodesOptions options) { switch (statusCode) { diff --git a/Api/Ewide.Core/Service/File/SysFileService.cs b/Api/Ewide.Core/Service/File/SysFileService.cs index 70e7bc1..787f49c 100644 --- a/Api/Ewide.Core/Service/File/SysFileService.cs +++ b/Api/Ewide.Core/Service/File/SysFileService.cs @@ -4,7 +4,6 @@ using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Furion.Snowflake; using Mapster; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; diff --git a/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs b/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs index 33476ec..369dedd 100644 --- a/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs +++ b/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs @@ -3,7 +3,6 @@ using Ewide.Core.Service; using Furion; using Furion.DatabaseAccessor; using Furion.FriendlyException; -using Furion.Snowflake; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using System; diff --git a/Api/Ewide.Web.Core/Startup.cs b/Api/Ewide.Web.Core/Startup.cs index a43b19d..72bab9d 100644 --- a/Api/Ewide.Web.Core/Startup.cs +++ b/Api/Ewide.Web.Core/Startup.cs @@ -1,6 +1,5 @@ using Ewide.Core; using Furion; -using Furion.Snowflake; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -39,8 +38,8 @@ namespace Ewide.Web.Core services.AddViewEngine(); // 设置雪花id的workerId,确保每个实例workerId都应不同 - var workerId = ushort.Parse(App.Configuration["SnowId:WorkerId"] ?? "1"); - IDGenerator.SetIdGenerator(new IDGeneratorOptions { WorkerId = workerId }); + //var workerId = ushort.Parse(App.Configuration["SnowId:WorkerId"] ?? "1"); + //IDGenerator.SetIdGenerator(new IDGeneratorOptions { WorkerId = workerId }); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env)