From 8d3295531d2b556685fba9fa5d8b3a548c8d9c2d Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Tue, 25 May 2021 16:13:34 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=B7=9F=E9=9A=8F=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8E=BB=E6=8E=89=E9=9B=AA=E8=8A=B1id?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptcha.cs         | 4 ++--
 Api/Ewide.Core/Ewide.Core.xml                                | 3 ++-
 Api/Ewide.Core/Extension/XnRestfulResultProvider.cs          | 3 ++-
 Api/Ewide.Core/Service/File/SysFileService.cs                | 1 -
 .../DbContexts/MultiTenantDbContext.cs                       | 1 -
 Api/Ewide.Web.Core/Startup.cs                                | 5 ++---
 6 files changed, 8 insertions(+), 9 deletions(-)

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 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.XnRestfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32)">
+        <member name="M:Ewide.Core.XnRestfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32,Furion.UnifyResult.UnifyResultStatusCodesOptions)">
             <summary>
             处理输出状态码
             </summary>
             <param name="context"></param>
             <param name="statusCode"></param>
+            <param name="options"></param>
             <returns></returns>
         </member>
         <member name="M:Ewide.Core.XnRestfulResultProvider.OnSucceeded(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext)">
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
         /// </summary>
         /// <param name="context"></param>
         /// <param name="statusCode"></param>
+        /// <param name="options"></param>
         /// <returns></returns>
-        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)