From f8baacdc380862ba8ca2520ba9f9bd91b8dd5502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E4=B8=99?= Date: Sat, 22 Mar 2025 00:50:46 +0800 Subject: [PATCH] bug fix --- .../app/service/impl/DefaultPileProtocolService.java | 2 ++ .../YunKuaiChongProtocolMessageProcessor.java | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java index b82f0bc..5889b77 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java @@ -106,6 +106,8 @@ public class DefaultPileProtocolService implements PileProtocolService { heartBeatRequest.getNodeRestPort(), heartBeatRequest.getNodeGrpcPort()); } + + callback.onSuccess(); } private void cacheSession(UplinkQueueMessage uplinkQueueMessage, diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java index 499915d..6c92654 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java @@ -118,12 +118,15 @@ public class YunKuaiChongProtocolMessageProcessor extends ProtocolMessageProcess return; } + // 读取两字节校验域 byte[] byCheckSum = new byte[2]; in.readBytes(byCheckSum); - ByteBuf csTemp = Unpooled.copiedBuffer(byCheckSum); - // 校验校验和 - int checkSum = csTemp.readUnsignedShort(); + ByteBuf csTemp = Unpooled.buffer(); + csTemp.writeBytes(byCheckSum); + + // 校验校验和，先用小端获取做短路校验 + int checkSum = csTemp.readUnsignedShortLE(); byte[] checkData = new byte[dataLength]; @@ -133,7 +136,7 @@ public class YunKuaiChongProtocolMessageProcessor extends ProtocolMessageProcess if (Boolean.FALSE.equals(checkResult.getFirst())) { csTemp.writeBytes(byCheckSum); - checkSum = csTemp.readUnsignedShortLE(); + checkSum = csTemp.readUnsignedShort(); checkResult = checkCrcSum(checkData, checkSum); log.debug("云快充检验和 第二次检查: checkResult:{}, checkSum:{}", checkResult, checkSum); }