优化文件上传多线程

Author: lamborc

conf/nbs-conf.properties

@@ -16,7 +16,7 @@ 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=true
+nbs.server.integrated.enabled=false
 
 # IP CHECKED
 nbs.server.ip.checked-url=http://www.net.cn/static/customercare/yourip.asp

conf/nbs.db

@@ -0,0 +1,17 @@
+package io.ipfs.nbs.pined;
+
+/**
+ * @Package : io.ipfs.nbs.pined
+ * @Description :
+ * <p>
+ *     线程加速器
+ * </p>
+ * @Author : lambor.c
+ * @Date : 2018/7/17-20:18
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class PinedThreadBooster {
+
+
+}

src/main/java/io/ipfs/nbs/pined/PinedThreadBooster.java

@@ -0,0 +1,32 @@
+package io.nbs.client.exceptions;
+
+/**
+ * @Package : io.nbs.client.exceptions
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/7/17-22:12
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class FileTooLargeException extends Exception {
+    private static final String MSG = "文件太大，上传失败.";
+    public FileTooLargeException() {
+        super(MSG);
+    }
+
+    public FileTooLargeException(String message) {
+        super(message);
+    }
+
+    public FileTooLargeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public FileTooLargeException(Throwable cause) {
+        super(cause);
+    }
+
+    public FileTooLargeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

src/main/java/io/nbs/client/exceptions/FileTooLargeException.java

@@ -7,9 +7,11 @@
 import io.ipfs.api.NamedStreamable;
 import io.nbs.client.Launcher;
 import io.nbs.client.cnsts.AppGlobalCnst;
+import io.nbs.client.exceptions.FileTooLargeException;
 import io.nbs.client.services.IpfsMessageSender;
 import io.nbs.client.ui.frames.MainFrame;
 import io.nbs.client.ui.panels.im.messages.MessagePanel;
+import io.nbs.commons.utils.DataSizeFormatUtil;
 import io.nbs.commons.utils.UUIDGenerator;
 import io.nbs.sdk.beans.MessageItem;
 import io.nbs.sdk.beans.PeerInfo;
@@ -19,6 +21,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.List;
@@ -35,6 +39,7 @@ public class IPFSFileUploader {
     private static Logger logger = LoggerFactory.getLogger(IPFSFileUploader.class);
     private static IPFS ipfs;
     private AttachmentInfoService service;
+    public static int MAX_SIZE = 1000*1024*1024;
     private PeerInfo cureent;
     private MessagePanel messagePanel;
     private List<MessageItem> messageItems;
@@ -56,9 +61,13 @@ public IPFSFileUploader(IPFS ipfs, SqlSession sqlSession,MessagePanel panel,List
      *
      * @param file
      */
-    public MerkleNode addFileToIPFS(File file){
+    public MerkleNode addFileToIPFS(File file) throws FileTooLargeException {
         if(!file.exists()||file.isDirectory())return null;
         String name = file.getName();
+        long size = file.length();
+        if(size>MAX_SIZE){
+            throw  new FileTooLargeException("上传文件【"+name+"】超过"+DataSizeFormatUtil.formatDataSize((long)MAX_SIZE)+"限制.");
+        }
         try {
             NamedStreamable.FileWrapper fileWrapper = new NamedStreamable.FileWrapper(file);
             List<MerkleNode> list = ipfs.add(fileWrapper,false,false);
@@ -72,6 +81,26 @@ public MerkleNode addFileToIPFS(File file){
         }
     }
 
+    public MerkleNode addByteFileToIPFS(File file) throws FileTooLargeException {
+        if(!file.exists()||file.isDirectory())return null;
+        String fname = file.getName();
+        long size = file.length();
+        if(size>MAX_SIZE){
+            throw  new FileTooLargeException("上传文件【"+fname+"】超过"+DataSizeFormatUtil.formatDataSize((long)MAX_SIZE)+"限制.");
+        }
+        int len = (int)size;
+        byte[] lagerBytes = new byte[len];
+        try {
+            FileInputStream inputStream = new FileInputStream(file);
+           // NamedStreamable.ByteArrayWrapper byteArrayWrapper = new NamedStreamable.ByteArrayWrapper(inputStream.);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+
+        return null;
+    }
+
 
 
     /**

src/main/java/io/nbs/client/listener/IPFSFileUploader.java

@@ -1,12 +1,13 @@
 package io.nbs.client.ui.panels.im;
 
-import UI.AppMainWindow;
 import com.nbs.biz.data.entity.AttachmentInfoEntity;
 import com.nbs.biz.service.AttachmentInfoService;
 import io.ipfs.api.MerkleNode;
 import io.nbs.client.Launcher;
+import io.nbs.client.exceptions.FileTooLargeException;
 import io.nbs.client.listener.IPFSFileUploader;
 import io.nbs.client.ui.frames.MainFrame;
+import io.nbs.commons.utils.DataSizeFormatUtil;
 import io.nbs.sdk.beans.PeerInfo;
 import io.nbs.sdk.prot.IPMParser;
 import org.apache.ibatis.session.SqlSession;
@@ -17,7 +18,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
-import java.util.List;
 
 /**
  * @Package : io.nbs.client.ui.panels.im
@@ -47,9 +47,18 @@ public void actionPerformed(ActionEvent e) {
         File selection = jFileChooser.getSelectedFile();
         if(selection==null)return;
         logger.info(selection.getAbsolutePath());
-        MerkleNode node = fileUploader.addFileToIPFS(selection);
+
         new Thread(()->{
-            saveUploadFileInfo2DB(node);
+            try {
+                MerkleNode node = fileUploader.addFileToIPFS(selection);
+                new Thread(()->{
+                    saveUploadFileInfo2DB(node);
+                }).start();
+            } catch (FileTooLargeException e1) {
+                logger.error("删除文件失败，{}-{}",e1.getMessage(),e1.getCause());
+                JOptionPane.showMessageDialog(MainFrame.getContext(),"文件太大,最大只能上传["+DataSizeFormatUtil.formatDataSize((long)IPFSFileUploader.MAX_SIZE)+"]文件。");
+
+            }
         }).start();
     }