Merge pull request #268 from NigelWu95/dev

Dev

Author: gawen957

.gitignore

@@ -1,6 +1,6 @@
 ### Gradle template
 .gradle
-/build/
+build/
 
 ### Maven template
 target/
@@ -26,9 +26,4 @@ resources/.*
 assembly/
 .DS_Store
 
-qsuits.log
-procedure*.log
-qsuits.error
-qsuits.info
-.qsuits.account
 logs/

docs/uploadfile.md

@@ -421,6 +421,16 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -446,6 +456,8 @@
                         <arg>-verbose</arg>
                         <arg>-Xlint:deprecation</arg>
                     </compilerArgs>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <plugin>

pom.xml

@@ -6,7 +6,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -39,5 +39,8 @@
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>

qiniu-suits-java.iml

@@ -13,14 +13,14 @@
 import com.qiniu.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
+import sun.misc.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.Timer;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

src/main/java/com/qiniu/datasource/CloudStorageContainer.java

@@ -108,8 +108,9 @@ protected List<IReader<Iterator<String>>> getFileReaders(String path) throws IOE
                 filepathReaders.add(new FilepathReader(name, lists.get(i), startLine, unitLen));
             }
         } else {
+            String key = leftTrimSize == 0 ? sourceFile.getPath() : transferPath + sourceFile.getPath().substring(leftTrimSize);
             filepathReaders.add(new FilepathReader("filepath-" + path,
-                    new ArrayList<String>(){{ add(String.join(separator, sourceFile.getPath(),
+                    new ArrayList<String>(){{ add(String.join(separator, sourceFile.getPath(), key,
                         Etag.file(sourceFile), String.valueOf(sourceFile.length()),
                         String.valueOf(sourceFile.lastModified()), FileUtils.contentType(sourceFile)));
             }}, null, unitLen));