Explorar el Código

😎1、修复访问日志和异常日志查询错误 2、升级依赖

zuohuaijun hace 1 año
padre
commit
86dac46523

+ 1 - 1
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -39,7 +39,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.169" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1093" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1095" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

+ 2 - 2
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)

+ 2 - 2
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);
     }

+ 6 - 6
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.09.24",
+	"lastBuildTime": "2024.09.26",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -40,7 +40,7 @@
 		"lodash-es": "^4.17.21",
 		"md-editor-v3": "^4.20.2",
 		"mitt": "^3.0.1",
-		"monaco-editor": "^0.51.0",
+		"monaco-editor": "^0.52.0",
 		"mqtt": "^4.3.8",
 		"nprogress": "^0.2.0",
 		"pinia": "^2.2.2",
@@ -74,13 +74,13 @@
 		"@types/node": "^20.14.15",
 		"@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.9.0",
 		"less": "^4.2.0",
@@ -89,7 +89,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",