gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '还原YitIdHelperExtension实现分布式redis缓存部署时自动分配雪花WorkerId，有问题请优化，不要删除，很实用的功能' (#211) from shiningrise/Admin.NET.Pro:main into main

Browse Source 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/211
This commit is contained in:
zuohuaijun 2024-12-21 01:05:00 +08:00
commit 56fc8ce049
5 changed files with 151 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Application/Configuration/Captcha.json
View File

@ -3,6 +3,8 @@
// Lazy.Captcha.Core 组件详细文档(https://api.gitee.com/pojianbing/lazy-captcha/)
"CaptchaOptions": {
"CacheType": "Memory", // Memory、Redis
"RedisCacheString": "127.0.0.1:6379,password=, defaultDatabase=2", // Redis连接字符串
"CaptchaType": 10, // 验证码类型0、1、2、3、4、5、6、7、8、9、10、11
"CodeLength": 1, // 验证码长度, 要放在CaptchaType设置后 当类型为算术表达式时，长度代表操作的个数, 例如2
"ExpirySeconds": 60, // 验证码过期秒数

122
Admin.NET/Admin.NET.Core/Extension/YitIdHelperExtension.cs Normal file
View File

@ -0,0 +1,122 @@
// 麻省理工学院许可证
//
// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司 联系电话/微信：18020030720 QQ：515096995
//
// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
//
// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
namespace Admin.NET.Core;
/// <summary>
/// YitIdHelper 自动获取WorkId拓展（支持分布式部署）
/// </summary>
public static class YitIdHelperExtension
{
private const string MainLockName = "IdGen:WorkerId:Lock";
private const string MainValueKey = "IdGen:WorkerId:Value";
private static readonly List<string> _workIds = new();
private static SnowIdOptions _options;
public static void AddYitIdHelper(this IServiceCollection services, SnowIdOptions options)
{
_options = options;
// 排除开发环境和Windows服务器
//if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || App.WebHostEnvironment.IsDevelopment())
//{
// YitIdHelper.SetIdGenerator(_options);
// return;
//}
var maxLength = Math.Pow(2, _options.WorkerIdBitLength.ParseToDouble());
for (int i = 0; i < maxLength; i++)
{
_workIds.Add(i.ToString());
}
Random ran = new();
Thread.Sleep(ran.Next(10, 1000));
SetWorkId();
}
private static void SetWorkId()
{
var lockName = $"{_options.WorkerPrefix}{MainLockName}";
var valueKey = $"{_options.WorkerPrefix}{MainValueKey}";
var minWorkId = 0;
var maxWorkId = Math.Pow(2, _options.WorkerIdBitLength.ParseToDouble());
//var cache = App.GetService<ICache>();
var cache = App.GetRequiredService<ICacheProvider>().Cache;
var redisLock = cache.AcquireLock(lockName, 10000, 15000, true);
var keys = cache == Cache.Default
? cache.Keys.Where(u => u.StartsWith($"{_options.WorkerPrefix}{valueKey}:*"))
: ((FullRedis)cache).Search($"{_options.WorkerPrefix}{valueKey}:*", int.MaxValue);
var tempWorkIds = _workIds;
foreach (var key in keys)
{
var tempWorkId = key[key.LastIndexOf(":", StringComparison.Ordinal)..];
tempWorkIds.Remove(tempWorkId);
}
try
{
string workIdKey = "";
foreach (var item in tempWorkIds)
{
var workIdStr = item;
workIdKey = $"{valueKey}:{workIdStr}";
var exist = cache.Get<bool>(workIdKey);
if (exist)
{
workIdKey = "";
continue;
}
Console.WriteLine($"###########当前应用WorkId:【{workIdStr}】###########");
long workId = workIdStr.ParseToLong();
if (workId < minWorkId || workId > maxWorkId)
continue;
// 设置雪花Id算法机器码
YitIdHelper.SetIdGenerator(new IdGeneratorOptions
{
WorkerId = (ushort)workId,
WorkerIdBitLength = _options.WorkerIdBitLength,
SeqBitLength = _options.SeqBitLength
});
cache.Set(workIdKey, true, TimeSpan.FromSeconds(15));
break;
}
if (string.IsNullOrWhiteSpace(workIdKey)) throw Oops.Oh("未设置有效的机器码,启动失败");
// 开一个任务设置当前workId过期时间
Task.Run(() =>
{
while (true)
{
cache.SetExpire(workIdKey, TimeSpan.FromSeconds(15));
// Task.Delay(5000);
Thread.Sleep(10000);
}
});
}
catch (Exception ex)
{
throw Oops.Oh($"{ex.Message};{ex.StackTrace};{ex.StackTrace}");
}
finally
{
redisLock?.Dispose();
}
}
}

15
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
View File

@ -4,6 +4,8 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
using Lazy.Captcha.Core;
namespace Admin.NET.Core;
public static class SqlSugarSetup
@ -22,10 +24,17 @@ public static class SqlSugarSetup
{
// 注册雪花Id
var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
YitIdHelper.SetIdGenerator(snowIdOpt);
var cacheOpt = App.GetConfig<CacheOptions>("Cache", true);
if(cacheOpt.CacheType == "Memory")
{
YitIdHelper.SetIdGenerator(snowIdOpt);
SnowFlakeSingle.WorkId = snowIdOpt.WorkerId;
}
else
{
services.AddYitIdHelper(snowIdOpt);
}
// 自定义 SqlSugar 雪花ID算法
SnowFlakeSingle.WorkId = snowIdOpt.WorkerId;
StaticConfig.CustomSnowFlakeFunc = () =>
{
return YitIdHelper.NextId();

1
Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj
View File

@ -11,6 +11,7 @@
<ItemGroup>
<PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0" />
</ItemGroup>

14
Admin.NET/Admin.NET.Web.Core/Startup.cs
View File

@ -32,6 +32,7 @@ using System.Linq;
using System.Text.Encodings.Web;
using System.Text.Unicode;
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
namespace Admin.NET.Web.Core;
@ -211,6 +212,19 @@ public class Startup : AppStartup
// 验证码
services.AddCaptcha();
var captchaCacheType = App.GetService<IConfiguration>().GetSection("CaptchaOptions:CacheType")?.Value;
if (captchaCacheType == "Redis")
{
var connectionString = App.GetService<IConfiguration>().GetSection("CaptchaOptions:RedisCacheString")?.Value;
// 如果使用redis分布式缓存
services.AddStackExchangeRedisCache(options =>
{
options.Configuration = connectionString;
options.InstanceName = "captcha:";
});
}
// 控制台logo
services.AddConsoleLogo();