This commit is contained in:
Lemon
2023-10-26 16:43:29 +08:00
parent 10d5636c56
commit 97370c731b
2 changed files with 10 additions and 4 deletions

View File

@@ -220,7 +220,7 @@ public class LianLianServiceImpl implements LianLianService {
String dataSecret = "vj3RWNsWIxT5MC2K";
String dataSecretIV = "jjkySnGlM3pbOUki";
String signSecret = "NbELMbWtbHikNSlu";
String dataString = "mEhhmsDkfUqvcqHU4q2PenqtuqwbcOm7N/T+Q3ksPj8tN8ZaGPsJdACfxTErWhfZA+MLmXsSiwI8bagKUtXA94a7fe2aRrp/b6K4Os6vl/wYfgDR+mlHDJ0OODHZd+aMoBCyTQJJAg/WygxJ1LqTTB8IaB4N7/+nqxzsDyBVORgVXvRuWc3QYR9cF7u9YPUf/rQbZgN6vVle33LBJthjjWZWL0UkoN3rTrHEyAUu+bmbDztu0wayvj9GEaQB3ljcPhFrwmpoC5OqY2+ykIOKHzhaqFqCxFC69Eu3R26Irs9XNSWuw7W3q+CBDOHLq+MZR5tkxgGO8j035tM7lG21B6xB7ZoG+o+hsY9U/NotUes=";
String dataString = "HcKHxaIiuG7H/PUavhtbRg2CNRSJ6X7pTgwKJNdx768+fw0WLo+h5LZEWcAMAOy+DYBQRB6GE9rybFTTTA6dIL1c3OlIBjp/1yoomTNqMlY=";
// 解密data
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());
String dataStr = new String(plainText, StandardCharsets.UTF_8);
@@ -512,10 +512,13 @@ public class LianLianServiceImpl implements LianLianService {
.equipmentStatsInfos(equipmentStatsInfoList) // 设备列表
.build();
Map<String, Object> map = new LinkedHashMap<>();
map.put("StationStats", stationStatsInfo);
// 加密
Map<String, String> resultMap = Maps.newLinkedHashMap();
// 加密数据
byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(stationStatsInfo).getBytes(),
byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(),
configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes());
String encryptData = Encodes.encodeBase64(encryptText);

View File

@@ -110,7 +110,7 @@ public class HttpRequestUtil {
byte[] encryptText = Cryptos.aesEncrypt(data.getBytes(),
dataSecret.getBytes(), dataSecretIV.getBytes());
String encryptData = Encodes.encodeBase64(encryptText);
System.out.println("加密数据:" + encryptData);
log.info("联联平台发送请求 加密数据:" + encryptData);
Map<String, String> params = Maps.newLinkedHashMap();
params.put("OperatorID", operatorId);
@@ -121,7 +121,7 @@ public class HttpRequestUtil {
params.put("Sig", sign);
String postData = JSON.toJSONString(params);
log.info("联联平台发送请求 最终提交数据:{}", postData);
log.info("联联平台发送请求 最终提交数据:{}, 加密数据:{}", params, postData);
// System.out.println("最终提交数据:" + postData);
String hutoolRequest = HttpRequest.post(url).header("Authorization", "Bearer " + token).body(postData).execute().body();
@@ -129,6 +129,9 @@ public class HttpRequestUtil {
log.info("联联平台发送请求 接收到返回数据:{}", hutoolRequest);
// System.out.println("接收到返回数据:" + hutoolRequest);
if (StringUtils.isBlank(hutoolRequest)) {
return "返回数据为空";
}
Map<String, Object> map = (Map<String, Object>) JSON.parse(hutoolRequest);
log.info("联联平台发送请求 返回数据map:{}", JSON.toJSONString(map));