lingyun/NetAdmin
Template
7
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-11-04 21:20:50 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

perf: ⚡ 升级至.NET9 (#90)

Browse Source
This commit is contained in:
nsnail
2024-02-20 15:05:38 +08:00
committed by GitHub
parent 6f89015198
commit ad3eab929d
13 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs
View File

@@ -240,10 +240,10 @@ public static class ServiceCollectionExtensions
}
#if DEBUG
private static void MarkupLine( //
string msg //
, LogMessage message //
, IReadOnlyDictionary<LogLevels, DisplayAttribute> logLevels)
private static void MarkupLine( //
string msg //
, LogMessage message //
, Dictionary<LogLevels, DisplayAttribute> logLevels)
{
// 日志过长
if (msg.Length > Numbers.CONSOLE_LINE_LEN_LIMIT) {

8
src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
View File

@@ -9,10 +9,10 @@
<PackageReference Include="Cronos" Version="0.8.3"/>
<PackageReference Include="FreeSql.DbContext.NS" Version="3.2.810-preview20231229-ns1"/>
<PackageReference Include="FreeSql.Provider.Sqlite.NS" Version="3.2.810-preview20231229-ns1"/>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.24"/>
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster.NS" Version="4.9.1.24-ns1"/>
<PackageReference Include="Furion.Pure.NS" Version="4.9.1.24-ns1"/>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.1"/>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.31"/>
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster.NS" Version="4.9.1.31-ns2"/>
<PackageReference Include="Furion.Pure.NS" Version="4.9.1.31-ns2"/>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-preview.1.24081.5"/>
<PackageReference Include="Minio" Version="6.0.2"/>
<PackageReference Include="NSExt" Version="2.0.11"/>
<PackageReference Include="RedLock.net" Version="2.3.2"/>

3
src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs
View File

@@ -2,7 +2,6 @@ using NetAdmin.Application.Repositories;
using NetAdmin.Application.Services;
using NetAdmin.Domain.Attributes.DataValidation;
using NetAdmin.Domain.Contexts;
using NetAdmin.Domain.DbMaps.Dependency.Fields;
using NetAdmin.Domain.DbMaps.Sys;
using NetAdmin.Domain.Dto.Dependency;
using NetAdmin.Domain.Dto.Sys.User;
@@ -429,7 +428,7 @@ public sealed class UserService(
throw new NotImplementedException();
}
private static LoginRsp LoginInternal(IFieldEnabled dbUser)
private static LoginRsp LoginInternal(Sys_User dbUser)
{
if (!dbUser.Enabled) {
throw new NetAdminInvalidOperationException(Ln.请联系管理员激活账号);

3
src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs
View File

@@ -2,7 +2,6 @@ using FreeSql.Internal;
using Furion.RemoteRequest;
using Furion.RemoteRequest.Extensions;
using Furion.Schedule;
using NetAdmin.Domain.DbMaps.Sys;
using NetAdmin.Domain.Dto.Sys.Job;
using NetAdmin.Domain.Dto.Sys.JobRecord;
using NetAdmin.Host.BackgroundRunning;
@@ -104,7 +103,7 @@ public sealed class ScheduledJob : WorkBase<ScheduledJob>, IJob
.ConfigureAwait(false);
}
private HttpRequestPart BuildRequest(Sys_Job job)
private HttpRequestPart BuildRequest(QueryJobRsp job)
{
var ret = job.RequestUrl.SetHttpMethod(new HttpMethod(job.HttpMethod.ToString()));
var headers = new Dictionary<string, string>();

2
src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj
View File

@@ -4,7 +4,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.7.0"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.1.24081.5"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>