lingyun/NetAdmin
Template
6
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-12-29 00:55:48 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

feat: ✨ 框架代码同步 (#158)

Browse Source 
[skip ci]

Co-authored-by: tk <fiyne1a@dingtalk.com>
This commit is contained in:
nsnail
2024-07-22 12:58:10 +08:00
committed by GitHub
parent 60ec6ea2c1
commit 1a28e8d5a6
107 changed files with 1256 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs
View File

@@ -119,7 +119,7 @@ public sealed class JobController(IJobCache cache) : ControllerBase<IJobCache, I
/// <summary>
/// 获取作业记录条形图数据
/// </summary>
public Task<IOrderedEnumerable<GetBarChartRsp>> GetRecordBarChartAsync(QueryReq<QueryJobRecordReq> req)
public Task<IEnumerable<GetBarChartRsp>> GetRecordBarChartAsync(QueryReq<QueryJobRecordReq> req)
{
return Cache.GetRecordBarChartAsync(req);
}
@@ -127,8 +127,7 @@ public sealed class JobController(IJobCache cache) : ControllerBase<IJobCache, I
/// <summary>
/// 状态码分组作业记录饼图数据
/// </summary>
public Task<IOrderedEnumerable<GetPieChartRsp>> GetRecordPieChartByHttpStatusCodeAsync(
QueryReq<QueryJobRecordReq> req)
public Task<IEnumerable<GetPieChartRsp>> GetRecordPieChartByHttpStatusCodeAsync(QueryReq<QueryJobRecordReq> req)
{
return Cache.GetRecordPieChartByHttpStatusCodeAsync(req);
}
@@ -136,7 +135,7 @@ public sealed class JobController(IJobCache cache) : ControllerBase<IJobCache, I
/// <summary>
/// 名称分组作业记录饼图数据
/// </summary>
public Task<IOrderedEnumerable<GetPieChartRsp>> GetRecordPieChartByNameAsync(QueryReq<QueryJobRecordReq> req)
public Task<IEnumerable<GetPieChartRsp>> GetRecordPieChartByNameAsync(QueryReq<QueryJobRecordReq> req)
{
return Cache.GetRecordPieChartByNameAsync(req);
}

6
src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/LogController.cs
View File

@@ -82,7 +82,7 @@ public sealed class LogController(IRequestLogCache cache) : ControllerBase<IRequ
/// <summary>
/// 获取条形图数据
/// </summary>
public Task<IOrderedEnumerable<GetBarChartRsp>> GetBarChartAsync(QueryReq<QueryRequestLogReq> req)
public Task<IEnumerable<GetBarChartRsp>> GetBarChartAsync(QueryReq<QueryRequestLogReq> req)
{
return Cache.GetBarChartAsync(req);
}
@@ -90,7 +90,7 @@ public sealed class LogController(IRequestLogCache cache) : ControllerBase<IRequ
/// <summary>
/// 描述分组饼图数据
/// </summary>
public Task<IOrderedEnumerable<GetPieChartRsp>> GetPieChartByApiSummaryAsync(QueryReq<QueryRequestLogReq> req)
public Task<IEnumerable<GetPieChartRsp>> GetPieChartByApiSummaryAsync(QueryReq<QueryRequestLogReq> req)
{
return Cache.GetPieChartByApiSummaryAsync(req);
}
@@ -98,7 +98,7 @@ public sealed class LogController(IRequestLogCache cache) : ControllerBase<IRequ
/// <summary>
/// 状态码分组饼图数据
/// </summary>
public Task<IOrderedEnumerable<GetPieChartRsp>> GetPieChartByHttpStatusCodeAsync(QueryReq<QueryRequestLogReq> req)
public Task<IEnumerable<GetPieChartRsp>> GetPieChartByHttpStatusCodeAsync(QueryReq<QueryRequestLogReq> req)
{
return Cache.GetPieChartByHttpStatusCodeAsync(req);
}

13
src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs
View File

@@ -66,7 +66,18 @@ public sealed class ScheduledJob : WorkBase<ScheduledJob>, IJob
}
var request = BuildRequest(job);
var sw = new Stopwatch();
// 随机延时
if (job.RandomDelayBegin is > 0 && job.RandomDelayEnd is > 0) {
var (start, end) = (job.RandomDelayBegin.Value, job.RandomDelayEnd.Value);
if (start > end) {
(start, end) = (end, start);
}
await Task.Delay(new[] { start, end }.Rand(), CancellationToken.None).ConfigureAwait(false);
}
var sw = new Stopwatch();
sw.Start();
var rsp = await request.SendAsync(CancellationToken.None).ConfigureAwait(false);
if (rsp.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) {

7
src/backend/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs
View File

@@ -18,13 +18,6 @@ public sealed class OperationLogger : IEventSubscriber
return;
}
// 跳过指定的请求
if (Array.Exists( //
GlobalStatic.LogSavingSkipApiIds
, x => x.Equals(operationEvent.Data.ApiId, StringComparison.OrdinalIgnoreCase))) {
return;
}
operationEvent.Data.TruncateStrings();
_ = await App.GetService<IRequestLogService>().CreateAsync(operationEvent.Data).ConfigureAwait(false);
}