From 2fd3f13b17f02496a0c6e8583b70b2ec0b4afbbc Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Thu, 26 Sep 2024 00:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97=E5=92=8C=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=20=202?= =?UTF-8?q?=E3=80=81=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj | 2 +- .../Admin.NET.Core/Service/Log/SysLogExService.cs | 4 ++-- .../Admin.NET.Core/Service/Log/SysLogVisService.cs | 4 ++-- Web/package.json | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 2c542d65..419105c0 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -42,7 +42,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/Service/Log/SysLogExService.cs b/Admin.NET/Admin.NET.Core/Service/Log/SysLogExService.cs index 0bb7d877..9872bb5e 100644 --- a/Admin.NET/Admin.NET.Core/Service/Log/SysLogExService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Log/SysLogExService.cs @@ -35,8 +35,8 @@ public class SysLogExService : IDynamicApiController, ITransient .WhereIF(!string.IsNullOrWhiteSpace(input.ActionName), u => u.ActionName == input.ActionName) .WhereIF(!string.IsNullOrWhiteSpace(input.RemoteIp), u => u.RemoteIp == input.RemoteIp) .WhereIF(!string.IsNullOrWhiteSpace(input.Elapsed.ToString()), u => u.Elapsed >= input.Elapsed) - .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status == "200", u => u.Status == input.Status) - .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status != "200", u => u.Status != input.Status) + .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status == "200", u => u.Status == "200") + .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status != "200", u => u.Status != "200") //.OrderBy(u => u.CreateTime, OrderByType.Desc) .IgnoreColumns(u => new { u.RequestParam, u.ReturnResult, u.Message }) .OrderBuilder(input) diff --git a/Admin.NET/Admin.NET.Core/Service/Log/SysLogVisService.cs b/Admin.NET/Admin.NET.Core/Service/Log/SysLogVisService.cs index a3b81f52..2a2402c2 100644 --- a/Admin.NET/Admin.NET.Core/Service/Log/SysLogVisService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Log/SysLogVisService.cs @@ -34,8 +34,8 @@ public class SysLogVisService : IDynamicApiController, ITransient .WhereIF(!string.IsNullOrWhiteSpace(input.ActionName), u => u.ActionName == input.ActionName) .WhereIF(!string.IsNullOrWhiteSpace(input.RemoteIp), u => u.RemoteIp == input.RemoteIp) .WhereIF(!string.IsNullOrWhiteSpace(input.Elapsed.ToString()), u => u.Elapsed >= input.Elapsed) - .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status == "200", u => u.Status == input.Status) - .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status != "200", u => u.Status != input.Status) + .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status == "200", u => u.Status == "200") + .WhereIF(!string.IsNullOrWhiteSpace(input.Status) && input.Status != "200", u => u.Status != "200") .OrderBy(u => u.CreateTime, OrderByType.Desc) .ToPagedListAsync(input.Page, input.PageSize); } diff --git a/Web/package.json b/Web/package.json index 6ec9d54a..80ea5404 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2024.09.24", + "lastBuildTime": "2024.09.26", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -70,7 +70,7 @@ "vue-router": "^4.4.5", "vue-signature-pad": "^3.0.2", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.2.3", + "vxe-pc-ui": "^4.2.6", "vxe-table": "^4.7.59", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.5", @@ -84,13 +84,13 @@ "@types/node": "^20.16.5", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", - "@typescript-eslint/eslint-plugin": "^8.6.0", - "@typescript-eslint/parser": "^8.6.0", + "@typescript-eslint/eslint-plugin": "^8.7.0", + "@typescript-eslint/parser": "^8.7.0", "@vitejs/plugin-vue": "^5.1.4", "@vitejs/plugin-vue-jsx": "^4.0.1", "@vue/compiler-sfc": "^3.5.8", "code-inspector-plugin": "^0.16.1", - "eslint": "^9.11.0", + "eslint": "^9.11.1", "eslint-plugin-vue": "^9.28.0", "globals": "^15.8.0", "less": "^4.2.0", @@ -99,7 +99,7 @@ "sass": "^1.79.3", "terser": "^5.33.0", "typescript": "^5.6.2", - "vite": "^5.4.7", + "vite": "^5.4.8", "vite-plugin-cdn-import": "^1.0.1", "vite-plugin-compression2": "^1.3.0", "vite-plugin-vue-setup-extend": "^0.4.0",