Merge remote-tracking branch 'gitee/branch-0.4.2' into branch-0.4.2

# Conflicts:
#	pom.xml

Author: peter

pom.xml

@@ -160,6 +160,11 @@
             <version>2.2.1-b03</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.3</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>