From 697582a7e65e6110a22dad7bc8241d25fe3ecc51 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 12 二月 2025 10:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java
index 54980d9..8d147f0 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java
@@ -297,7 +297,10 @@
 				sign = SignUtil.bytesToHexString(hmacMd5);
 				break;
 			case "KuaiDian":
-				sign = SignUtil.hmacSign(model.getData(), key);
+				//进行字符串拼接、计算
+				String m1 = new StringBuilder(model.getOperatorID()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
+				// 打印计算得到的签名Sig
+				sign = SignUtil.hmacSign(m1, key);
 				break;
 		}
 		return sign;
@@ -327,7 +330,9 @@
 				sign = SignUtil.bytesToHexString(hmacMd5);
 				break;
 			case "KuaiDian":
-				sign = SignUtil.hmacSign(model.getData(), key);
+				//进行字符串拼接、计算
+				String m1 = new StringBuilder(model.getOperatorID()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
+				sign = SignUtil.hmacSign(m1, key);
 				break;
 		}
 		return sign;

--
Gitblit v1.7.1