Merge pull request #2 from W-B-S/develop

daily work

Author: W-B-S

.gitignore

@@ -18,14 +18,16 @@
 *.zip
 *.tar.gz
 *.rar
+
+# runtime created
 target
 out
-
+profile
+.nbs
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 # IDEA config
 *.impl
 *.iml
 .idea/
-nbs/cache

README.md

@@ -1 +1,12 @@
-# nbs-client-test
+# nbs-client-test
+
+## compile to jar command
+First make sure maven is properly installed
+command :
+mvn clean package appassembler:assemble -Dmaven.test.skip=true -X
+
+ipfs pubsub peers bmJzaW8ubmV0 
+# Version History
+## Version 2.0.1
+  - 聊天功能
+  - 联系人名片

conf/.merkle

@@ -2,10 +2,20 @@
 #Thu Jun 21 11:59:01 CST 2018
 nbs.client.merkle.root=.merkleroot
 nbs.client.merkle.add.log.name=.merkle
-nbs.client.merkle.root.hash=skjfhsafkdasfd
-
 nbs.client.profile.root=profile
 nbs.client.files.root=nbs
-nbs.client.im.topic.subworld =disabled
+nbs.client.im.topic.subworld=enabled
+nbs.client.heart.monitor.seconds=300
+nbs.client.im.replay-open=false
 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
+
+# IP CHECKED
+nbs.server.ip.checked-url=http://www.net.cn/static/customercare/yourip.asp
+nbs.server.ip.checked-locations-url=http://ip.taobao.com/service/getIpInfo.php?ip=
+

profile/avatars/default_avatar.png conf/defaults/default_avatar.pngprofile/avatars/default_avatar.png renamed to conf/defaults/default_avatar.png

@@ -13,10 +13,12 @@ nbs.ui.btn.about.title=\u5173\u4E8E
 
 ## Panel config
 ### panel title
-nbs.ui.panel.status.label=PEER INFO
+nbs.ui.panel.info.label=PEER INFO :
 nbs.ui.panel.about.label=About NBS Chain
+#will   @Deprecated
 nbs.ui.panel.file.label=NBS FILE DATA
-nbs.ui.panel.im.label=\u5F53\u524D\u804A\u5929\uFF1A
+nbs.ui.panel.data.label=\u6570\u636E\u7BA1\u7406
+nbs.ui.panel.im.label=NBS World IM
 nbs.ui.panel.setting.label=\u914D\u7F6E
 
 ### panel label
@@ -27,8 +29,9 @@ nbs.ui.panel.status.default-nickname= NBSChain_9527
 
 
 #### about
+nbs.ui.panel.about.label.version-title=The Next Block chain System
 nbs.ui.panel.about.label.ver-name=\u5F53\u524D\u7248\u672C
-nbs.ui.panel.about.label.ver-value=v0.2.1
+nbs.ui.panel.about.label.ver-value=v0.2.2
 nbs.ui.panel.about.html.ver-log=http://nbs.lanbery.cn/nbs/client4j/update.log.html
 
 #### File