From 4abcc3dfc43c5c9c58bdaf8bd85df129467a60ed Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 01 五月 2026 15:35:48 +0800
Subject: [PATCH] 多加入参数和修改规则
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
index 58ed501..c98199f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
@@ -244,13 +244,11 @@
updateAfterNotify(row, mergedBody, res, nextRetry, now, row.getMaxRetryCount());
}
} catch (FeignException e) {
- String responseBody = e.contentUTF8();
- String fullMsg = "status=" + e.status() + "锛宮essage=" + e.getMessage()
- + (responseBody == null || responseBody.isEmpty() ? "" : "锛宺esponseBody=" + responseBody);
- log.warn("浜戜粨涓婃姤鍚屾壒鍚堝苟璇锋眰澶辫触锛歿}", fullMsg);
+ String err = feignErrorSummary(e);
+ log.warn("浜戜粨涓婃姤鍚屾壒鍚堝苟璇锋眰澶辫触锛歿}", err);
for (CloudWmsNotifyLog row : group) {
int nextRetry = (row.getRetryCount() == null ? 0 : row.getRetryCount()) + 1;
- setFailResult(row, mergedBody, "璇锋眰寮傚父: " + fullMsg, nextRetry, now, row.getMaxRetryCount());
+ setFailResult(row, mergedBody, "璇锋眰寮傚父: " + err, nextRetry, now, row.getMaxRetryCount());
}
} catch (Exception e) {
log.warn("浜戜粨涓婃姤鍚屾壒鍚堝苟璇锋眰澶辫触锛歿}", e.getMessage());
@@ -259,6 +257,15 @@
setFailResult(row, mergedBody, "璇锋眰寮傚父: " + e.getMessage(), nextRetry, now, row.getMaxRetryCount());
}
}
+ }
+
+ /** 鎵撳嵃鍏ㄩ儴杩斿洖鏃ュ織 */
+ private static String feignErrorSummary(FeignException e) {
+ String body = e.contentUTF8();
+ if (body != null && !body.trim().isEmpty()) {
+ return "status=" + e.status() + "锛宺esponseBody=" + body.trim();
+ }
+ return "status=" + e.status() + "锛宮essage=" + e.getMessage();
}
private static List<Long> idsOf(List<CloudWmsNotifyLog> group) {
@@ -321,11 +328,9 @@
log.warn("浜戜粨涓婃姤璇锋眰浣撳弽搴忓垪鍖栧け璐ワ紝id={}锛歿}", logRecord.getId(), e.getMessage());
setFailResult(logRecord, requestBody, "鍙嶅簭鍒楀寲澶辫触: " + e.getMessage(), nextRetry, now, effectiveMaxRetry);
} catch (FeignException e) {
- String responseBody = e.contentUTF8();
- String fullMsg = "status=" + e.status() + "锛宮essage=" + e.getMessage()
- + (responseBody == null || responseBody.isEmpty() ? "" : "锛宺esponseBody=" + responseBody);
- log.warn("浜戜粨涓婃姤璇锋眰澶辫触锛宨d={}锛宐izRef={}锛歿}", logRecord.getId(), logRecord.getBizRef(), fullMsg);
- setFailResult(logRecord, requestBody, "璇锋眰寮傚父: " + fullMsg, nextRetry, now, effectiveMaxRetry);
+ String err = feignErrorSummary(e);
+ log.warn("浜戜粨涓婃姤璇锋眰澶辫触锛宨d={}锛宐izRef={}锛歿}", logRecord.getId(), logRecord.getBizRef(), err);
+ setFailResult(logRecord, requestBody, "璇锋眰寮傚父: " + err, nextRetry, now, effectiveMaxRetry);
} catch (Exception e) {
log.warn("浜戜粨涓婃姤璇锋眰澶辫触锛宨d={}锛宐izRef={}锛歿}", logRecord.getId(), logRecord.getBizRef(), e.getMessage());
setFailResult(logRecord, requestBody, "璇锋眰寮傚父: " + e.getMessage(), nextRetry, now, effectiveMaxRetry);
--
Gitblit v1.9.1