增加启动登录广播

lamborc · lamborc · commit 159cae3726e3 · 2018-06-24T17:03:29.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ hs_err_pid*
 *.impl
 *.iml
 .idea/
+nbs/cache
diff --git a/pom.xml b/pom.xml
@@ -57,6 +57,12 @@
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.20.1</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.11</version>
+        </dependency>
 
 
     </dependencies>
diff --git a/profile/nbs.png b/profile/nbs.png
diff --git a/src/main/java/UI/AppMainWindow.java b/src/main/java/UI/AppMainWindow.java
@@ -4,12 +4,15 @@
 import UI.panel.about.AboutPanel;
 import UI.panel.fm.FilePanel;
 import UI.panel.im.IMPanel;
-import UI.panel.monitor.ConsolePanel;
 import UI.panel.setting.SettingPanel;
 import com.alibaba.fastjson.JSON;
+import com.nbs.entity.PeerBoradcastInfo;
 import com.nbs.ipfs.IPFSHelper;
 import com.nbs.tools.ConfigHelper;
+import com.nbs.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
+import io.ipfs.api.MerkleNode;
+import io.ipfs.api.NamedStreamable;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,6 +63,8 @@ public class AppMainWindow {
 
     public static String PEER_ID = "";
 
+    public static PeerBoradcastInfo self = null;
+
     public static boolean SERVER_STAT = false;
 
     protected static  IPFSHelper ipfsHelper = IPFSHelper.getInstance();
@@ -117,7 +122,7 @@ public void run() {
      */
     public AppMainWindow(){
         initialize();
-
+        broadcastOnline();
     }
     /**
      * 初始化frame内容
@@ -209,7 +214,10 @@ private void loadEnv(){
 
             if(map.get("ID")!=null)PEER_ID = (String)map.get("ID");
             logger.info(">>>>>>>>>>>>>."+map.get("ID"));
-            initNick();
+            String n = initNick();
+            self = new PeerBoradcastInfo((String)map.get("ID"),n);
+            //avatar must below init nick
+            initAvatar();
         }catch (Exception e){
             logger.error("ipfs Server is dead.",e.getCause());
             ipfs = new IPFS(ConfigHelper.getIpfsAddress());
@@ -218,26 +226,78 @@ private void loadEnv(){
     }
 
 
-    public void initNick(){
-        if(StringUtils.isNotBlank(PROFILE_NICKNAME))return;
+    public String initNick(){
+        if(StringUtils.isNotBlank(PROFILE_NICKNAME))return PROFILE_NICKNAME;
         String nick = "";
+
         try {
             Map cfgMap = ipfs.config.show();
-            if(cfgMap.containsKey(IPFSHelper.JSON_NICKNAME_KEY)){
-                nick = (String)cfgMap.get(IPFSHelper.JSON_NICKNAME_KEY);
+            if(cfgMap.containsKey(ConfigHelper.JSON_NICKNAME_KEY)){
+                nick = (String)cfgMap.get(ConfigHelper.JSON_NICKNAME_KEY);
             }
         } catch (IOException e) {
             e.printStackTrace();
             nick = ipfsHelper.generateNickName();
             try {
-                ipfs.config.set(IPFSHelper.JSON_NICKNAME_KEY,nick);
+                ipfs.config.set(ConfigHelper.JSON_NICKNAME_KEY,nick);
                 String s=JSON.toJSONString(ipfs.config.show(),true);
                 logger.info(s);
             } catch (IOException e1) {
                 e1.printStackTrace();
             }
         }
         PROFILE_NICKNAME = nick;
+        return PROFILE_NICKNAME;
+    }
+
+    /**
+     * 初始化头像
+     */
+    public void initAvatar(){
+        try {
+            String avatarHash,suffix,fileName;
+            Map cfgMap = ipfs.config.show();
+            if(cfgMap.containsKey(ConfigHelper.JSON_AVATAR_KEY)&&cfgMap.containsKey(ConfigHelper.JSON_AVATAR_SUFFIX_KEY)){
+                //
+            }else {
+                File defaultAvatarImage = new File(ConfigHelper.PROFILE_ROOT+"nbs.png");
+                if(!defaultAvatarImage.exists()||defaultAvatarImage.isDirectory())return;
+                fileName = defaultAvatarImage.getName();
+                suffix = fileName.substring(fileName.lastIndexOf("."));
+                logger.info(suffix);
+                NamedStreamable.FileWrapper file = new NamedStreamable.FileWrapper(defaultAvatarImage);
+                java.util.List<MerkleNode> merkleNodes= ipfs.add(file);
+                avatarHash = merkleNodes.get(0).hash.toBase58();
+
+                //存入config
+                try{
+                    ipfs.config.set(ConfigHelper.JSON_AVATAR_KEY,avatarHash);
+                    ipfs.config.set(ConfigHelper.JSON_AVATAR_SUFFIX_KEY,suffix);
+                    ipfs.config.set(ConfigHelper.JSON_AVATAR_NAME_KEY,fileName);
+                }catch (Exception ioe){
+                    logger.error(ioe.getMessage());
+                }
+                self.setAvatarHash(avatarHash);
+                self.setAvatarSuffix(suffix);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
+    /**
+     *
+     */
+    private void broadcastOnline(){
+        if(self==null)return;
+        String ctrlMsg = Base64CodecUtil.encodeCtrlMsg(self,Base64CodecUtil.CtrlTypes.online);
+
+        try {
+            logger.info("Send CTRL MSG : "+ctrlMsg);
+            ipfs.pubsub.pub(IPFSHelper.NBSWORLD_CTRL_TOPIC,ctrlMsg);
+            logger.info(IPFSHelper.NBSWORLD_CTRL_TOPIC+"Send CTRL MSG : "+ctrlMsg);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/src/main/java/UI/common/ToolbarStatsPanel.java b/src/main/java/UI/common/ToolbarStatsPanel.java
@@ -19,13 +19,13 @@
 public class ToolbarStatsPanel extends JPanel {
 
     private final JLabel titleLabel = new JLabel();
-    private final JLabel contactsToLabel = new JLabel();
+    private final JTextPane contactsToLabel = new JTextPane();
     public ToolbarStatsPanel(String key){
         titleLabel.setFont(ConstantsUI.FONT_TITLE);
         titleLabel.setForeground(ConstantsUI.PANEL_TITILE_COLOR);
         contactsToLabel.setFont(ConstantsUI.FONT_LABEL);
         contactsToLabel.setForeground(ConstantsUI.PANEL_TITILE_COLOR);
-        contactsToLabel.setHorizontalAlignment(JLabel.HORIZONTAL);
+       // contactsToLabel.set
         if(StringUtils.isNoneBlank(key)&& null != PropertyUtil.getProperty(key)){
             titleLabel.setText(PropertyUtil.getProperty(key));
         }
diff --git a/src/main/java/UI/panel/fm/FilePanel.java b/src/main/java/UI/panel/fm/FilePanel.java
@@ -185,7 +185,7 @@ public void actionPerformed(ActionEvent e) {
     private void addFile2Ipfs(File file) {
         if(file==null||AppMainWindow.ipfs==null)return;
         String name = file.getName();
-        NamedStreamable namedStreamable;
+
         List<MerkleNode> nodes;
         try {
             if(file.isDirectory()){
diff --git a/src/main/java/UI/panel/im/IMPanel.java b/src/main/java/UI/panel/im/IMPanel.java
@@ -10,6 +10,7 @@
 import com.nbs.entity.PeerInfoBase;
 import com.nbs.tools.DateHelper;
 import com.nbs.ui.components.ColorCnst;
+import com.nbs.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
 import org.apache.commons.lang3.StringUtils;
 
@@ -133,21 +134,6 @@ public void load() {
 
     }
 
-    private void refreshPeers(){
-
-    }
-
-    /**
-     * 加载在线节点
-     * @return
-     */
-    public boolean loadOnlinePeers(){
-        if(!AppMainWindow.SERVER_STAT)return false;
-        IPFS ipfs = AppMainWindow.ipfs;
-
-        return true;
-    }
-
     @Override
     protected void addListener() {
         sendButton.addActionListener(new AbstractAction() {
@@ -158,9 +144,7 @@ public void actionPerformed(ActionEvent e) {
         });
     }
 
-    private void buildLeftPeerContainer(){
 
-    }
 
     /**
      * 上下结构
@@ -248,22 +232,40 @@ private void testText(int rows){
     private void sendMsg(){
         String sendContent = inputArea.getText();
         if(StringUtils.isBlank(sendContent))return;
+        if(CURRENT_TO_CONTACTS_ITEM == null){
+            JOptionPane.showMessageDialog(AppMainWindow.frame,"请选中联系人");
+            return;
+        }
+        String topic = CURRENT_TO_CONTACTS_ITEM.getId();
 
         try {
             StringBuffer sb = new StringBuffer();
             sb.append(AppMainWindow.PROFILE_NICKNAME).append("  ").append(DateHelper.currentTime());
             sb.append(ConstantsUI.ENTER_CHARACTER);
             sb.append(ConstantsUI.WSPACE_CHARACTER4).append(sendContent);
+
             //send pub
-            AppMainWindow.ipfs.pubsub.pub("nbs",sendContent);
+            AppMainWindow.ipfs.pubsub.pub(topic,Base64CodecUtil.encodeIPFSMsg(sendContent));
             inputArea.setText("");
             sb.append(ConstantsUI.ENTER_CHARACTER);
             imMSGShow.append(sb.toString());
         } catch (Exception e) {
             e.printStackTrace();
+            logger.error(e.getMessage());
+            String error = ConstantsUI.WSPACE_CHARACTER4+"发送失败....."+ConstantsUI.ENTER_CHARACTER;
+            imMSGShow.append(error);
         }
     }
 
+    /**
+     *
+     * @param content
+     * @param item
+     */
+    public void recvMsg(String content,ContactsItem item){
+
+    }
+
     public static void setCurrentToPeer(ContactsItem item){
         CURRENT_TO_CONTACTS_ITEM = item;
     }
@@ -276,7 +278,6 @@ public void contactsItemChanged(ContactsItem item){
         CURRENT_TO_CONTACTS_ITEM = item;
         if(item==null)return;
         toolbarStatsPanel.resetContacts(item.getName());
-
     }
 
     /**
diff --git a/src/main/java/com/nbs/entity/PeerBoradcastInfo.java b/src/main/java/com/nbs/entity/PeerBoradcastInfo.java
@@ -0,0 +1,62 @@
+package com.nbs.entity;
+
+/**
+ * @Package : com.nbs.entity
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/24-15:30
+ * Copyright (c) 2018, NBS , lambor.c<lanbery@gmail.com>.
+ * All rights reserved.
+ */
+public class PeerBoradcastInfo {
+
+    private String id;
+    private String nick;
+    private String avatarHash;
+    private String avatarSuffix;
+
+    public PeerBoradcastInfo(String id, String nick, String avatarHash, String avatarSuffix) {
+        this.id = id;
+        this.nick = nick;
+        this.avatarHash = avatarHash;
+        this.avatarSuffix = avatarSuffix;
+    }
+
+    public PeerBoradcastInfo(String id, String nick) {
+        this.id = id;
+        this.nick = nick;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getNick() {
+        return nick;
+    }
+
+    public void setNick(String nick) {
+        this.nick = nick;
+    }
+
+    public String getAvatarHash() {
+        return avatarHash;
+    }
+
+    public void setAvatarHash(String avatarHash) {
+        this.avatarHash = avatarHash;
+    }
+
+    public String getAvatarSuffix() {
+        return avatarSuffix;
+    }
+
+    public void setAvatarSuffix(String avatarSuffix) {
+        this.avatarSuffix = avatarSuffix;
+    }
+
+}
diff --git a/src/main/java/com/nbs/ipfs/IPFSHelper.java b/src/main/java/com/nbs/ipfs/IPFSHelper.java
@@ -1,6 +1,7 @@
 package com.nbs.ipfs;
 
 import com.nbs.tools.ConfigHelper;
+import com.nbs.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -26,16 +27,15 @@ public class IPFSHelper {
      */
     private ConcurrentHashMap secMap = new ConcurrentHashMap();
     public static String CLIENT_PEERID;
-    public static String JSON_NICKNAME_KEY = "nickname";
 
     private IPFS ipfs;
 
     /**
      *
      */
-    private static final String NBSWORLD_CTRL_TOPIC = "$nbs.ctrl|broadcast$";
-    private static final String NBS_IM_TOPIC_PREFFIX = "$nbs.im|";
-    private static final String NBS_TOPIC_SEPRATOR = "$";
+    public static final String NBSWORLD_CTRL_TOPIC = Base64CodecUtil.encode("$nbs.ctrl|broadcast$");
+    public static final String NBS_IM_TOPIC_PREFFIX = "$nbs.im|";
+    public static final String NBS_TOPIC_SEPRATOR = "$";
 
     public IPFSHelper() {
         ipfs = new IPFS(ConfigHelper.getIpfsAddress());
@@ -92,21 +92,6 @@ private int getRadom(int len){
         return (int)Math.round(Math.random()*len);
     }
 
-    /**
-     *
-     * @return
-     * @throws IOException
-     */
-    public String getNickName() throws IOException {
-
-        String nick = ipfs.config.get(JSON_NICKNAME_KEY);
-        if(StringUtils.isBlank(nick)){
-            nick = generateNickName();
-            ipfs.config.set(JSON_NICKNAME_KEY,nick);
-        }
-        return nick;
-    }
-
     /**
      *
      * @param nick
@@ -116,12 +101,10 @@ public String getNickName() throws IOException {
     public String updateNick(String nick) throws IOException {
         if(ipfs==null||StringUtils.isBlank(nick))return null;
         nick = nick.trim();
-        ipfs.config.set(JSON_NICKNAME_KEY,nick);
+        ipfs.config.set(ConfigHelper.JSON_NICKNAME_KEY,nick);
         return nick;
     }
 
 
-    public void getIMPeers(){
 
-    }
 }
diff --git a/src/main/java/com/nbs/tools/ConfigHelper.java b/src/main/java/com/nbs/tools/ConfigHelper.java
diff --git a/src/main/java/com/nbs/ui/panels/ContactsPanel.java b/src/main/java/com/nbs/ui/panels/ContactsPanel.java
diff --git a/src/main/java/com/nbs/utils/Base64CodecUtil.java b/src/main/java/com/nbs/utils/Base64CodecUtil.java

-Original file line number
+Diff line change
 *.impl
 *.iml
 .idea/
 +nbs/cache