diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 50579ef21..e20dc5334 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -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 map = new LinkedHashMap<>(); + map.put("StationStats", stationStatsInfo); + // 加密 Map 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); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java index a05aa0d3b..61e7c6f0d 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java @@ -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 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 map = (Map) JSON.parse(hutoolRequest); log.info("联联平台发送请求 返回数据map:{}", JSON.toJSONString(map));