zhangxiaofeng
/
EntrustSettle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

费用

Browse Source
master
zhangxiaofeng 8 months ago
parent e9918abe62
commit 0902bffd9b
6 changed files with 11 additions and 353 deletions
Show Stats Download Patch File Download Diff File

31
EntrustSettle.Serilog/Configuration/LogBatchingSinkConfiguration.cs
Unescape Escape View File

@ -1,31 +0,0 @@
using EntrustSettle.Common;
using EntrustSettle.Serilog.Sink;
using Serilog;
using Serilog.Sinks.PeriodicBatching;
namespace EntrustSettle.Serilog.Configuration;
public static class LogBatchingSinkConfiguration
{
public static LoggerConfiguration WriteToLogBatching(this LoggerConfiguration loggerConfiguration)
{
if (!AppSettings.app("AppSettings", "LogToDb").ObjToBool())
{
return loggerConfiguration;
}
var exampleSink = new LogBatchingSink();
var batchingOptions = new PeriodicBatchingSinkOptions
{
BatchSizeLimit = 500,
Period = TimeSpan.FromSeconds(1),
EagerlyEmitFirstEvent = true,
QueueLimit = 10000
};
var batchingSink = new PeriodicBatchingSink(exampleSink, batchingOptions);
return loggerConfiguration.WriteTo.Sink(batchingSink);
}
}

13
EntrustSettle.Serilog/EntrustSettle.Serilog.csproj
Unescape Escape View File

@ -1,13 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>NETSDK1206</NoWarn>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EntrustSettle.Common\EntrustSettle.Common.csproj" />
</ItemGroup>
</Project>

90
EntrustSettle.Serilog/Extensions/LoggerConfigurationExtensions.cs
Unescape Escape View File

@ -1,90 +0,0 @@
using EntrustSettle.Common.LogHelper;
using Serilog;
using Serilog.Events;
using Serilog.Filters;
using SqlSugar;
namespace EntrustSettle.Serilog.Extensions;
public static class LoggerConfigurationExtensions
{
public static LoggerConfiguration WriteToConsole(this LoggerConfiguration loggerConfiguration)
{
//输出普通日志
loggerConfiguration = loggerConfiguration.WriteTo.Logger(lg => lg.FilterRemoveSqlLog().WriteTo.Console());
//输出SQL
loggerConfiguration = loggerConfiguration.WriteTo.Logger(lg => lg.FilterSqlLog().Filter
.ByIncludingOnly(Matching.WithProperty<bool>(LogContextStatic.SqlOutToConsole, s => s))
.WriteTo
.Console());
return loggerConfiguration;
}
public static LoggerConfiguration WriteToFile(this LoggerConfiguration loggerConfiguration)
{
//输出SQL
loggerConfiguration = loggerConfiguration.WriteTo.Logger(lg => lg.FilterSqlLog()
.Filter
.ByIncludingOnly(Matching.WithProperty<bool>(LogContextStatic.SqlOutToFile, s => s))
.WriteTo
.Async(s => s.File(LogContextStatic.Combine(DateTime.Now.ToString("yyyyMMdd"), @$"AOPSql_{DateTime.Now.DateToTimeStamp()}.log"),
rollingInterval: RollingInterval.Day,
outputTemplate: LogContextStatic.FileMessageTemplate,
retainedFileCountLimit: 31)));
//输出普通日志
loggerConfiguration = loggerConfiguration.WriteTo.Logger(lg => lg.FilterRemoveSqlLog()
.WriteTo
.Async(s => s.File(LogContextStatic.Combine(DateTime.Now.ToString("yyyyMMdd"), @$"Log_{DateTime.Now.DateToTimeStamp()}.log"),
rollingInterval: RollingInterval.Day,
outputTemplate: LogContextStatic.FileMessageTemplate,
retainedFileCountLimit: 31)));
return loggerConfiguration;
}
public static LoggerConfiguration FilterSqlLog(this LoggerConfiguration lc)
{
lc = lc.Filter.ByIncludingOnly(Matching.WithProperty<string>(LogContextStatic.LogSource, s => LogContextStatic.AopSql.Equals(s)));
return lc;
}
public static IEnumerable<LogEvent> FilterSqlLog(this IEnumerable<LogEvent> batch)
{
//只记录 Insert、Update、Delete语句
return batch.Where(s => s.WithProperty<string>(LogContextStatic.LogSource, q => LogContextStatic.AopSql.Equals(q)))
.Where(s => s.WithProperty<SugarActionType>(LogContextStatic.SugarActionType,
q => !new[] { SugarActionType.UnKnown, SugarActionType.Query }.Contains(q)));
}
public static LoggerConfiguration FilterRemoveSqlLog(this LoggerConfiguration lc)
{
lc = lc.Filter.ByIncludingOnly(WithProperty<string>(LogContextStatic.LogSource, s => !LogContextStatic.AopSql.Equals(s)));
return lc;
}
public static IEnumerable<LogEvent> FilterRemoveOtherLog(this IEnumerable<LogEvent> batch)
{
return batch.Where(s => WithProperty<string>(LogContextStatic.LogSource,
q => !LogContextStatic.AopSql.Equals(q))(s));
}
public static Func<LogEvent, bool> WithProperty<T>(string propertyName, Func<T, bool> predicate)
{
//如果不包含属性 也认为是true
return e =>
{
if (!e.Properties.TryGetValue(propertyName, out var propertyValue)) return true;
return propertyValue is ScalarValue { Value: T value } && predicate(value);
};
}
public static bool WithProperty<T>(this LogEvent e, string key, Func<T, bool> predicate)
{
if (!e.Properties.TryGetValue(key, out var propertyValue)) return false;
return propertyValue is ScalarValue { Value: T value } && predicate(value);
}
}

