解决由于编码导致自己消息不能区分问题

Author: lamborc

conf/nbs.db

@@ -7,6 +7,7 @@
 import io.nbs.client.cnsts.ColorCnst;
 import io.nbs.client.cnsts.OSUtil;
 import io.nbs.commons.helper.ConfigurationHelper;
+import io.nbs.commons.utils.Base64CodecUtil;
 import io.nbs.commons.utils.TimeUtil;
 import io.nbs.sdk.beans.PeerInfo;
 import io.nbs.client.ui.frames.FailFrame;
@@ -229,6 +230,8 @@ private boolean needInitConfig(IPFS ipfs) throws IOException {
             currentPeer = new PeerInfo();
             currentPeer.setId(peerid);
             currentPeer.setNick(nick);
+            //
+            fromid = Base64CodecUtil.base64From(fromid);
             currentPeer.setFrom(fromid);
 
             Object avatar = cfg.get(ConfigurationHelper.JSON_AVATAR_KEY);

src/main/java/io/nbs/client/Launcher.java

@@ -19,6 +19,8 @@
 import io.nbs.sdk.beans.PeerInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.SqlSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
@@ -31,6 +33,7 @@
  * All rights reserved.
  */
 public class ReceiverMessageAdapter implements IPFSSubscribeListener {
+    private static Logger logger = LoggerFactory.getLogger(ReceiverMessageAdapter.class);
 
     private List<MessageItem> items;
     private NbsListView listView;

src/main/java/io/nbs/client/adapter/ReceiverMessageAdapter.java

@@ -116,7 +116,6 @@ private void proccessMessage(List<String> jsonMessages){
                     logger.warn("消息JSON ：{}解析失败，忽略.可能原因:{}",json,e.getMessage());
                     continue;
                 } catch (UnsupportedEncodingException e) {
-
                     logger.warn("消息JSON ：{}解析失败，忽略.可能原因:{}",json,e.getMessage());
                     continue;
                 }

src/main/java/io/nbs/client/services/IpfsMessageReceiver.java

@@ -2,6 +2,7 @@
 
 import com.nbs.biz.PeersOperatorService;
 import com.nbs.biz.service.TableService;
+import io.ipfs.multibase.Base16;
 import io.nbs.client.ui.components.VerticalFlowLayout;
 import io.nbs.client.listener.AbstractMouseListener;
 import io.ipfs.api.IPFS;
@@ -16,6 +17,7 @@
 import io.nbs.client.ui.filters.ImagesFiltFilter;
 import io.nbs.client.helper.AvatarImageHandler;
 import io.nbs.commons.helper.ConfigurationHelper;
+import io.nbs.commons.utils.Base64CodecUtil;
 import io.nbs.sdk.beans.PeerInfo;
 import io.nbs.client.ui.components.GBC;
 import io.nbs.client.ui.components.NBSButton;
@@ -452,14 +454,17 @@ private boolean saveIpfsConfig(String originAvatarName){
         try {
             String nick = IPMParser.urlEncode(tempInfo.getNick());
             ipfs.config.set(ConfigurationHelper.JSON_NICKNAME_KEY,nick);
-            String enFromId =IPMParser.urlEncode(tempInfo.getFrom());
-            ipfs.config.set(ConfigurationHelper.JSON_CFG_FROMID_KEY,enFromId);
+            //String enFromId =IPMParser.urlEncode(tempInfo.getFrom());
+            ipfs.config.set(ConfigurationHelper.JSON_CFG_FROMID_KEY,tempInfo.getFrom());
             ipfs.config.set(ConfigurationHelper.JSON_AVATAR_KEY,tempInfo.getAvatar());
             ipfs.config.set(ConfigurationHelper.JSON_AVATAR_SUFFIX_KEY,tempInfo.getAvatarSuffix());
             if(StringUtils.isNotBlank(originAvatarName)){
                 String enFileName =  IPMParser.urlEncode(originAvatarName);
                 ipfs.config.set(ConfigurationHelper.JSON_AVATAR_NAME_KEY,enFileName);
             }
+            Object oFrom = ipfs.config.get(ConfigurationHelper.JSON_CFG_FROMID_KEY) ;
+            logger.info("peer from={},cfgFrom={}",tempInfo.getFrom(),oFrom.toString());
+
             return true;
         } catch (IOException e) {
             e.printStackTrace();
@@ -512,8 +517,14 @@ private void getFromid(PeerInfo info){
 
             List<Map<String, Object>> lst = subs.limit(1).collect(Collectors.toList());
             Object fromidObj = JSONParser.getValue(lst.get(0),"from");
+
             if(fromidObj!=null){
+
                 String fromid = (String)fromidObj;
+                String ss= Base16.encode(fromid.getBytes());
+                logger.info("base16={}",ss);
+                logger.info("tostring>>{},String>>{},decode>>{}",fromidObj.toString(),fromid,IPMParser.urlDecode(fromid));
+                fromid = Base64CodecUtil.base64From(fromid);
                 info.setFrom(fromid);
             }
         } catch (Exception e) {

src/main/java/io/nbs/client/ui/frames/InitialFrame.java

@@ -15,6 +15,22 @@
 public class Base64CodecUtil {
     private static final Base64 base64 = new Base64();
 
+    /**
+     *
+     * @param from
+     * @return
+     */
+    public static String base64From(String from){
+        if(from==null||from.length()==0)return from;
+        try {
+            byte[] encodeByte = from.getBytes(CharEncoding.UTF_8);
+            return base64.encodeToString(encodeByte);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     /**
      *
      * @param origin

src/main/java/io/nbs/commons/utils/Base64CodecUtil.java

@@ -6,7 +6,6 @@
 import io.nbs.commons.utils.UUIDGenerator;
 import io.nbs.sdk.beans.*;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.Base64Utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -136,7 +135,9 @@ public static String encode(Object data,IPMTypes types) throws IllegalIPFSMessag
     public static StandardIPFSMessage decodeStandardIPFSMessage(String json) throws IllegalIPFSMessageException, UnsupportedEncodingException {
         if(json==null||json.length()==0)throw new IllegalIPFSMessageException("json 数据为null或空串.");
         StandardIPFSMessage simsg = JSON.parseObject(json,StandardIPFSMessage.class);
-        String fromid = URLDecoder.decode(simsg.getFrom(),DEFAULT_ENCODING);
+
+        String fromid = Base64CodecUtil.base64From(simsg.getFrom());
+                //URLDecoder.decode(simsg.getFrom(),DEFAULT_ENCODING);
         simsg.setFrom(fromid);
         String endata = simsg.getData();
         String deData = Base64CodecUtil.decode(endata);