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

😎1、修复租户种子id初始化问题 2、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2024-09-19 15:09:19 +08:00
parent d343cd8abf
commit 32d021c6dc
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -18,10 +18,10 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" /> <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.6" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.6" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.8" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.10" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.8" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.10" />
<PackageReference Include="Furion.Pure" Version="4.9.5.8" /> <PackageReference Include="Furion.Pure" Version="4.9.5.10" />
<PackageReference Include="Hardware.Info" Version="100.1.1" /> <PackageReference Include="Hardware.Info" Version="100.1.1.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
<PackageReference Include="IPTools.International" Version="1.6.0" /> <PackageReference Include="IPTools.International" Version="1.6.0" />
@ -42,7 +42,7 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.169" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.169" />
<PackageReference Include="SSH.NET" Version="2024.1.0" /> <PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1088" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1090" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

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

@ -477,11 +477,12 @@ public static class SqlSugarSetup
// 若实体包含Id字段，则设置为当前租户Id递增1 // 若实体包含Id字段，则设置为当前租户Id递增1
if (entityInfo.Columns.Any(u => u.PropertyName == nameof(EntityBaseId.Id))) if (entityInfo.Columns.Any(u => u.PropertyName == nameof(EntityBaseId.Id)))
{ {
var seedId = tenantId;
foreach (var sd in seedData) foreach (var sd in seedData)
{ {
var id = sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.GetValue(sd, null); var id = sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.GetValue(sd, null);
if (id != null && (id.ToString() == "0" || string.IsNullOrWhiteSpace(id.ToString()))) if (id != null && (id.ToString() == "0" || string.IsNullOrWhiteSpace(id.ToString())))
sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.SetValue(sd, ++tenantId); sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.SetValue(sd, ++seedId);
} }
} }