135
EntrustSettle.Serilog/Sink/LogBatchingSink.cs
Unescape Escape View File

@ -1,135 +0,0 @@
using EntrustSettle.Common;
using EntrustSettle.Model.Logs;
using EntrustSettle.Serilog.Extensions;
using Mapster;
using Serilog.Events;
using Serilog.Sinks.PeriodicBatching;
using SqlSugar;
namespace EntrustSettle.Serilog.Sink;
public class LogBatchingSink : IBatchedLogEventSink
{
public async Task EmitBatchAsync(IEnumerable<LogEvent> batch)
{
var sugar = App.GetService<ISqlSugarClient>(false);
await WriteSqlLog(sugar, batch.FilterSqlLog());
await WriteLogs(sugar, batch.FilterRemoveOtherLog());
}
public Task OnEmptyBatchAsync()
{
return Task.CompletedTask;
}
#region Write Log
private async Task WriteLogs(ISqlSugarClient db, IEnumerable<LogEvent> batch)
{
if (!batch.Any())
{
return;
}
var group = batch.GroupBy(s => s.Level);
foreach (var v in group)
{
switch (v.Key)
{
case LogEventLevel.Information:
await WriteInformationLog(db, v);
break;
case LogEventLevel.Warning:
await WriteWarningLog(db, v);
break;
case LogEventLevel.Error:
case LogEventLevel.Fatal:
await WriteErrorLog(db, v);
break;
}
}
}
private async Task WriteInformationLog(ISqlSugarClient db, IEnumerable<LogEvent> batch)
{
if (!batch.Any())
{
return;
}
var logs = new List<GlobalInformationLog>();
foreach (var logEvent in batch)
{
var log = logEvent.Adapt<GlobalInformationLog>();
log.Message = logEvent.RenderMessage();
log.Properties = logEvent.Properties.ToJson();
log.DateTime = logEvent.Timestamp.DateTime;
logs.Add(log);
}
await db.AsTenant().InsertableWithAttr(logs).SplitTable().ExecuteReturnSnowflakeIdAsync();
}
private async Task WriteWarningLog(ISqlSugarClient db, IEnumerable<LogEvent> batch)
{
if (!batch.Any())
{
return;
}
var logs = new List<GlobalWarningLog>();
foreach (var logEvent in batch)
{
var log = logEvent.Adapt<GlobalWarningLog>();
log.Message = logEvent.RenderMessage();
log.Properties = logEvent.Properties.ToJson();
log.DateTime = logEvent.Timestamp.DateTime;
logs.Add(log);
}
await db.AsTenant().InsertableWithAttr(logs).SplitTable().ExecuteReturnSnowflakeIdAsync();
}
private async Task WriteErrorLog(ISqlSugarClient db, IEnumerable<LogEvent> batch)
{
if (!batch.Any())
{
return;
}
var logs = new List<GlobalErrorLog>();
foreach (var logEvent in batch)
{
var log = logEvent.Adapt<GlobalErrorLog>();
log.Message = logEvent.RenderMessage();
log.Properties = logEvent.Properties.ToJson();
log.DateTime = logEvent.Timestamp.DateTime;
logs.Add(log);
}
await db.AsTenant().InsertableWithAttr(logs).SplitTable().ExecuteReturnSnowflakeIdAsync();
}
private async Task WriteSqlLog(ISqlSugarClient db, IEnumerable<LogEvent> batch)
{
if (!batch.Any())
{
return;
}
var logs = new List<AuditSqlLog>();
foreach (var logEvent in batch)
{
var log = logEvent.Adapt<AuditSqlLog>();
log.Message = logEvent.RenderMessage();
log.Properties = logEvent.Properties.ToJson();
log.DateTime = logEvent.Timestamp.DateTime;
logs.Add(log);
}
await db.AsTenant().InsertableWithAttr(logs).SplitTable().ExecuteReturnSnowflakeIdAsync();
}
#endregion
}

