From de2fafa2e1fc28b7f1780b5ebb27feaeed0ef0c6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 06 一月 2025 15:36:45 +0800
Subject: [PATCH] 1、王江海协议上线解析中未把版本号放入IoSession中的问题解决; 2、配置文件调整与统一

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
index 172cae9..e6ea9c8 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
@@ -15,6 +15,7 @@
     public String softFileName ;//鍗囩骇绋嬪簭鏂囦欢鍚�
     public String softStoreAddr ;//鍗囩骇绋嬪簭瀛樻斁鍦板潃
     public String softStartAddr ;//绋嬪簭瑕嗙洊璧峰鍦板潃
+    public String softFileData64 ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁扮粍
     public byte[] softFileData ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁扮粍
     public Integer softBytesCalculate ;//鏍规嵁鍏紡璁$畻寰楀埌鐨勬湁鏁堝崌绾х▼搴忓瓧鑺傛暟
     public Integer softByteSrc16 ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁癈RC16鏍¢獙鍊�
@@ -27,10 +28,11 @@
                 "   鍗囩骇绋嬪簭鏂囦欢鍚�=" + softFileName + "\n" +
                 "   鍗囩骇绋嬪簭瀛樻斁鍦板潃=" + softStoreAddr + "\n" +
                 "   绋嬪簭瑕嗙洊璧峰鍦板潃=" + softStartAddr + "\n" +
-                "   鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁�=" + softFileData.length + "\n" +
+                "   鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁�(base64)=" + softFileData64 + "\n" +
                 "   鍏紡璁$畻绋嬪簭瀛楄妭鏁�=" + softBytesCalculate +
                 "   绋嬪簭CRC16鏍¢獙鍊�=" + softByteSrc16 + "\n" +
                 "   鍗囩骇鎺у埗鍣ㄦ暟閲�=" + rtuAddrList.size() + "\n" +
                 "   鍗囩骇鐘舵�侀�氱煡URL=" + callbackWebUrl + "\n" ;
     }
+
 }

--
Gitblit v1.8.0