From b0a4f46af31bee4bd16128b724cfb8494e121a1b Mon Sep 17 00:00:00 2001 From: tk Date: Thu, 26 Dec 2024 16:01:02 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A8=20=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/RepositoryService.cs | 18 ++-- .../Fields/IFieldModifiedClientIp.cs | 2 +- .../NetAdmin.Infrastructure.csproj | 6 +- .../Utils/SqlAuditor.cs | 6 ++ src/frontend/admin/src/assets/img/404.svg | 29 ------- .../admin/src/assets/img/no-widgets.svg | 57 ------------- src/frontend/admin/src/layout/other/404.vue | 83 ++++++++++++++++++- 7 files changed, 102 insertions(+), 99 deletions(-) delete mode 100644 src/frontend/admin/src/assets/img/404.svg delete mode 100644 src/frontend/admin/src/assets/img/no-widgets.svg diff --git a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs index ec261972..27223766 100644 --- a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs +++ b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs @@ -138,18 +138,20 @@ public abstract class RepositoryService(BasicReposit { var ret = includeFields!.ToDictionary( x => x, x => typeof(TEntity).GetProperty(x, BindingFlags.Public | BindingFlags.Instance)!.GetValue(entity)); - if (entity is not IFieldModifiedUser) { - return ret; + if (entity is IFieldModifiedUser) { + var userInfo = App.GetService(); + if (userInfo == null) { + return ret; + } + + ret.Add(nameof(IFieldModifiedUser.ModifiedUserId), userInfo.Id); + ret.Add(nameof(IFieldModifiedUser.ModifiedUserName), userInfo.UserName); } - var userInfo = App.GetService(); - if (userInfo == null) { - return ret; + if (entity is IFieldModifiedClientIp) { + ret.Add(nameof(IFieldModifiedClientIp.ModifiedClientIp), App.HttpContext?.GetRealIpAddress()?.MapToIPv4().ToString().IpV4ToInt32()); } - ret.Add(nameof(IFieldModifiedUser.ModifiedUserId), userInfo.Id); - ret.Add(nameof(IFieldModifiedUser.ModifiedUserName), userInfo.UserName); - return ret; } diff --git a/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedClientIp.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedClientIp.cs index a301488d..e4e627d3 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedClientIp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedClientIp.cs @@ -8,5 +8,5 @@ public interface IFieldModifiedClientIp /// /// 客户端IP /// - int ModifiedClientIp { get; init; } + int? ModifiedClientIp { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index b935e537..f15683b9 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -3,9 +3,9 @@ - - - + + + diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs index c18ca431..9fd72387 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs @@ -133,6 +133,12 @@ public sealed class SqlAuditor : ISingleton break; + case nameof(IFieldModifiedClientIp.ModifiedClientIp): + if (e.Value is null or 0) { + e.Value = App.HttpContext?.GetRealIpAddress()?.MapToIPv4().ToString().IpV4ToInt32(); + } + + break; case nameof(IFieldModifiedUser.ModifiedUserName): if (userInfo != null && e.Value is null or "") { e.Value = userInfo.UserName; diff --git a/src/frontend/admin/src/assets/img/404.svg b/src/frontend/admin/src/assets/img/404.svg deleted file mode 100644 index 35a627bd..00000000 --- a/src/frontend/admin/src/assets/img/404.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/frontend/admin/src/assets/img/no-widgets.svg b/src/frontend/admin/src/assets/img/no-widgets.svg deleted file mode 100644 index 0f95e1ae..00000000 --- a/src/frontend/admin/src/assets/img/no-widgets.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/frontend/admin/src/layout/other/404.vue b/src/frontend/admin/src/layout/other/404.vue index 53eb2a5c..f0dc85c4 100644 --- a/src/frontend/admin/src/layout/other/404.vue +++ b/src/frontend/admin/src/layout/other/404.vue @@ -1,7 +1,88 @@