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

😎修复导入导出异常（降级nuget依赖）

Browse Source
This commit is contained in:
zuohuaijun 2024-08-01 12:34:31 +08:00
parent 2ba5e32789
commit 85c04b46dd
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" /> <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="QRCoder" Version="1.6.0" /> <PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" /> <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" /> <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" /> <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.4.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.4.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.6.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.6.0" />

7
Admin.NET/Admin.NET.Core/Service/Common/SysCommonService.cs
View File

@ -20,10 +20,13 @@ namespace Admin.NET.Core.Service;
public class SysCommonService : IDynamicApiController, ITransient public class SysCommonService : IDynamicApiController, ITransient
{ {
private readonly IApiDescriptionGroupCollectionProvider _apiProvider; private readonly IApiDescriptionGroupCollectionProvider _apiProvider;
private readonly UserManager _userManager;
public SysCommonService(IApiDescriptionGroupCollectionProvider apiProvider) public SysCommonService(IApiDescriptionGroupCollectionProvider apiProvider,
UserManager userManager)
{ {
_apiProvider = apiProvider; _apiProvider = apiProvider;
_userManager = userManager;
} }
/// <summary> /// <summary>
@ -69,6 +72,8 @@ public class SysCommonService : IDynamicApiController, ITransient
//// 路由前缀 //// 路由前缀
//var defaultRoutePrefix = App.GetOptions<DynamicApiControllerSettingsOptions>().DefaultRoutePrefix; //var defaultRoutePrefix = App.GetOptions<DynamicApiControllerSettingsOptions>().DefaultRoutePrefix;
//var menuIdList = _userManager.SuperAdmin ? new List<long>() : await GetMenuIdList();
// 获取所有接口分组 // 获取所有接口分组
var apiDescriptionGroups = _apiProvider.ApiDescriptionGroups.Items; var apiDescriptionGroups = _apiProvider.ApiDescriptionGroups.Items;
foreach (ApiDescriptionGroup group in apiDescriptionGroups) foreach (ApiDescriptionGroup group in apiDescriptionGroups)

2
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
View File

@ -475,7 +475,7 @@ public class SysTenantService : IDynamicApiController, ITransient
[NonAction] [NonAction]
public SqlSugarScopeProvider GetTenantDbConnectionScope(long tenantId) public SqlSugarScopeProvider GetTenantDbConnectionScope(long tenantId)
{ {
var iTenant = SqlSugarSetup.ITenant; var iTenant = _sysTenantRep.AsTenant();
// 若已存在租户库连接，则直接返回 // 若已存在租户库连接，则直接返回
if (iTenant.IsAnyConnection(tenantId.ToString())) if (iTenant.IsAnyConnection(tenantId.ToString()))