mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

This commit is contained in:
Jason 2022-09-20 18:49:02 +08:00
parent c3ea44292f 02317bee8e
commit 73984d52c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java
View File

@ -36,7 +36,7 @@ public class GlobalConfig {
public static Integer uploadImageSize = 1024 * 1024 * 10; public static Integer uploadImageSize = 1024 * 1024 * 10;
// 上传视频限制 // 上传视频限制
public static Integer uploadVideoSize = 1024 * 1024 * 10; public static Integer uploadVideoSize = 1024 * 1024 * 30;
// 上传图片扩展 // 上传图片扩展
public static String[] uploadImageExt = new String[] {"png", "jpg", "jpeg", "gif", "ico", "bmp"}; public static String[] uploadImageExt = new String[] {"png", "jpg", "jpeg", "gif", "ico", "bmp"};

4
server/like-common/src/main/java/com/mdd/common/plugin/storage/StorageDriver.java
View File

@ -115,14 +115,14 @@ public class StorageDriver {
throw new OperateException("不被支持的扩展:" + fileExt); throw new OperateException("不被支持的扩展:" + fileExt);
} }
if (fileSize > GlobalConfig.uploadImageSize) { if (fileSize > GlobalConfig.uploadImageSize) {
throw new OperateException("上传图片不能超出限制:" + GlobalConfig.uploadImageSize); throw new OperateException("上传图片不能超出限制:" + (GlobalConfig.uploadImageSize / 1024 / 1024) + "M");
} }
} else if (type == 20) { } else if (type == 20) {
if (!Arrays.asList(GlobalConfig.uploadVideoExt).contains(fileExt)) { if (!Arrays.asList(GlobalConfig.uploadVideoExt).contains(fileExt)) {
throw new OperateException("不被支持的扩展:" + fileExt); throw new OperateException("不被支持的扩展:" + fileExt);
} }
if (fileSize > GlobalConfig.uploadVideoSize) { if (fileSize > GlobalConfig.uploadVideoSize) {
throw new OperateException("上传视频不能超出限制:" + GlobalConfig.uploadImageSize); throw new OperateException("上传视频不能超出限制:" + (GlobalConfig.uploadVideoSize / 1024 / 1024) + "M");
} }
} }
} }