From b81733b0110c1b21ce833afa604032ae28a62888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Wed, 27 Mar 2024 11:03:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?change=EF=BC=9A=E8=BD=A8=E8=BF=B9=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E4=B8=8D=E5=81=9A=E5=B9=82=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SJZY.Track.Application/EventHandlers/CAPFilter.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs b/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs index feaf198f..46bd4093 100644 --- a/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs +++ b/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs @@ -3,6 +3,7 @@ using DotNetCore.CAP.Filter; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Track.Domain.Consts; namespace SJZY.Track.Application.EventHandlers; @@ -17,6 +18,8 @@ public class CAPFilter : SubscribeFilter /// public override Task OnSubscribeExecutingAsync(ExecutingContext context) { + if (context.DeliverMessage.Headers["cap-msg-name"]!.EndsWith(GlobalConst.TrackRefreshSubscribe)) + return Task.CompletedTask; var argumentJsonStr = context.Arguments.ToJson(); context.DeliverMessage.Headers["sjzy-receive-time"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff"); From dcc7ec59183543dee8f47de88ac03a0f77999b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Wed, 27 Mar 2024 11:09:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?opt=EF=BC=9A=E7=BE=8E=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/CAPFilter.cs | 12 ++++++------ .../SjzyTrackApplicationModule.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs b/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs index 46bd4093..97451ed8 100644 --- a/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs +++ b/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs @@ -7,9 +7,9 @@ using SJZY.Track.Domain.Consts; namespace SJZY.Track.Application.EventHandlers; -public class CAPFilter : SubscribeFilter +public class CapFilter : SubscribeFilter { - const string _ERROR_CODE = "Error599"; + const string ErrorCode = "Error599"; /// /// 执行前 @@ -32,7 +32,7 @@ public class CAPFilter : SubscribeFilter { var isSkip = !string.IsNullOrEmpty(RedisHelper.Client.Get($"CapExcuteFilter:{hash}")); if (isSkip) - throw new BusinessException(_ERROR_CODE, $"检测到重复消费,消费参数：{argumentJsonStr}"); + throw new BusinessException(ErrorCode, $"检测到重复消费,消费参数：{argumentJsonStr}"); RedisHelper.Client.Set($"CapExcuteFilter:{hash}", 60 * 10, TimeSpan.FromHours(1).Seconds); // 1h内不允许一模一样的参数重复消费 @@ -54,7 +54,7 @@ public class CAPFilter : SubscribeFilter context.DeliverMessage.Headers.TryGetValue("sjzy-arguments", out var arguments); context.DeliverMessage.Headers.TryGetValue("cap-msg-id", out var messageId); - BuildLog(receiveTime, receiveName, arguments, false, messageId); + BuildLog(receiveTime!, receiveName!, arguments!, false, messageId!); return Task.CompletedTask; } @@ -70,7 +70,7 @@ public class CAPFilter : SubscribeFilter context.ExceptionHandled = true; context.DeliverMessage.Headers.TryGetValue("cap-msg-id", out var messageId); - if (context.Exception is BusinessException ex && ex.Code == _ERROR_CODE) + if (context.Exception is BusinessException ex && ex.Code == ErrorCode) LogHelper.Warn(ex.ToString()); else LogHelper.Error($"cap-msg-id：{messageId}\n{context.Exception}"); @@ -80,7 +80,7 @@ public class CAPFilter : SubscribeFilter context.DeliverMessage.Headers.TryGetValue("cap-msg-name", out var receiveName); context.DeliverMessage.Headers.TryGetValue("sjzy-arguments", out var arguments); - BuildLog(receiveTime, receiveName, arguments, true, messageId); + BuildLog(receiveTime!, receiveName!, arguments!, true, messageId!); return Task.CompletedTask; } diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs index 2b1649a1..28f3329c 100644 --- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs +++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs @@ -111,7 +111,7 @@ namespace SJZY.Track.Application LogHelper.Error("【严重】CAP失败回调事件发生未处理异常" + ex); } }; - }).AddSubscribeFilter(); + }).AddSubscribeFilter(); } public override void PreConfigureServices(ServiceConfigurationContext context) From 41755830f684b1da03c6a7bdf92191d2d7522b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Wed, 27 Mar 2024 14:51:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E8=BD=A8=E8=BF=B9=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E9=BB=98=E8=AE=A4=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackUpsertEventHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs index 031356d8..c1b19b5f 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs @@ -129,7 +129,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe IsCanDelete = false, OriginTrackContent = @event.OriginTrackContent, OriginTrackData = @event.OriginTrackData, - CreateUser = @event.OperationMan, + CreateUser = @event.OperationMan ?? "系统", CreateTime = DateTime.Now };