pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-09 14:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(unipay): PaymentVerifyAspect 解析 messageKey 为本地化消息

Browse Source 
之前 catch BizException 后直接用 ex.getMessage() 作为 DaxResult.msg,
该值是 messageKey 原文 (如 'error.channel.alipay.payFailed'), 商户和运营日志
均看到原始 key 无法阅读。

改为通过 I18nUtil 按 Accept-Language 解析为本地化消息, 与 RestExceptionHandler
保持一致语义。日志 errorMsg 与响应 msg 同步受益。

旧日志保留 messageKey 原文 (args 参数已丢失无法恢复), 随保留策略自然淘汰。
This commit is contained in:
DaxPay Dev
2026-07-20 08:21:50 +08:00
parent d3a8991ba8
commit 0fec965c06
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java
View File

@@ -3,6 +3,7 @@ package cn.daxpay.open.payment.unipay.aop;
import cn.daxpay.open.payment.common.context.MerchantContextLoader;
import cn.daxpay.open.payment.common.result.DaxResult;
import cn.daxpay.open.payment.unipay.param.MerchantPaymentCommonParam;
import cn.daxpay.open.platform.common.i18n.util.I18nUtil;
import cn.daxpay.open.platform.common.json.util.JacksonUtil;
import cn.daxpay.open.platform.common.request.context.RequestContextHolder;
import cn.daxpay.open.platform.common.spring.util.WebServletUtil;
@@ -92,13 +93,15 @@ public class PaymentVerifyAspect {
try {
proceed = pjp.proceed();
} catch (BizException ex) {
DaxResult<Void> daxResult = new DaxResult<>(ex.getCode(), ex.getMessage());
// DaxResult.msg 按 Accept-Language 解析 messageKey 为本地化消息
// 否则商户和日志看到的都是 "error.channel.alipay.payFailed" 这种原始 key, 无法阅读
DaxResult<Void> daxResult = new DaxResult<>(ex.getCode(), resolveResponseMessage(ex));
enrichDaxResult(daxResult, reqId);
paymentSignService.sign(daxResult);
result = daxResult;
return daxResult;
}
// 对返回值添加响应时间、reqId/traceId 并进行签名
// 对返回值添加响应时间、reqId 并进行签名(traceId 走响应头, 不进 body)
if (proceed instanceof DaxResult<?> daxResult) {
daxResult.setResTime(OffsetDateTime.now(ZoneOffset.UTC));
enrichDaxResult(daxResult, reqId);
@@ -122,15 +125,27 @@ public class PaymentVerifyAspect {
}
}
/// 回写请求ID与链路追踪ID
/// 回写请求ID
///
/// traceId 不再写入响应体, 由 [cn.daxpay.open.platform.common.request.context.filter.TraceIdFilter]
/// 统一通过 `x-trace-id` 响应头返回, 供客户端关联排障。
private void enrichDaxResult(DaxResult<?> daxResult, String reqId) {
if (StrUtil.isNotBlank(reqId)) {
daxResult.setReqId(reqId);
}
String traceId = resolveTraceId();
if (StrUtil.isNotBlank(traceId)) {
daxResult.setTraceId(traceId);
}
/// 解析异常消息用于响应(按请求 Accept-Language 国际化)
///
/// [BizException#getMessage] 返回的是 messageKey 原文(如 "error.channel.alipay.payFailed"),
/// 需通过 [I18nUtil] 解析为本地化消息(如 "支付宝支付异常: 余额不足"),
/// 与 [cn.daxpay.open.platform.system.handler.exception.RestExceptionHandler] 的响应消息保持一致语义。
private String resolveResponseMessage(BizException ex) {
String messageKey = ex.resolveMessageKey();
if (messageKey != null) {
return I18nUtil.get(messageKey, ex.getArgs());
}
return ex.getMessage();
}
/// 组装并发布审计事件