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

Develop

Author: W-B-S

.gitignore

@@ -24,6 +24,7 @@ target
 out
 profile
 .nbs
+#conf/nbs.db
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 

README.md

@@ -5,6 +5,8 @@ First make sure maven is properly installed
 command :
 mvn clean package appassembler:assemble -Dmaven.test.skip=true -X
 
+## IPFS SERVER FAST 
+ipfs daemon --routing=dhtclient --enable-pubsub-experiment
 ipfs pubsub peers bmJzaW8ubmV0 
 # Version History
 ## Version 2.0.1

conf/nbs-conf.properties

@@ -4,7 +4,8 @@ nbs.client.merkle.root=.merkleroot
 nbs.client.merkle.add.log.name=.merkle
 nbs.client.profile.root=profile
 nbs.client.files.root=nbs
-nbs.client.im.topic.subworld=enabled
+nbs.ui.panel.about.label.ver-value=v2.0.2
+nbs.client.im.topic.subworld=false
 nbs.client.heart.monitor.seconds=300
 nbs.client.im.replay-open=false
 nbs.client.i18n.home=zh_cn
@@ -14,8 +15,12 @@ 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
+nbs.server.exit.stop=false
+nbs.server.integrated.enabled=false
 
 # 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=
 
+# NBS site
+nbs.site.home.url=http://nbsio.net

conf/nbs.db

@@ -20,7 +20,7 @@ nbs.ui.panel.file.label=NBS FILE DATA
 nbs.ui.panel.data.label=\u6570\u636E\u7BA1\u7406
 nbs.ui.panel.im.label=NBS World IM
 nbs.ui.panel.setting.label=\u914D\u7F6E
-
+nbs.ui.panel.media.label=MultiMedia
 ### panel label
 #### status
 nbs.ui.panel.status.label.peer-id=PeerID:
@@ -31,7 +31,7 @@ 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.2
+nbs.ui.panel.about.label.ver-value=v2.0.2
 nbs.ui.panel.about.html.ver-log=http://nbs.lanbery.cn/nbs/client4j/update.log.html
 
 #### File

conf/zh-cn.properties

@@ -46,25 +46,25 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.47</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
+
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
             <version>3.4.5</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
+
         <dependency>
             <groupId>org.xerial</groupId>
             <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>
-        <!-- https://mvnrepository.com/artifact/com.melloware/jintellitype -->
+
         <dependency>
             <groupId>com.melloware</groupId>
             <artifactId>jintellitype</artifactId>
@@ -77,8 +77,8 @@
             <version>4.0.0</version>
         </dependency>
         <dependency>
-            <groupId>nine-patch</groupId>
-            <artifactId>android.nine.patch</artifactId>
+            <groupId>android.nine.patch</groupId>
+            <artifactId>nine-patch</artifactId>
             <version>1.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.miglayout/miglayout-swing -->
@@ -98,6 +98,14 @@
             <artifactId>okhttp</artifactId>
             <version>3.10.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-beans -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>5.0.7.RELEASE</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -135,7 +143,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/out/bin/conf</outputDirectory>
+                            <outputDirectory>${basedir}/out/conf</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>${basedir}/conf</directory>
@@ -222,7 +230,7 @@
                     <encoding>UTF-8</encoding>
                     <logsDirectory>logs</logsDirectory>
                     <tempDirectory>tmp</tempDirectory>
-                    <extraJvmArguments>-Xms256m</extraJvmArguments>
+                    <extraJvmArguments>-Xms512m</extraJvmArguments>
                     <binFileExtensions><unix>.sh</unix></binFileExtensions>
                     <platforms>
                         <platform>windows</platform>
@@ -237,7 +245,7 @@
                                 <extraArguments>
                                     <extraArgument>-Dfile.encoding=utf-8</extraArgument>
                                     <extraArgument>-server</extraArgument>
-                                    <extraArgument>-Xms256m</extraArgument>
+                                    <extraArgument>-Xms512m</extraArgument>
                                 </extraArguments>
                             </jvmSettings>
                         </program>

nbssvr/ipfs.exe

@@ -1,7 +1,13 @@
 package com.nbs.biz.data.dao;
 
+import com.nbs.biz.data.entity.AttachmentInfoEntity;
+import io.nbs.sdk.page.PageCondition;
 import org.apache.ibatis.session.SqlSession;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Package : com.nbs.biz.data.dao
  * @Description : <p></p>
@@ -15,4 +21,14 @@ public class AttachmentInfoDao extends BasicDao {
     public AttachmentInfoDao(SqlSession session) {
         super(session, AttachmentInfoDao.class);
     }
+
+    public List<AttachmentInfoEntity> pageList(PageCondition condition){
+        List list = session.selectList("pageList",condition);
+        return list;
+    }
+
+    public int pageTotal(PageCondition condition){
+        Integer total = session.selectOne("pageTotal",condition);
+        return total;
+    }
 }

pom.xml

@@ -18,7 +18,7 @@
  * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
  * All rights reserved.
  */
-public class BasicDao {
+public class BasicDao<E> {
     private Logger logger = LoggerFactory.getLogger(BasicDao.class);
     protected SqlSession session;
     private String className;
@@ -35,13 +35,13 @@ public int insert(BasicEntity model)
         return session.insert(className + ".insert", model);
     }
 
-    public List findAll()
+    public List<E> findAll()
     {
         //return session.selectList(className + ".findAll");
         return _findAll(0);
     }
 
-    private List _findAll(int time)
+    private List<E> _findAll(int time)
     {
         if (time > 10)
         {
@@ -69,7 +69,7 @@ private BasicEntity _findById(String id, int time)
     {
         if (time > 10)
         {
-            System.out.println("查询到 BasicModel 对象失败次数>10，放弃查询");
+            System.out.println("查询到 BasicModel 对象失败次数>10，放弃查询 id："+id);
             return null;
         }
 
@@ -78,12 +78,12 @@ private BasicEntity _findById(String id, int time)
             return (BasicEntity) session.selectOne(className + ".findById", id);
         } catch (PersistenceException exception)
         {
-            System.out.println("没有查询到 BasicModel 对象，继续查询");
+            System.out.println("没有查询到 BasicModel 对象，继续查询:"+className+".findById");
             return _findById(id, ++time);
         }
     }
 
-    public List find(String field, Object val)
+    public List<E> find(String field, Object val)
     {
         Map map = new HashMap();
         map.put("field", field);

src/main/java/com/nbs/biz/data/dao/AttachmentInfoDao.java

@@ -64,6 +64,10 @@ public void createUploadInfo(){
     public void createAttachmentInfo(){
         session.update("createAttachmentInfo");
     }
+
+    public void createHashLinks(){
+        session.update("createHashLinks");
+    }
     public List<NBSTest> findAll(){
         return session.selectList("findAll");
     }