jfinal 5.1.5 release ^_^

src/main/java/com/jfinal/core/JFinal.java

@@ -29,7 +29,7 @@ import com.jfinal.render.RenderManager;
 import com.jfinal.server.IServer;
 import com.jfinal.token.ITokenCache;
 import com.jfinal.token.TokenManager;
-import com.jfinal.upload.OreillyCos;
+import com.jfinal.upload.UploadConfig;
 
 /**
  * JFinal
@@ -64,7 +64,7 @@ public final class JFinal {
 		initActionMapping();
 		initHandler();
 		initRender();
-		initOreillyCos();
+		initUploadConfig();
 		initTokenManager();
 	}
 	
@@ -85,8 +85,8 @@ public final class JFinal {
 		handler = HandlerFactory.getHandler(Config.getHandlers().getHandlerList(), actionHandler);
 	}
 	
-	private void initOreillyCos() {
-		OreillyCos.init(constants.getBaseUploadPath(), constants.getMaxPostSize(), constants.getEncoding());
+	private void initUploadConfig() {
+		UploadConfig.init(constants.getBaseUploadPath(), constants.getMaxPostSize(), constants.getEncoding());
 	}
 	
 	private void initPathKit() {

src/main/java/com/jfinal/upload/MultipartRequest.java

@@ -34,10 +34,6 @@ import com.oreilly.servlet.multipart.FileRenamePolicy;
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class MultipartRequest extends HttpServletRequestWrapper {
 	
-	static String baseUploadPath;
-	static long maxPostSize;
-	static String encoding;
-	
 	static FileRenamePolicy fileRenamePolicy = new DefaultFileRenamePolicy(){
 		@Override
 		public File rename(File f) {
@@ -57,12 +53,6 @@ public class MultipartRequest extends HttpServletRequestWrapper {
 	private List<UploadFile> uploadFiles;
 	private com.oreilly.servlet.MultipartRequest multipartRequest;
 	
-	static void init(String baseUploadPath, long maxPostSize, String encoding) {
-		MultipartRequest.baseUploadPath = baseUploadPath;
-		MultipartRequest.maxPostSize = maxPostSize;
-		MultipartRequest.encoding = encoding;
-	}
-	
 	public MultipartRequest(HttpServletRequest request, String uploadPath, long maxPostSize, String encoding) {
 		super(request);
 		wrapMultipartRequest(request, getFinalPath(uploadPath), maxPostSize, encoding);
@@ -70,17 +60,17 @@ public class MultipartRequest extends HttpServletRequestWrapper {
 	
 	public MultipartRequest(HttpServletRequest request, String uploadPath, long maxPostSize) {
 		super(request);
-		wrapMultipartRequest(request, getFinalPath(uploadPath), maxPostSize, encoding);
+		wrapMultipartRequest(request, getFinalPath(uploadPath), maxPostSize, UploadConfig.encoding);
 	}
 	
 	public MultipartRequest(HttpServletRequest request, String uploadPath) {
 		super(request);
-		wrapMultipartRequest(request, getFinalPath(uploadPath), maxPostSize, encoding);
+		wrapMultipartRequest(request, getFinalPath(uploadPath), UploadConfig.maxPostSize, UploadConfig.encoding);
 	}
 	
 	public MultipartRequest(HttpServletRequest request) {
 		super(request);
-		wrapMultipartRequest(request, baseUploadPath, maxPostSize, encoding);
+		wrapMultipartRequest(request, UploadConfig.baseUploadPath, UploadConfig.maxPostSize, UploadConfig.encoding);
 	}
 	
 	/**
@@ -93,13 +83,13 @@ public class MultipartRequest extends HttpServletRequestWrapper {
 		
 		uploadPath = uploadPath.trim();
 		if (uploadPath.startsWith("/") || uploadPath.startsWith("\\")) {
-			if (baseUploadPath.equals("/")) {
+			if (UploadConfig.baseUploadPath.equals("/")) {
 				return uploadPath;
 			} else {
-				return baseUploadPath + uploadPath;
+				return UploadConfig.baseUploadPath + uploadPath;
 			}
 		} else {
-			return baseUploadPath + File.separator + uploadPath;
+			return UploadConfig.baseUploadPath + File.separator + uploadPath;
 		}
 	}
 	

src/main/java/com/jfinal/upload/OreillyCos.java

@@ -16,56 +16,18 @@
 
 package com.jfinal.upload;
 
-import java.io.File;
-import com.jfinal.kit.LogKit;
-import com.jfinal.kit.PathKit;
-import com.jfinal.kit.StrKit;
 import com.oreilly.servlet.multipart.FileRenamePolicy;
 
 /**
  * OreillyCos.
  */
 public class OreillyCos {
-	
-	public static void init(String uploadPath, long maxPostSize, String encoding) {
-		if (StrKit.isBlank(uploadPath)) {
-			throw new IllegalArgumentException("uploadPath can not be blank.");
-		}
-		try {
-			Class.forName("com.oreilly.servlet.MultipartRequest");
-			doInit(uploadPath, maxPostSize, encoding);
-		} catch (ClassNotFoundException e) {
-			LogKit.logNothing(e);
-		}
-	}
-	
 	public static void setFileRenamePolicy(FileRenamePolicy fileRenamePolicy) {
 		if (fileRenamePolicy == null) {
 			throw new IllegalArgumentException("fileRenamePolicy can not be null.");
 		}
 		MultipartRequest.fileRenamePolicy = fileRenamePolicy;
 	}
-	
-	private static void doInit(String uploadPath, long maxPostSize, String encoding) {
-		uploadPath = uploadPath.trim();
-		uploadPath = uploadPath.replaceAll("\\\\", "/");
-		
-		String baseUploadPath;
-		if (PathKit.isAbsolutePath(uploadPath)) {
-			baseUploadPath = uploadPath;
-		} else {
-			baseUploadPath = PathKit.getWebRootPath() + File.separator + uploadPath;
-		}
-		
-		// remove "/" postfix
-		if (baseUploadPath.equals("/") == false) {
-			if (baseUploadPath.endsWith("/")) {
-				baseUploadPath = baseUploadPath.substring(0, baseUploadPath.length() - 1);
-			}
-		}
-		
-		MultipartRequest.init(baseUploadPath, maxPostSize, encoding);
-	}
 }
 
 

