修改消息编码错误

Author: lamborc

src/main/java/com/nbs/ui/panels/ContactsPanel.java

@@ -205,11 +205,11 @@ private void subWorld(long sleeps){
                             logger.info("消息为自己所发消息："+json+">>>>>"+AppMainWindow.currentPeerInfo().getPeerID());
                             //不处理
                         }else {
-                            imessage.setTime(DateHelper.currentTime());
-                            //处理消息
-                            proccessIpfsMessage(imessage);
-                        }
 
+                        }
+                        imessage.setTime(DateHelper.currentTime());
+                        //处理消息
+                        proccessIpfsMessage(imessage);
                         size.set(currSize);
                     }else {
 
@@ -235,6 +235,7 @@ private void proccessIpfsMessage(IpfsMessage im){
         im = Base64CodecUtil.parseIpmsMessageCtrlType(im);
         switch (types){
             case online:
+
                 /**
                  * $ON.B64.J$eyJpZCI6IlFtU29BaURTR1g0dnFaZWcyS29ESHNKcEZTR1AyU21hRXQxM05CUFJGZ3BRZnkiLCJuaWNrIjoiTkJTQ2hhaW5fbGFuYmVyeSJ9$
                  * 解析更新列表
@@ -246,9 +247,9 @@ private void proccessIpfsMessage(IpfsMessage im){
                 }
                 parseOnline(peerInfo,im.getFrom());
                 break;
-            case normal:
-
+            case pctrl:
                 break;
+            case normal:
             case unkonw:
             default:
                 im.setContents(Base64CodecUtil.decode(im.getContents()));

src/main/java/com/nbs/utils/Base64CodecUtil.java

@@ -75,7 +75,7 @@ public static boolean isBase64encode(String base64Str){
     public static String decodeIPFSMsg(String encodeStr){
         if(isBase64encode(encodeStr)){
             int len = encodeStr.length();
-            encodeStr = encodeStr.substring(BASE64_START.length(),len-2);
+            encodeStr = encodeStr.substring(BASE64_START.length(),len-1);
             return decode(encodeStr);
         }else {
             return encodeStr;
@@ -99,7 +99,7 @@ public PeerBoradcastInfo parseFromIm(IpfsMessage message) throws IllegalIPFSMess
                 throw new IllegalIPFSMessageException("message data not online type message");
             }
             int len = jsonData.length();
-            message.setContents(jsonData.substring(CtrlTypes.online.getPreffixLength(),len-2));
+            message.setContents(jsonData.substring(CtrlTypes.online.getPreffixLength(),len-1));
         }
         PeerBoradcastInfo res = JSON.parseObject(message.getContents(),PeerBoradcastInfo.class);
         return res;
@@ -137,17 +137,15 @@ public static String encodeByCtrlType(Object message,CtrlTypes types){
             case pctrl:
                 sb.append(types.sperator).append(types.starter).append(types.sperator);
                 sb.append(encode(JSON.toJSONString(message)));
-                sb.append(types.sperator+"");
+                sb.append(types.sperator);
                 return sb.toString();
             case normal:
                 sb.append(types.sperator).append(types.starter).append(types.sperator);
                 sb.append(encode(message.toString()));
-                sb.append(types.sperator+"");
+                sb.append(types.sperator);
                 return sb.toString();
             default:
-                sb.append(types.sperator).append(types.starter).append(types.sperator);
                 sb.append(encode(message.toString()));
-                sb.append(types.sperator+"");
                 return sb.toString();
         }
     }
@@ -167,9 +165,9 @@ public static IpfsMessage parseIpmsMessageCtrlType(IpfsMessage m){
             if(types != CtrlTypes.unkonw &&
                     decode64
                     .startsWith(types.sperator + types.starter + types.sperator)
-                    && decode64.endsWith(types.sperator+"")){
+                    && decode64.endsWith(types.sperator)){
                 t = types;
-                m.setContents(decode64.substring(types.starter.length()+2,len-2));
+                m.setContents(decode64.substring(types.starter.length()+2,len-1));
                 m.setTypes(t);
                 break;
             }
@@ -194,7 +192,7 @@ public static String decodeCtrlMsg(String baseStr,CtrlTypes type){
         if(type==null)type=CtrlTypes.online;
         if(baseStr.startsWith(type.sperator+type.starter+type.sperator)&&baseStr.endsWith(type.sperator+"")){
             int len = baseStr.length();
-            baseStr = baseStr.substring(type.starter.length()+2,len-2);
+            baseStr = baseStr.substring(type.starter.length()+2,len-1);
             return decode(baseStr);
         }else {
             return decode(baseStr);