浏览代码

!83 cos组件升级到2022.2,支持上传2GB以上的文件
Merge pull request !83 from 玛雅牛/master

JFinal 3 年之前
父节点
当前提交
ed8d16ce3d

+ 1 - 1
pom.xml

@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>com.jfinal</groupId>
 			<artifactId>cos</artifactId>
-			<version>2020.4</version>
+			<version>2022.2</version>
 			<scope>provided</scope>
 		</dependency>
 		

+ 4 - 4
src/main/java/com/jfinal/config/Constants.java

@@ -53,7 +53,7 @@ final public class Constants {
 	private String urlParaSeparator = Const.DEFAULT_URL_PARA_SEPARATOR;
 	private ViewType viewType = Const.DEFAULT_VIEW_TYPE;
 	private String viewExtension = Const.DEFAULT_VIEW_EXTENSION;
-	private int maxPostSize = Const.DEFAULT_MAX_POST_SIZE;
+	private long maxPostSize = Const.DEFAULT_MAX_POST_SIZE;
 	private int freeMarkerTemplateUpdateDelay = Const.DEFAULT_FREEMARKER_TEMPLATE_UPDATE_DELAY;	// just for not devMode
 	
 	private ControllerFactory controllerFactory = Const.DEFAULT_CONTROLLER_FACTORY;
@@ -84,7 +84,7 @@ final public class Constants {
 	 * 之后被调用
 	 * 
 	 * 默认值为 3,那么 configPlugin(..) 将在 configRoute(...) 调用之后被调用
-	 * @param 取值只能是 1、2、3、4、5
+	 * @param configPluginOrder 取值只能是 1、2、3、4、5
 	 */
 	public void setConfigPluginOrder(int configPluginOrder) {
 		if (configPluginOrder < 1 || configPluginOrder > 5) {
@@ -374,14 +374,14 @@ final public class Constants {
 		return baseUploadPath;
 	}
 	
-	public int getMaxPostSize() {
+	public long getMaxPostSize() {
 		return maxPostSize;
 	}
 	
 	/**
 	 * Set max size of http post. The upload file size depend on this value.
 	 */
-	public void setMaxPostSize(int maxPostSize) {
+	public void setMaxPostSize(long maxPostSize) {
 		this.maxPostSize = maxPostSize;
 	}
 	

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

@@ -35,14 +35,14 @@ import com.oreilly.servlet.multipart.FileRenamePolicy;
 public class MultipartRequest extends HttpServletRequestWrapper {
 	
 	private static String baseUploadPath;
-	private static int maxPostSize;
+	private static long maxPostSize;
 	private static String encoding;
 	static FileRenamePolicy fileRenamePolicy = new DefaultFileRenamePolicy();
 	
 	private List<UploadFile> uploadFiles;
 	private com.oreilly.servlet.MultipartRequest multipartRequest;
 	
-	static void init(String baseUploadPath, int maxPostSize, String encoding) {
+	static void init(String baseUploadPath, long maxPostSize, String encoding) {
 		MultipartRequest.baseUploadPath = baseUploadPath;
 		MultipartRequest.maxPostSize = maxPostSize;
 		MultipartRequest.encoding = encoding;
@@ -88,7 +88,7 @@ public class MultipartRequest extends HttpServletRequestWrapper {
 		}
 	}
 	
-	private void wrapMultipartRequest(HttpServletRequest request, String uploadPath, int maxPostSize, String encoding) {
+	private void wrapMultipartRequest(HttpServletRequest request, String uploadPath, long maxPostSize, String encoding) {
 		File dir = new File(uploadPath);
 		if ( !dir.exists()) {
 			if (!dir.mkdirs()) {

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

@@ -27,7 +27,7 @@ import com.oreilly.servlet.multipart.FileRenamePolicy;
  */
 public class OreillyCos {
 	
-	public static void init(String uploadPath, int maxPostSize, String encoding) {
+	public static void init(String uploadPath, long maxPostSize, String encoding) {
 		if (StrKit.isBlank(uploadPath)) {
 			throw new IllegalArgumentException("uploadPath can not be blank.");
 		}
@@ -46,7 +46,7 @@ public class OreillyCos {
 		MultipartRequest.fileRenamePolicy = fileRenamePolicy;
 	}
 	
-	private static void doInit(String uploadPath, int maxPostSize, String encoding) {
+	private static void doInit(String uploadPath, long maxPostSize, String encoding) {
 		uploadPath = uploadPath.trim();
 		uploadPath = uploadPath.replaceAll("\\\\", "/");