Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 2 years ago
parent
commit
27a9c9af16
1 changed files with 11 additions and 3 deletions
  1. 11 3
      src/main/java/com/goafanti/common/controller/BaseApiController.java

+ 11 - 3
src/main/java/com/goafanti/common/controller/BaseApiController.java

@@ -106,12 +106,20 @@ public class BaseApiController extends BaseController {
 	 * @throws IOException
 	 */
 	private String compressFile(File file, String fileName) throws IOException {
-		if (fileName.contains("jpg")||fileName.contains("jpeg")||fileName.contains("bmp")
-				||fileName.contains("png")){
+		if (file.length()>5242880&&
+		(fileName.contains("jpg")||fileName.contains("jpeg")||fileName.contains("bmp") ||fileName.contains("png"))){
+			String filetType="jpg";
+			if (fileName.contains("jpeg")){
+				filetType="jpeg";
+			}else if (fileName.contains("bmp")){
+				filetType="bmp";
+			}else if (fileName.contains("png")){
+				filetType="png";
+			}
 			String thumbnailFilePathName = fileName.substring(0, fileName.lastIndexOf(".")) + "_min"+fileName.substring(fileName.lastIndexOf("."));
 			double scale = 0.4d ;
 			Thumbnails.of(file).scale(1f).outputQuality(scale)
-					.outputFormat("jpg")
+					.outputFormat(filetType)
 					.toFile(uploadPath+thumbnailFilePathName);
 			FileUtils.deleteFile(uploadPath+fileName);
 			return thumbnailFilePathName;