XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-03 15:36:06 +08:00
parent 6b18e5eced 5673fcad5f
commit 088a0b6fd5
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRC.Core.SCP/IRC.Core.SCP.csproj
View File

@ -19,7 +19,7 @@
<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.2" /> <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
<PackageReference Include="AutoMapper" Version="13.0.1" /> <PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Minio" Version="6.0.5" /> <PackageReference Include="Minio" Version="6.0.3" />
<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0"> <PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>

20
IRaCIS.Core.Infra.EFCore/AuthUser/UserInfo.cs
View File

@ -284,20 +284,28 @@ namespace IRaCIS.Core.Domain.Share
{ {
var url = _accessor?.HttpContext?.Request?.Path.ToString(); var url = _accessor?.HttpContext?.Request?.Path.ToString();
var list = url.Split('/').Where(t => !string.IsNullOrWhiteSpace(t)).ToList(); if (url.IsNotNullOrEmpty())
if (url.Contains("Inspection", StringComparison.OrdinalIgnoreCase))
{ {
list.RemoveAt(0); var list = url.Split('/').Where(t => !string.IsNullOrWhiteSpace(t)).ToList();
return string.Join('/', list.Take(2)); if (url.Contains("Inspection", StringComparison.OrdinalIgnoreCase))
{
list.RemoveAt(0);
return string.Join('/', list.Take(2));
}
else
{
return string.Join('/', list.Take(2));
}
} }
else else
{ {
return string.Join('/', list.Take(2)); return string.Empty;
} }
} }
} }