Merge pull request #43 from KloIm/sftppathfix

sftp path

Author: quhongwei

pom.xml

@@ -11,9 +11,9 @@
 	<url>https://github.com/alipay/rdf-file</url>
 
 	<properties>
-		<rdf.file.core.version>2.2.3</rdf.file.core.version>
-		<rdf.file.oss.version>2.2.3</rdf.file.oss.version>
-		<rdf.file.sftp.version>2.2.3</rdf.file.sftp.version>
+		<rdf.file.core.version>2.2.4</rdf.file.core.version>
+		<rdf.file.oss.version>2.2.4</rdf.file.oss.version>
+		<rdf.file.sftp.version>2.2.4</rdf.file.sftp.version>
 	</properties>
 
 	<modules>

rdf-file-core/src/main/java/com/alipay/rdf/file/util/RdfFileUtil.java

@@ -1,20 +1,5 @@
 package com.alipay.rdf.file.util;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.nio.channels.FileChannel;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.alipay.rdf.file.exception.RdfErrorEnum;
 import com.alipay.rdf.file.exception.RdfFileException;
 import com.alipay.rdf.file.loader.ProtocolLoader;
@@ -23,6 +8,13 @@
 import com.alipay.rdf.file.model.FileConfig;
 import com.alipay.rdf.file.model.FileDefaultConfig;
 
+import java.io.*;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.nio.channels.FileChannel;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Copyright (C) 2013-2018 Ant Financial Services Group
  * 
@@ -766,4 +758,19 @@ public static Method findMethod(Class<?> clazz, String name) {
         }
         return null;
     }
+
+    /**
+     * 格式化字节
+     * si true:based on 1000, false:based on 1024
+     * @param bytes
+     * @param si
+     * @return
+     */
+    public static String humanReadableByteCount(long bytes, boolean si) {
+        int unit = si ? 1000 : 1024;
+        if (bytes < unit) return bytes + " B";
+        int exp = (int) (Math.log(bytes) / Math.log(unit));
+        String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp-1) + (si ? "" : "i");
+        return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
+    }
 }

rdf-file-sftp/src/main/java/com/alipay/rdf/file/enums/SftpProgressLogPrintTypeEnum.java

@@ -0,0 +1,23 @@
+/**
+ * Alipay.com Inc. Copyright (c) 2004-2019 All Rights Reserved.
+ */
+package com.alipay.rdf.file.enums;
+
+/**
+ * 进度监控日志打印方式
+ * @author iminright-ali
+ * @version : SftpProgressLogPrintTypeEnum.java, v 0.1 2019年09月05日 11:14 iminright-ali Exp $
+ */
+public enum SftpProgressLogPrintTypeEnum {
+
+    /**
+     * 根据当前大小同步打印
+     */
+    SYNC,
+
+    /**
+     * 固定周期打印
+     */
+    FIXED_PERIOD,
+
+}

rdf-file-sftp/src/main/java/com/alipay/rdf/file/operation/AbstractSftpOperationTemplate.java

@@ -4,19 +4,17 @@
  */
 package com.alipay.rdf.file.operation;
 
-import java.util.Map;
-
 import com.alipay.rdf.file.exception.RdfErrorEnum;
 import com.alipay.rdf.file.exception.RdfFileException;
 import com.alipay.rdf.file.interfaces.FileSftpStorageConstants;
-import com.alipay.rdf.file.util.JschFactory;
-import com.alipay.rdf.file.util.RdfFileLogUtil;
-import com.alipay.rdf.file.util.SFTPUserInfo;
-import com.alipay.rdf.file.util.SftpThreadContext;
+import com.alipay.rdf.file.storage.SftpConfig;
+import com.alipay.rdf.file.util.*;
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
+import java.util.Map;
+
 /**
  * sftp操作模版
  * 用户可以自定义实现
@@ -37,7 +35,7 @@ public abstract class AbstractSftpOperationTemplate<T> {
      * @throws Exception
      */
     protected abstract SftpOperationResponse<T> doBusiness(SFTPUserInfo user
-            , Map<String, String> params) throws Exception;
+            , Map<String, Object> params) throws Exception;
 
     private void initContext(){
         initOperationType();
@@ -49,10 +47,10 @@ private void initContext(){
      * @param params
      * @return
      */
-    protected abstract boolean checkBeforeDoBiz(SFTPUserInfo user, Map<String, String> params);
+    protected abstract boolean checkBeforeDoBiz(SFTPUserInfo user, Map<String, Object> params);
 
     public SftpOperationResponse<T> handle(SFTPUserInfo user
-            , Map<String, String> params){
+            , Map<String, Object> params, SftpConfig sftpConfig){
         initContext();
         RdfFileLogUtil.common.info("rdf-file#sftpOperation."
                 + this.operationType + ".request,params=" + params);
@@ -61,6 +59,7 @@ public SftpOperationResponse<T> handle(SFTPUserInfo user
         ChannelSftp sftp = null;
         SftpOperationResponse response = new SftpOperationResponse<T>();
         try {
+            SftpOperationContextHolder.setSftpConfig(sftpConfig);
             if(!checkBeforeDoBiz(user, params)){
                 throw new RdfFileException("rdf-file#sftpOperation." + this.operationType
                         + ".checkParams fail,params=" + params, RdfErrorEnum.ILLEGAL_ARGUMENT);
@@ -73,6 +72,7 @@ public SftpOperationResponse<T> handle(SFTPUserInfo user
             response.setSuccess(false);
             response.setError(e);
         } finally {
+            SftpOperationContextHolder.clearSftpConfig();
             if(needCloseConnection(params)){
                 closeConnection(sftp, user);
             }
@@ -87,7 +87,7 @@ public SftpOperationResponse<T> handle(SFTPUserInfo user
      * @param params
      * @return
      */
-    private boolean needCloseConnection(Map<String, String> params){
+    private boolean needCloseConnection(Map<String, Object> params){
         if(params == null){
             return true;
         }

rdf-file-sftp/src/main/java/com/alipay/rdf/file/operation/SftpFileEntry.java

@@ -6,6 +6,7 @@
 
 import com.alipay.rdf.file.interfaces.FileSftpStorageConstants;
 import com.alipay.rdf.file.util.RdfFileUtil;
+import com.alipay.rdf.file.util.SFTPHelper;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 
 /**
@@ -29,7 +30,7 @@ private SftpFileEntry(){}
 
     public static SftpFileEntry buildFileEntry(String fullFileName, LsEntry lsEntry){
         SftpFileEntry fileEntry = new SftpFileEntry();
-        fileEntry.setFullFileName(fullFileName);
+        fileEntry.setFullFileName(SFTPHelper.toSFTPPath(fullFileName));
         fileEntry.setLsEntry(lsEntry);
         return fileEntry;
     }