From 6b04b11e9ff6ae5b7e2dd2b642983cf81a402f90 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Thu, 28 May 2026 17:51:41 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1041 // http://jira.mfd.msk:8088/browse/CLS-1042 --- .../backendapi/filter/RequestCachingFilter.java | 8 +++++++- .../management/listener/OrderCurrencyListener.java | 5 +++++ .../listener/OvernightSettingsListener.java | 5 +++++ .../dflt/management/listener/TaskListener.java | 5 +++++ .../management/service/SwapOvernightOrderService.java | 4 +++- .../platform/messaging/service/QueueConsumer.java | 11 +++++++++++ 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/filter/RequestCachingFilter.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/filter/RequestCachingFilter.java index 4128b880d..cd9d1eb84 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/filter/RequestCachingFilter.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/filter/RequestCachingFilter.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.filter.OncePerRequestFilter; @@ -26,7 +27,6 @@ public class RequestCachingFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { CachedHttpServletRequest cachedHttpServletRequest = new CachedHttpServletRequest(request); - if (log.isDebugEnabled()) { log.debug("received {} request, destination '{}', body: {}", request.getMethod(), @@ -37,6 +37,12 @@ public class RequestCachingFilter extends OncePerRequestFilter { filterChain.doFilter(cachedHttpServletRequest, response); } + @Override + protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException { + return request.getServletPath().equals("/login") || + RequestMethod.GET.name().equals(request.getMethod()); + } + private static String removeWhiteSpaces(byte[] cachedPayload) { if (cachedPayload == null || cachedPayload.length == 0) { return "[empty]"; diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java index 0567a6095..b821b644e 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java @@ -513,4 +513,9 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing String digits = parts[2]; return Long.valueOf(digits); } + + @Override + protected boolean isEnableRequestLogging() { + return true; + } } diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OvernightSettingsListener.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OvernightSettingsListener.java index c43b58182..5856ef39e 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OvernightSettingsListener.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OvernightSettingsListener.java @@ -97,4 +97,9 @@ public class OvernightSettingsListener extends QueueConsumer implements Initiali log.info("updated overnight system request.id[{}]: {}/{}/{}", os.getId(), os.getCompanyId(), os.getMarket(), os.getOvernightType()); return null; } + + @Override + protected boolean isEnableRequestLogging() { + return true; + } } diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java index 6230b0511..0afd23839 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java @@ -239,4 +239,9 @@ public class TaskListener extends QueueConsumer implements InitializingBean { newReq.setComment(comment); kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, newReq); } + + @Override + protected boolean isEnableRequestLogging() { + return true; + } } diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOvernightOrderService.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOvernightOrderService.java index 7397866bc..d20afb37b 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOvernightOrderService.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOvernightOrderService.java @@ -77,7 +77,9 @@ public class SwapOvernightOrderService { FinalCalculationResult finalCalculationResult = swapCalculationService.calcAndEnrichSwap(SettleCode.T1, context); if (CurrencyCode.RUB == currency && finalCalculationResult.calculationResult().sum3().compareTo(BigDecimal.ZERO) >= 0) { - log.warn("QuantityLot greater than zero; skip forming order currency"); + log.warn("QuantityLot greater than zero :{}; skip forming order currency by registry: {}", + finalCalculationResult.calculationResult().sum3(), + registry.getId()); return; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java index 1e86f5c0b..1bd9b0487 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java @@ -103,6 +103,8 @@ public class QueueConsumer implements AutoCloseable { ConsumerSpecificClass callback = callbacks.get(next.topic()); Class clazz = callback.getClazz(); JavaType payloadType = json.getTypeFactory().constructParametricType(BaseRequest.class, clazz); + String msg = (String) next.value(); + loggingReq(lastTopic, msg); o = json.readValue((String) next.value(), payloadType); if (correlationId != null) { ((BaseRequest) o).setCorrelationId(correlationId.value()); @@ -210,7 +212,16 @@ public class QueueConsumer implements AutoCloseable { return ConsumerSpecificClass.build(clazz); } + private void loggingReq(String topic, String msg){ + if (isEnableRequestLogging()) { + log.debug("Kafka message received | topic='{}' | payload={}", + topic, msg); + } + } + protected boolean isEnableRequestLogging() { + return false; + } /** * Валидация запроса *