浏览代码

maxPostSize 变量由 int 改为 long,支持上传长度大于 2G 的文件

James 3 年之前
父节点
当前提交
957419e651

+ 4 - 4
src/main/java/com/jfinal/core/Controller.java

@@ -830,24 +830,24 @@ public abstract class Controller {
 	/**
 	 * Get upload file from multipart request.
 	 */
-	public List<UploadFile> getFiles(String uploadPath, Integer maxPostSize, String encoding) {
+	public List<UploadFile> getFiles(String uploadPath, long maxPostSize, String encoding) {
 		if (request instanceof MultipartRequest == false)
 			request = new MultipartRequest(request, uploadPath, maxPostSize, encoding);
 		return ((MultipartRequest)request).getFiles();
 	}
 	
-	public UploadFile getFile(String parameterName, String uploadPath, Integer maxPostSize, String encoding) {
+	public UploadFile getFile(String parameterName, String uploadPath, long maxPostSize, String encoding) {
 		getFiles(uploadPath, maxPostSize, encoding);
 		return getFile(parameterName);
 	}
 	
-	public List<UploadFile> getFiles(String uploadPath, int maxPostSize) {
+	public List<UploadFile> getFiles(String uploadPath, long maxPostSize) {
 		if (request instanceof MultipartRequest == false)
 			request = new MultipartRequest(request, uploadPath, maxPostSize);
 		return ((MultipartRequest)request).getFiles();
 	}
 	
-	public UploadFile getFile(String parameterName, String uploadPath, int maxPostSize) {
+	public UploadFile getFile(String parameterName, String uploadPath, long maxPostSize) {
 		getFiles(uploadPath, maxPostSize);
 		return getFile(parameterName);
 	}

+ 2 - 2
src/main/java/com/jfinal/upload/MultipartRequest.java

@@ -48,12 +48,12 @@ public class MultipartRequest extends HttpServletRequestWrapper {
 		MultipartRequest.encoding = encoding;
 	}
 	
-	public MultipartRequest(HttpServletRequest request, String uploadPath, int maxPostSize, String encoding) {
+	public MultipartRequest(HttpServletRequest request, String uploadPath, long maxPostSize, String encoding) {
 		super(request);
 		wrapMultipartRequest(request, getFinalPath(uploadPath), maxPostSize, encoding);
 	}
 	
-	public MultipartRequest(HttpServletRequest request, String uploadPath, int maxPostSize) {
+	public MultipartRequest(HttpServletRequest request, String uploadPath, long maxPostSize) {
 		super(request);
 		wrapMultipartRequest(request, getFinalPath(uploadPath), maxPostSize, encoding);
 	}