From d473652b8a9284b8598f24b95922bbd5b608874b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 26 Aug 2025 21:34:34 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java b/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java
index b2a80cb..1bb9545 100644
--- a/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java
+++ b/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java
@@ -27,8 +27,11 @@
throw new BadRequestException(e1.getMessage());
}
} else {
- if (status.equals(PayTypeEnum.HWC)) {
- return MD5.sign(preStr, "&key=" + properties.getKey(), "utf-8");
+ switch (status) {
+ case HWC:
+ return MD5.sign(preStr, "&key=" + properties.getKey(), "utf-8");
+ case HWC2:
+ return MD5.sign(preStr, "&key=" + properties.getKey2(), "utf-8");
}
throw new BadRequestException("汇旺财类型错误");
}
@@ -45,8 +48,11 @@
String preStr = builder.toString();
return !SignUtil.verifySign(preStr, sign, "RSA_1_256", properties.getPlatPublicKey());
} else if ("MD5".equals(signType)) {
- if (status.equals(PayTypeEnum.HWC)) {
- return !SignUtils.checkParam(resultMap, properties.getKey());
+ switch (status) {
+ case HWC:
+ return !SignUtils.checkParam(resultMap, properties.getKey());
+ case HWC2:
+ return !SignUtils.checkParam(resultMap, properties.getKey2());
}
throw new BadRequestException("汇旺财类型错误");
}
--
Gitblit v1.9.3