73
EntrustSettle.Serilog/Utility/SerilogRequestUtility.cs
Unescape Escape View File

@ -1,73 +0,0 @@
using EntrustSettle.Common.Extensions;
using EntrustSettle.Common.Http;
using Microsoft.AspNetCore.Http;
using Serilog;
using Serilog.Events;
namespace EntrustSettle.Serilog.Utility;
public class SerilogRequestUtility
{
public const string HttpMessageTemplate =
"HTTP {RequestMethod} {RequestPath} QueryString:{QueryString} Body:{Body} responded {StatusCode} in {Elapsed:0.0000} ms";
private static readonly List<string> _ignoreUrl = new()
{
"/job",
};
private static LogEventLevel DefaultGetLevel(HttpContext ctx,
double _,
Exception ex)
{
return ex is null && ctx.Response.StatusCode <= 499 ? LogEventLevel.Information : LogEventLevel.Error;
}
public static LogEventLevel GetRequestLevel(HttpContext ctx, double _, Exception ex) =>
ex is null && ctx.Response.StatusCode <= 499 ? IgnoreRequest(ctx) : LogEventLevel.Error;
private static LogEventLevel IgnoreRequest(HttpContext ctx)
{
var path = ctx.Request.Path.Value;
if (path.IsNullOrEmpty())
{
return LogEventLevel.Information;
}
return _ignoreUrl.Any(s => path.StartsWith(s)) ? LogEventLevel.Verbose : LogEventLevel.Information;
}
/// <summary>
/// 从Request中增加附属属性
/// </summary>
/// <param name="diagnosticContext"></param>
/// <param name="httpContext"></param>
public static void EnrichFromRequest(IDiagnosticContext diagnosticContext, HttpContext httpContext)
{
var request = httpContext.Request;
diagnosticContext.Set("RequestHost", request.Host);
diagnosticContext.Set("RequestScheme", request.Scheme);
diagnosticContext.Set("Protocol", request.Protocol);
diagnosticContext.Set("RequestIp", httpContext.GetRequestIp());
if (request.Method == HttpMethods.Get)
{
diagnosticContext.Set("QueryString", request.QueryString.HasValue ? request.QueryString.Value : string.Empty);
diagnosticContext.Set("Body", string.Empty);
}
else
{
diagnosticContext.Set("QueryString", request.QueryString.HasValue ? request.QueryString.Value : string.Empty);
diagnosticContext.Set("Body", request.ContentLength > 0 ? request.GetRequestBody() : string.Empty);
}
diagnosticContext.Set("ContentType", httpContext.Response.ContentType);
var endpoint = httpContext.GetEndpoint();
if (endpoint != null)
{
diagnosticContext.Set("EndpointName", endpoint.DisplayName);
}
}
}

22
EntrustSettle.Tasks/QuartzNet/Jobs/JobHydStatusQuartz.cs
Unescape Escape View File

@ -104,7 +104,7 @@ namespace EntrustSettle.Tasks
// 将更新后的状态及费用推送到消息队列
if (AppSettings.app("RabbitMQ", "Enabled").ObjToBool())
{
_ = Task.Run(() =>
_ = Task.Run(async () =>
{
string msg = $"Id：[{order.Id}]，提单号：[{order.Mblno}]，自动更新状态后推送队列";
try
@ -127,16 +127,16 @@ namespace EntrustSettle.Tasks
_ => "未知状态",
}
};
//var feeList = await orderFeeService.Query(x => x.OrderId == order.Id);
//if (feeList.Count > 0)
//{
// pushDto.FeeList = feeList.Select(x => new StatusPushDto.FeeDto()
// {
// Id = x.Id,
// FeeName = x.Name,
// FeeAmount = x.Amount
// }).ToList();
//}
var feeList = await orderFeeService.Query(x => x.OrderId == order.Id);
if (feeList.Count > 0)
{
pushDto.FeeList = feeList.Select(x => new StatusPushDto.FeeDto()
{
FeeId = x.Id,
FeeName = x.Name,
FeeAmount = x.Amount
}).ToList();
}
var json = JsonConvert.SerializeObject(pushDto, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore });
queueService.Push(msg, order.CompanyId, json);

Write Preview
Loading…
Cancel
Save