diff --git a/Src/Dlhis.Common/Services/ApiLogService.cs b/Src/Dlhis.Common/Services/ApiLogService.cs index 2a6b9550..22c3d02c 100644 --- a/Src/Dlhis.Common/Services/ApiLogService.cs +++ b/Src/Dlhis.Common/Services/ApiLogService.cs @@ -20,11 +20,11 @@ namespace Dlhis.Common.Services } public async Task> GetLogsAsync(ApiLogRequest request) - { + { var logs = await _dbContext.ChangeDb("log").Queryable() .WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search)) .WhereIF(request.Level.HasValue, x => x.Level == request.Level) - .OrderBy(x => x.Timestamp,OrderByType.Desc) + .OrderBy(x => x.Timestamp, OrderByType.Desc) .Select() .ToPageListAsync(request); diff --git a/Src/Dlhis.Entity/Common/ApiLogEntity.cs b/Src/Dlhis.Entity/Common/ApiLogEntity.cs index e2005b72..2f8fd03a 100644 --- a/Src/Dlhis.Entity/Common/ApiLogEntity.cs +++ b/Src/Dlhis.Entity/Common/ApiLogEntity.cs @@ -9,7 +9,7 @@ namespace Dlhis.Entity.Common; /// api日志表 /// [SugarTable(TableName = "Logs", TableDescription = "api日志表")] -public class ApiLogEntity +public class ApiLogEntity : SugarBaseEntity { /// /// 时间 diff --git a/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs b/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs index d623561b..714d4e58 100644 --- a/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs +++ b/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs @@ -26,10 +26,19 @@ namespace Dlhis.ScheduledTask.CommonJobs; var logs = await _dbContext.ChangeDb("log") .Queryable() .Where(x => x._ts <= threeDaysAgoStart) - .OrderBy(x => x._ts, OrderByType.Asc) + .Select(x => x.Id) .ToListAsync(); - await _dbContext.ChangeDb("log").DeleteReallyAsync(logs); + var lst = new List(); + foreach (var id in logs) + { + var entity = new ApiLogEntity + { + Id = id, + }; + lst.Add(entity); + } + await _dbContext.ChangeDb("log").DeleteReallyAsync(lst); } catch (Exception ex) {