ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update:跟随框架升级去掉雪花id相关的代码

Browse Source
This commit is contained in:
zhangqi
2021-05-25 16:13:34 +08:00
parent 8977c1e1cc
commit 8d3295531d
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptcha.cs
View File

@@ -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));

3
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -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)">

3
Api/Ewide.Core/Extension/XnRestfulResultProvider.cs
View File

@@ -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)
{

1
Api/Ewide.Core/Service/File/SysFileService.cs
View File

@@ -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;

1
Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs
View File

@@ -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;

5
Api/Ewide.Web.Core/Startup.cs
View File

@@ -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)