tsai
/
abp-next-admin2
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1262 from colinin/rel-9.2.1 

chore: update abp framework to 9.2.1
pull/1267/head
yx lin 9 months ago
committed by GitHub
parent
aff7072c70 c3de2044a1
commit
3f1b6b4bf9
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
6 changed files with 40 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Directory.Packages.props
  2. 6
      aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.HttpOverrides/LINGYUN/Abp/AspNetCore/WebClientInfo/RequestForwardedHeaderWebClientInfoProvider.cs
  3. 58
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session.AspNetCore/LINGYUN/Abp/Identity/Session/AspNetCore/HttpContextDeviceInfoProvider.cs
  4. 4
      common.props
  5. 2
      gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.OpenApi.Gateway/Dockerfile
  6. 10
      gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.OpenApi.Gateway/Program.cs

6
Directory.Packages.props
View File

@ -3,8 +3,8 @@
<DotNetCoreCAPPackageVersion>8.3.5</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.15.2</ElsaPackageVersion>
<ElsaNextPackageVersion>3.3.5</ElsaNextPackageVersion>
<VoloAbpPackageVersion>9.2.0</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>9.2.0</LINGYUNAbpPackageVersion>
<VoloAbpPackageVersion>9.2.1</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>9.2.1</LINGYUNAbpPackageVersion>
<MicrosoftExtensionsPackageVersion>9.0.4</MicrosoftExtensionsPackageVersion>
<MicrosoftAspNetCorePackageVersion>9.0.4</MicrosoftAspNetCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>9.0.4</MicrosoftEntityFrameworkCorePackageVersion>
@ -12,7 +12,7 @@
</PropertyGroup>
<!-- Abp Framework -->
<ItemGroup>
<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.2.0" />
<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.2.1" />
<PackageVersion Include="Volo.Abp.Core" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.Account.Application" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.Account.Application.Contracts" Version="$(VoloAbpPackageVersion)" />

6
aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.HttpOverrides/LINGYUN/Abp/AspNetCore/WebClientInfo/RequestForwardedHeaderWebClientInfoProvider.cs
View File

@ -4,6 +4,7 @@ using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Primitives;
using MyCSharp.HttpUserAgentParser.Providers;
using System;
using System.Linq;
using Volo.Abp.AspNetCore.WebClientInfo;
@ -16,8 +17,9 @@ public class RequestForwardedHeaderWebClientInfoProvider : HttpContextWebClientI
public RequestForwardedHeaderWebClientInfoProvider(
ILogger<HttpContextWebClientInfoProvider> logger,
IOptions<ForwardedHeadersOptions> options,
IHttpContextAccessor httpContextAccessor)
: base(logger, httpContextAccessor)
IHttpContextAccessor httpContextAccessor,
IHttpUserAgentParserProvider httpUserAgentParser)
: base(logger, httpContextAccessor, httpUserAgentParser)
{
Options = options.Value;
}

58
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session.AspNetCore/LINGYUN/Abp/Identity/Session/AspNetCore/HttpContextDeviceInfoProvider.cs
View File

