This commit is contained in:
2024-04-01 16:30:50 +08:00
parent 3e3ed49dfa
commit b9276166e8
2 changed files with 70 additions and 9 deletions

View File

@@ -351,6 +351,7 @@ public class LianLianController extends BaseController {
/**
* 请求设备认证
*
* @param request
* @param dto
* @return
@@ -360,11 +361,11 @@ public class LianLianController extends BaseController {
logger.info("联联平台请求设备认证 param:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
if (!JWTUtils.checkThirdPartyToken(token)) {
// 校验失败
return CommonResult.failed("令牌校验错误");
}
// String token = request.getHeader("Authorization");
// if (!JWTUtils.checkThirdPartyToken(token)) {
// // 校验失败
// return CommonResult.failed("令牌校验错误");
// }
// 校验签名
// Map<String, String> resultMap = lianLianService.checkoutSign(dto);
// if (resultMap == null) {
@@ -384,8 +385,9 @@ public class LianLianController extends BaseController {
String dataSecretIV = platformConfig.getDataSecretIv();
// 解密data
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());
String dataStr = new String(plainText, StandardCharsets.UTF_8);
// byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());
// String dataStr = new String(plainText, StandardCharsets.UTF_8);
String dataStr = Cryptos.decrypt(dto.getData(), dataSecret, dataSecretIV);
// 转换成相应对象
QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class);
queryEquipmentDTO.setOperatorID(dto.getOperatorID());
@@ -394,8 +396,7 @@ public class LianLianController extends BaseController {
return CommonResult.success(0, "请求设备认证成功!", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("联联平台请求设备认证 error:", e);
e.printStackTrace();
logger.error("联联平台请求设备认证 error:", e);
}
return CommonResult.failed("请求设备认证发生异常");
}