From c0ceef9f86c0abb288ade6a7770c02326848f8a4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 二月 2025 13:58:37 +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 | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 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 b3e724e..2bc2f07 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
@@ -3,6 +3,7 @@
import cn.hutool.http.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.common.utils.JacksonUtils;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.integration.drainage.kuaidian.model.NotificationStationChangeResult;
import com.ruoyi.integration.drainage.kuaidian.model.StationChange;
@@ -11,6 +12,7 @@
import com.ruoyi.other.api.domain.Operator;
import com.ruoyi.other.api.feignClient.OperatorClient;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
import java.time.Instant;
import java.time.LocalDateTime;
@@ -19,6 +21,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -29,10 +32,9 @@
@Slf4j
public class TCECUtil {
-// private static OperatorClient operatorClient = SpringUtils.getBean(OperatorClient.class);
-
- public static Map<Long, Integer> map = new HashMap<>();
-
+ private static OperatorClient operatorClient = SpringUtils.getBean(OperatorClient.class);
+
+
/**
* 获取token
@@ -60,7 +62,7 @@
LocalDateTime localDateTime = Instant.ofEpochSecond(tokenAvailableTime).atOffset(ZoneOffset.UTC).toLocalDateTime();
operator.setAccessToken(token);
operator.setTokenAvailableTime(localDateTime);
-// operatorClient.editOperator(operator);
+ operatorClient.editOperator(operator);
return token;
}
@@ -205,33 +207,20 @@
*/
public static void buildBody(HttpRequest post, Object o, Operator operator){
Long timeStamp = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
- Integer integer = map.get(timeStamp);
- if(null == integer){
- integer = 1;
- }else{
- integer++;
- }
- map.put(timeStamp, integer);
post.contentType("application/json;charset=utf-8");
post.header("Authorization", "Bearer " + getToken(operator));
BaseRequest baseRequest = new BaseRequest();
baseRequest.setOperatorID(operator.getOurOperatorId());
baseRequest.setTimeStamp(timeStamp);
- baseRequest.setSeq(String.format("%04d", integer));
- String jsonString = JSON.toJSONString(o);
- String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ baseRequest.setSeq("0001");
+ String jsonString = JacksonUtils.toJson(o);
+ String encrypt = AESUtil.encrypt(jsonString, operator.getDataSecret(), operator.getDataSecretIv());
baseRequest.setData(encrypt);
baseRequest.setOperator(operator);
- baseRequest.setSig(ourBuildSign(baseRequest));
+ baseRequest.setSig(buildSign(baseRequest));
post.body(JSON.toJSONString(baseRequest));
- //清空小于当前时间的map中的无效数据
- for (Long k : map.keySet()) {
- if(k <= (timeStamp - 10)){
- map.remove(k);
- }
- }
}
-
+
/**
* 构建签名字符串
@@ -240,6 +229,9 @@
*/
public static String buildSign(BaseModel model){
Operator operator = model.getOperator();
+ if(null == operator){
+ return "";
+ }
//签名秘钥SigSecret
String key = operator.getSigSecret();
String sign = "";
@@ -267,13 +259,16 @@
*/
public static String ourBuildSign(BaseModel model){
Operator operator = model.getOperator();
+ if(null == operator){
+ return "";
+ }
//签名秘钥SigSecret
String key = operator.getOurSigSecret();
String sign = "";
switch (operator.getName()){
case "XinDianTu":
//进行字符串拼接、计算
- String m = new StringBuilder(operator.getOurOperatorId()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
+ String m = new StringBuilder(model.getOperatorID()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
byte[] hmacMd5 = SignUtil.getHMacMD5Bytes(key.getBytes(), m.getBytes());
// 打印计算得到的签名Sig
sign = SignUtil.bytesToHexString(hmacMd5);
@@ -284,12 +279,13 @@
}
return sign;
}
+
public static void main(String[] args) {
BaseModel model = new BaseModel();
model.setOperatorID("MA25CNM38");
- model.setData("lkQUXmphG3h5Wf0UIxSfzNoCdqDLYkmDGceCbofJuWFqKBwCYulTUHSn9bJpVMVFNji/4xtSq3o1U5jSZZwIhA==");
+ model.setData("AoArdDDcmHcmOMkCLHodTpY1xLtt9yhLqxvKPyfdlmEOBj1LJnQM+Z4JOZllt3Pj9rubfgxJ51zMAfzquQegJzHGAT9Y7JrKFzFe6jGtXo0=");
model.setTimeStamp(20250205120800L);
model.setSeq("0001");
Operator operator = new Operator();
@@ -297,11 +293,29 @@
operator.setSigSecret("S94xUpTpOIlLJBk8");
model.setOperator(operator);
String key = operator.getSigSecret();
-
+
String m = new StringBuilder(model.getOperatorID()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
byte[] hmacMd5 = SignUtil.getHMacMD5Bytes(key.getBytes(), m.getBytes());
// 打印计算得到的签名Sig
String s = SignUtil.bytesToHexString(hmacMd5);
System.err.println(s);
+
+
+// BaseModel model = new BaseModel();
+// model.setOperatorID("MA25CNM38");
+// model.setData("xQYYEPiwoc4JENnQsF50qP6Tmnj7uU/AshWn3QbIgrMIk8zvFpy6fWLIiLzQHcLPFCihqH1uzoNhGVNcS8Wvf5gIx9+cWJvYtjwtsjAGMEwNQ6y+rF1jjKnqCNcQbHbhqJ2l76sD54QCFKyenKxymrXri19bDV8hizn3nBw+jcHBtqKHWzjdSHwPDWPIw4rXnrbWLya2PXVgYtVg93WPtliw+0xsqW0BxJamE70/Ilbg4wB5fOAOvXmbLFI+v9jRjpcA7ImhprqPMYkXYAfa2QlICrJEBK7DfpJvRMzKzeT90kOAITqIqFvbfV0ti+greRqToLP6ni4o6w3ID42UmKasIpLTnx+qtR4bVTBTRuDzXvNXDA92RqHaJO21xbSen1eHN/yGfrchBIM0gmav7EpaYAerfU4ubnmJ6xujR6okYepJwBD5DiSIrObfS+GWVPRekvnjvm7BC02NXTrGKA==");
+// model.setTimeStamp(20250205161426L);
+// model.setSeq("0001");
+// Operator operator = new Operator();
+// operator.setOurOperatorId("2921700136");
+// operator.setOurSigSecret("KBm5J2fbGzyhX023");
+// model.setOperator(operator);
+// String key = operator.getOurSigSecret();
+//
+// String m = new StringBuilder(operator.getOurOperatorId()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
+// byte[] hmacMd5 = SignUtil.getHMacMD5Bytes(key.getBytes(), m.getBytes());
+// // 打印计算得到的签名Sig
+// String s = SignUtil.bytesToHexString(hmacMd5);
+// System.err.println(s);
}
}
--
Gitblit v1.7.1