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

Merge branch 'v2' of http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro into v2

Browse Source
This commit is contained in:
zuohuaijun 2024-12-25 14:53:03 +08:00
commit 889f56ade2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin.NET/Admin.NET.Core/Extension/YitIdHelperExtension.cs
View File

@ -19,6 +19,14 @@ public static class YitIdHelperExtension
public static void AddYitIdHelper(this IServiceCollection services, SnowIdOptions options)
{
if (App.GetConfig<CacheOptions>("Cache", true).CacheType == CacheTypeEnum.Memory.ToString())
{
YitIdHelper.SetIdGenerator(options);
SnowFlakeSingle.WorkId = options.WorkerId;
Console.WriteLine($"###########当前应用WorkId:【{options.WorkerId}】###########");
return;
}
_options = options;
// 排除开发环境和Windows服务器

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

@ -22,15 +22,8 @@ public static class SqlSugarSetup
{
// 注册雪花Id
var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
if (App.GetConfig<CacheOptions>("Cache", true).CacheType == CacheTypeEnum.Memory.ToString())
{
YitIdHelper.SetIdGenerator(snowIdOpt);
SnowFlakeSingle.WorkId = snowIdOpt.WorkerId;
}
else
{
services.AddYitIdHelper(snowIdOpt);
}
services.AddYitIdHelper(snowIdOpt);
StaticConfig.CustomSnowFlakeFunc = () =>
{