From ddac4480871cd6c96dba85360338ad44ab598908 Mon Sep 17 00:00:00 2001 From: tk Date: Tue, 31 Dec 2024 15:56:36 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E2=9A=A1=20=E5=AD=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NetAdmin.Application/Services/RepositoryService.cs | 2 +- .../NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs | 2 ++ .../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj | 4 ++-- .../Services/Sys/JobService.cs | 2 +- .../Services/Sys/MenuService.cs | 2 +- .../Services/Sys/UserService.cs | 2 +- src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj | 2 +- src/frontend/admin/package.json | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs index 27223766..089798e0 100644 --- a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs +++ b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs @@ -80,7 +80,7 @@ public abstract class RepositoryService(BasicReposit // 默认匹配主键 whereExp ??= a => a.Id.Equals(newValue.Id); var update = BuildUpdate(newValue, includeFields, excludeFields, ignoreVersion).Where(whereExp).Where(whereSql); - return update.ExecuteAffrowsAsync(); + return update.ExecuteEffectsAsync(); } #if DBTYPE_SQLSERVER diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs b/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs index d7f3cdc4..0d7876f2 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs @@ -1,3 +1,5 @@ +using FreeSql.Provider.SqlServer; + namespace NetAdmin.Domain.Extensions; /// diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index 2c2c2f03..7c7e19b1 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs index 5cfb74bb..47838163 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs @@ -97,7 +97,7 @@ public sealed class JobService(BasicRepository rpo, IJobRecordSer #if DBTYPE_SQLSERVER return (await update.ExecuteUpdatedAsync().ConfigureAwait(false)).FirstOrDefault()?.Adapt(); #else - return await update.ExecuteAffrowsAsync().ConfigureAwait(false) <= 0 + return await update.ExecuteEffectsAsync().ConfigureAwait(false) <= 0 ? null : await GetAsync(new QueryJobReq { Id = req.Id }).ConfigureAwait(false); #endif diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs index 29084947..4f6c4f40 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs @@ -57,7 +57,7 @@ public sealed class MenuService(BasicRepository rpo, IUserServic { req.ThrowIfInvalid(); var ret = await Rpo.DeleteAsync(a => a.Id == req.Id).ConfigureAwait(false); - _ = await Rpo.Orm.Delete().Where(a => a.MenuId == req.Id).ExecuteAffrowsAsync().ConfigureAwait(false); + _ = await Rpo.Orm.Delete().Where(a => a.MenuId == req.Id).ExecuteEffectsAsync().ConfigureAwait(false); return ret; } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index e06f991d..9550e9a6 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs @@ -129,7 +129,7 @@ public sealed class UserService( var ret = await Rpo.DeleteAsync(req.Id).ConfigureAwait(false); // 删除分表 - _ = await Rpo.Orm.Delete(new { UserId = req.Id }).ExecuteAffrowsAsync().ConfigureAwait(false); + _ = await Rpo.Orm.Delete(new { UserId = req.Id }).ExecuteEffectsAsync().ConfigureAwait(false); // 删除档案表 _ = await userProfileService.DeleteAsync(req).ConfigureAwait(false); diff --git a/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj b/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj index df3401a5..bd14367e 100644 --- a/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj +++ b/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj @@ -9,7 +9,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json index f30d2ad3..6105450a 100644 --- a/src/frontend/admin/package.json +++ b/src/frontend/admin/package.json @@ -14,7 +14,7 @@ "aieditor": "1.3.3", "axios": "1.7.9", "crypto-js": "4.2.0", - "echarts": "5.5.1", + "echarts": "5.6.0", "element-plus": "2.9.1", "json-bigint": "1.0.0", "markdown-it": "14.1.0",