From 578237571b79a53703ba002690f9a7d3ccfca447 Mon Sep 17 00:00:00 2001 From: KaneLeung Date: Wed, 17 Jul 2024 09:56:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8C=83=E8=B0=83=E6=95=B4=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E8=8E=B7=E5=8F=96IP=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs index 3c2d7a79..5179a008 100644 --- a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs @@ -277,7 +277,7 @@ public class SysAuthService : IDynamicApiController, ITransient // 获取水印文字（若系统水印为空则全局为空） var watermarkText = await _sysConfigService.GetConfigValue(ConfigConst.SysWebWatermark); if (!string.IsNullOrWhiteSpace(watermarkText)) - watermarkText += $"-{user.RealName}"; // $"-{user.RealName}-{_httpContextAccessor.HttpContext.GetRemoteIp()}-{DateTime.UtcNow}"; + watermarkText += $"-{user.RealName}"; // $"-{user.RealName}-{_httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(true)}-{DateTime.UtcNow}"; return new LoginUserOutput { From f04fbdb90f2f9e4ee91336b2a61c510430c95a12 Mon Sep 17 00:00:00 2001 From: KaneLeung Date: Wed, 17 Jul 2024 10:19:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A7=AA=E4=BF=AE=E5=A4=8DLDAP=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/views/system/ldap/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/src/views/system/ldap/index.vue b/Web/src/views/system/ldap/index.vue index e1618e91..08b0d689 100644 --- a/Web/src/views/system/ldap/index.vue +++ b/Web/src/views/system/ldap/index.vue @@ -111,7 +111,7 @@ const state = reactive({ }, localPageParam: { pageSize: 50 as number, - defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' }, + defaultSort: { field: 'id', order: 'asc', descStr: 'desc' }, }, visible: false, title: '', From 557ac3536da1e07bdb8ad7596510915c552f2bf5 Mon Sep 17 00:00:00 2001 From: KaneLeung Date: Wed, 17 Jul 2024 11:00:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=91=A8=E2=80=8D=F0=9F=A6=B1=E6=B6=88?= =?UTF-8?q?=E9=99=A4=E6=A0=91=E8=A1=A8=E6=A0=BC=E6=8A=A5=E9=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/views/system/region/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Web/src/views/system/region/index.vue b/Web/src/views/system/region/index.vue index 82ca43fa..6cf86321 100644 --- a/Web/src/views/system/region/index.vue +++ b/Web/src/views/system/region/index.vue @@ -119,6 +119,8 @@ const options = useVxeTable( }, // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档 { + stripe: false, + checkboxConfig: { range: false }, // 代理配置 proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } }, // 排序配置