Merge remote-tracking branch 'origin/master'

puzhibing

2025-04-25 0dcba4fd1cb536ab426622e31213d8a0194449ff

 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;
   }