From 0dcba4fd1cb536ab426622e31213d8a0194449ff Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 14:12:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPConnectReq.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPConnectReq.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPConnectReq.java
index 84fe2f9..0955f77 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPConnectReq.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPConnectReq.java
@@ -34,10 +34,14 @@
 	 * 解析登录报文
 	 */
 	public UPConnectReq decode(ByteBuf byteBuf) {
-		this.userId = byteBuf.readInt();
-		this.password = Jtt809Util.readGBKString(byteBuf, 8);
-		this.downLinkIp = Jtt809Util.readGBKString(byteBuf, 32);
-		this.downLinkPort = byteBuf.readUnsignedShort();
+		try {
+			this.userId = byteBuf.readInt();
+			this.password = Jtt809Util.readGBKString(byteBuf, 8);
+			this.downLinkIp = Jtt809Util.readGBKString(byteBuf, 32);
+			this.downLinkPort = byteBuf.readUnsignedShort();
+		}catch (Exception e){
+			e.printStackTrace();
+		}
 		return this;
 	}
 	

--
Gitblit v1.7.1