增加成员控制

Author: lamborc

conf/nbs-conf.properties

@@ -5,9 +5,12 @@ nbs.client.merkle.add.log.name=.merkle
 nbs.client.profile.root=profile
 nbs.client.files.root=nbs
 nbs.client.im.topic.subworld =disabled
+nbs.client.heart.monitor.seconds=300
 nbs.client.i18n.home=zh_cn
+#nbs server config
 nbs.server.address=/ip4/127.0.0.1/tcp/5001
 nbs.server.address.gateway-url=http://127.0.0.1:8080
 nbs.server.address.host=127.0.0.1
 nbs.server.address.api-port=5001
 nbs.server.address.gateway-port=8080
+

conf/nbs.db

@@ -5,6 +5,7 @@
 import com.alibaba.fastjson.JSON;
 import com.nbs.biz.model.ContactsEntity;
 import com.nbs.biz.service.ContactsService;
+import io.nbs.client.services.IpfsMessageSender;
 import io.nbs.client.vo.ContactsItem;
 import com.nbs.entity.PeerBoradcastInfo;
 import com.nbs.entity.PeerInfoBase;
@@ -142,8 +143,6 @@ private void getPeerAvatar(){
     private List<ContactsEntity> getContacts(){
         List<ContactsEntity> contacts = service.findAll();
         if(contacts==null)contacts = new ArrayList<>();
-        RadomCharactersHelper charactersHelper = RadomCharactersHelper.getInstance();
-        String hashPre = "hash.";
         if(AppMainWindow.currentPeerInfo()!=null){
             PeerInfoBase base = AppMainWindow.currentPeerInfo();
             ContactsEntity selfModel = new ContactsEntity(base.getPeerID(),base.getNick());
@@ -154,10 +153,15 @@ private List<ContactsEntity> getContacts(){
 
         IPFS ipfs = IPFSHelper.getInstance().getIpfs();
 
+
         try {
             Object obj = null;
+            if(ConfigurationHelper.getInstance().subWorldPeers()){
+                obj = ipfs.pubsub.peers(IpfsMessageSender.NBSWORLD_IMS_TOPIC);
+            }else {
+                obj = ipfs.pubsub.peers();
+            }
 
-            obj = ipfs.pubsub.peers();
             if(obj==null)return contacts;
             List<String> peers = (List<String>)JSONParser.getValue(obj,"Strings");
             if(peers!=null&&peers.size()>0){
@@ -195,6 +199,7 @@ private List<ContactsEntity> getContacts(){
     private void subWorld(long sleeps){
         List<Map<String, Object>> resList = Collections.synchronizedList(new ArrayList<>());
         AtomicInteger size = new AtomicInteger(0);
+
         new Thread(()->{
             logger.warn(DateHelper.currentTime()+">>>>>>>启动订阅 NBSWorld..."+IPFSHelper.NBSWORLD_IMS_TOPIC);
             IPFS ipfs = new IPFS(ConfigurationHelper.getInstance().getIPFSAddress());

profile/.merkle

@@ -47,6 +47,7 @@ public class IpfsMessageReceiver{
     boolean ctrlSign = true;
     private static boolean runing = false;
 
+
     public IpfsMessageReceiver() {
         worldTopic = IpfsMessageSender.NBSWORLD_IMS_TOPIC;
         ipfs = new IPFS(ConfigurationHelper.getInstance().getIPFSAddress());

profile/avatars/lambor64.png

@@ -8,6 +8,7 @@
 import io.nbs.client.cnsts.OSUtil;
 import io.nbs.client.services.IpfsMessageSender;
 import io.nbs.client.services.MessageSendService;
+import io.nbs.commons.helper.ConfigurationHelper;
 import io.nbs.sdk.beans.OnlineMessage;
 import io.nbs.sdk.beans.PeerInfo;
 import io.nbs.client.ui.panels.MainContentPanel;
@@ -22,6 +23,7 @@
 import javax.swing.*;
 import javax.swing.border.Border;
 import java.awt.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Package : io.ipfs.nbs.ui.frames
@@ -47,6 +49,7 @@ public class MainFrame extends JFrame {
     public int currentWindowWidth = W_SIZE;
     public int currentWindowHeight = H_SIZE;
     public static  int RIGHT_EIDTH = 540;
+    private static boolean heartMonitor = true;
 
     public static final  int TOOLBAR_WIDTH = 52;
 
@@ -219,22 +222,42 @@ public void refreshAvatar(){
     private void notifyWorldOnline(){
         PeerInfo info = Launcher.currentPeer;
         if(info==null)return;
+        OnlineMessage message = convertByPeerInfo(info);
+        //IP 解析
+        //nbs.client.heart.monitor.seconds
+        final int seconds = ConfigurationHelper.getInstance().getHeartMonitorSleep();
+        new Thread(()->{
+            while (heartMonitor){
+                try {
+                    if(message!=null)messageSender.sendOnline(message);
+                    logger.info("heart monitor {}",System.currentTimeMillis());
+                } catch (Exception e) {
+                    logger.warn(e.getMessage(),e.getCause());
+                }
+                try {
+                    TimeUnit.SECONDS.sleep(seconds);
+                } catch (InterruptedException e) {
+                }
+            }
+        }).start();
+
+        //刷新数据库登录
+        peerLoginService.refreshLoginInfo(info);
+    }
+
+    /**
+     *
+     * @return
+     */
+    private OnlineMessage convertByPeerInfo(PeerInfo info){
         OnlineMessage message = new OnlineMessage(info.getId(),info.getNick(),info.getFrom());
         if(StringUtils.isNotBlank(info.getAvatar())){
             message.setAvatar(info.getAvatar());
             message.setAvatarFile(info.getAvatarName());
             message.setAvatarSuffix(info.getAvatarSuffix());
             message.setLocations("中国*北京");
         }
-        //IP 解析
-        try {
-            messageSender.sendOnline(message);
-        } catch (Exception e) {
-            logger.warn(e.getMessage(),e.getCause());
-        }
-
-        //刷新数据库登录
-        peerLoginService.refreshLoginInfo(info);
+        return message;
     }
 
 

profile/avatars/logo.png

@@ -91,6 +91,15 @@ public static ConfigurationHelper getInstance(){
         return instance;
     }
 
+    /**
+     *
+     * @return
+     */
+    public int getHeartMonitorSleep(){
+        String sec = cfgProps.getProperty("nbs.client.heart.monitor.seconds","300");
+        return Integer.parseInt(sec);
+    }
+
 
     /**
      * 获取IPFS服务地址