@ -1,6 +1,7 @@
using DeviceDetectorNET;
using LINGYUN.Abp.IP.Location;
using LINGYUN.Abp.IP.Location;
using Microsoft.Extensions.Options;
using MyCSharp.HttpUserAgentParser;
using MyCSharp.HttpUserAgentParser.Providers;
using System;
using System.Threading.Tasks;
using Volo.Abp.AspNetCore.WebClientInfo;
@ -11,15 +12,18 @@ public class HttpContextDeviceInfoProvider : IDeviceInfoProvider, ITransientDepe
{
protected IIPLocationResolver IPLocationResolver { get; }
protected IWebClientInfoProvider WebClientInfoProvider { get; }
protected IHttpUserAgentParserProvider HttpUserAgentParser { get; }
protected AbpIdentitySessionAspNetCoreOptions Options { get; }
public HttpContextDeviceInfoProvider(
IIPLocationResolver iPLocationResolver,
IWebClientInfoProvider webClientInfoProvider,
IHttpUserAgentParserProvider httpUserAgentParserProvider,
IOptions<AbpIdentitySessionAspNetCoreOptions> options)
{
IPLocationResolver = iPLocationResolver;
WebClientInfoProvider = webClientInfoProvider;
HttpUserAgentParser = httpUserAgentParserProvider;
Options = options.Value;
}
@ -27,7 +31,7 @@ public class HttpContextDeviceInfoProvider : IDeviceInfoProvider, ITransientDepe
public async virtual Task<DeviceInfo> GetDeviceInfoAsync()
{
var deviceInfo = BrowserDeviceInfo.Parse(WebClientInfoProvider.BrowserInfo);
var deviceInfo = BrowserDeviceInfo.Parse(HttpUserAgentParser, WebClientInfoProvider.BrowserInfo);
var ipAddress = WebClientInfoProvider.ClientIpAddress;
var ipRegion = "";
if (!ipAddress.IsNullOrWhiteSpace())
@ -66,44 +70,30 @@ public class HttpContextDeviceInfoProvider : IDeviceInfoProvider, ITransientDepe
Description = description;
}
public static BrowserDeviceInfo Parse(string browserInfo)
public static BrowserDeviceInfo Parse(IHttpUserAgentParserProvider httpUserAgentParserProvider, string browserInfo)
{
string device = null;
string deviceInfo = null;
if (!browserInfo.IsNullOrWhiteSpace())
{
var deviceDetector = new DeviceDetector(browserInfo);
deviceDetector.Parse();
if (deviceDetector.IsParsed())
var httpUserAgentInformation = httpUserAgentParserProvider.Parse(browserInfo);
if (!httpUserAgentInformation.MobileDeviceType.IsNullOrWhiteSpace())
{
var osInfo = deviceDetector.GetOs();
if (deviceDetector.IsMobile())
{
// IdentitySessionDevices.Mobile
device = osInfo.Success ? osInfo.Match.Name : "Mobile";
}
else if (deviceDetector.IsBrowser())
{
// IdentitySessionDevices.Web
device = "Web";
}
else if (deviceDetector.IsDesktop())
{
// TODO: PC
device = "Desktop";
}
if (osInfo.Success)
{
deviceInfo = osInfo.Match.Name + " " + osInfo.Match.Version;
}
var clientInfo = deviceDetector.GetClient();
if (clientInfo.Success)
{
deviceInfo = deviceInfo.IsNullOrWhiteSpace() ? clientInfo.Match.Name : deviceInfo + " " + clientInfo.Match.Name;
}
device = httpUserAgentInformation.MobileDeviceType;
}
else if (!httpUserAgentInformation.Name.IsNullOrWhiteSpace())
{
device = "Web";
}
else
{
device = "OAuth";
}
deviceInfo = httpUserAgentInformation.Type switch
{
HttpUserAgentType.Browser or HttpUserAgentType.Robot => (httpUserAgentInformation.Platform.HasValue ? httpUserAgentInformation.Platform.Value.Name + " " : string.Empty) + httpUserAgentInformation.Name,
_ => httpUserAgentInformation.UserAgent,
};
}
return new BrowserDeviceInfo(device, deviceInfo);
}

4
common.props
View File

@ -1,12 +1,12 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>9.2.0</Version>
<Version>9.2.1</Version>
<Authors>colin</Authors>
<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
<PackageOutputPath>$(SolutionDir)LocalNuget</PackageOutputPath>
<PackageVersion>9.2.0</PackageVersion>
<PackageVersion>9.2.1</PackageVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>

2
gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.OpenApi.Gateway/Dockerfile
View File

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL maintainer="colin.in@foxmail.com"
WORKDIR /app

10
gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.OpenApi.Gateway/Program.cs
View File

@ -7,11 +7,13 @@
.AddYarpJson()
.ConfigureAppConfiguration((context, config) =>
{
var configuration = config.Build();
var agileConfigEnabled = configuration["AgileConfig:IsEnabled"];
if (agileConfigEnabled.IsNullOrEmpty() || bool.Parse(agileConfigEnabled))
var agileConfig = context.Configuration.GetSection("AgileConfig");//IsEnabled
if (agileConfig.Exists())
{
config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration));
if (agileConfig.GetValue("IsEnabled", false))
{
config.AddAgileConfig(new AgileConfig.Client.ConfigClient(context.Configuration));
}
}
})
.UseSerilog((context, provider, config) =>

Write Preview
Loading…
Cancel
Save