src/main/java/com/jfinal/upload/ProgressUploadFileConfig.java

@@ -2,9 +2,7 @@ package com.jfinal.upload;
 
 import com.jfinal.kit.StrKit;
 import com.jfinal.kit.TimeKit;
-
 import java.io.File;
-import java.util.Date;
 
 /**
  * 进度上传文件配置

src/main/java/com/jfinal/upload/ProgressUploadFileKit.java

@@ -6,7 +6,6 @@ import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.ProgressListener;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
-
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.List;
@@ -87,18 +86,18 @@ public class ProgressUploadFileKit {
      */
     private static String getFinalPath(String uploadPath) {
         if (uploadPath == null) {
-            return MultipartRequest.baseUploadPath;
+            return UploadConfig.baseUploadPath;
         }
 
         uploadPath = uploadPath.trim();
         if (uploadPath.startsWith("/") || uploadPath.startsWith("\\")) {
-            if (MultipartRequest.baseUploadPath.equals("/")) {
+            if (UploadConfig.baseUploadPath.equals("/")) {
                 return uploadPath;
             } else {
-                return MultipartRequest.baseUploadPath + uploadPath;
+                return UploadConfig.baseUploadPath + uploadPath;
             }
         } else {
-            return MultipartRequest.baseUploadPath + File.separator + uploadPath;
+            return UploadConfig.baseUploadPath + File.separator + uploadPath;
         }
     }
 }