From 58392d95d0b107d2949e555255d13049438dac7e Mon Sep 17 00:00:00 2001 From: wanghu Date: Wed, 2 Sep 2026 18:30:50 +0800 Subject: [PATCH] 1 --- .../Controllers/Api/Com/LogController.cs | 13 +++++++------ src/YhCore.WebApi/Startup.cs | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/YhCore.WebApi/Controllers/Api/Com/LogController.cs b/src/YhCore.WebApi/Controllers/Api/Com/LogController.cs index 8fc2dc6..0026fb7 100644 --- a/src/YhCore.WebApi/Controllers/Api/Com/LogController.cs +++ b/src/YhCore.WebApi/Controllers/Api/Com/LogController.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using YhCore.Common; using YhCore.Common.UserContext; @@ -22,30 +23,30 @@ namespace YhCore.WebApi.Controllers.Api } /// - /// 系统操作日志搜索(对应 Java GET /api/log/systemSearch)。 + /// 系统操作日志搜索(对应 Java GET /api/log/systemSearch,全量日志)。 /// /// 关键字(可空) /// 页码,从 0 开始(对应 Spring Pageable.page) /// 每页大小(对应 Spring Pageable.size) [HttpGet("systemSearch")] - public PageVO SystemSearch( + public Task> SystemSearch( [FromQuery] string keyword, [FromQuery] int page = 0, [FromQuery] int size = 20) { - return _logService.Search(UserContextHolder.GetSchId(), keyword, true, page, size); + return _logService.SearchAsync(UserContextHolder.GetSchId(), keyword, true, page, size); } /// - /// 操作日志搜索(对应 Java GET /api/log/search)。 + /// 操作日志搜索(对应 Java GET /api/log/search,排除查询类)。 /// [HttpGet("search")] - public PageVO Search( + public Task> Search( [FromQuery] string keyword, [FromQuery] int page = 0, [FromQuery] int size = 20) { - return _logService.Search(UserContextHolder.GetSchId(), keyword, false, page, size); + return _logService.SearchAsync(UserContextHolder.GetSchId(), keyword, false, page, size); } } } diff --git a/src/YhCore.WebApi/Startup.cs b/src/YhCore.WebApi/Startup.cs index 8c3946b..c68f92a 100644 --- a/src/YhCore.WebApi/Startup.cs +++ b/src/YhCore.WebApi/Startup.cs @@ -108,8 +108,8 @@ namespace YhCore.WebApi // Redis 缓存(RedisUtil 单例,连接串取 Redis:ConnectionString) services.AddRedisCache(Configuration); - // 框架期占位实现;业务实现就绪后在 Extensions 中统一替换注册 - services.AddScoped(); + // 审计日志查询(sys_operation_log 分页搜索,LogServiceStub 已被真实实现替换) + services.AddScoped(); // ===== DocPrint 业务服务(对应旧 BestSchool.Service / BestSchool.DocPrint) ===== services.AddScoped();