Commit 22d65a7d authored by jiawei's avatar jiawei

BUG修改====》》修改文件上传的格式类型,与提示消息

parent 15548a2a
......@@ -57,7 +57,7 @@ public class FileUploadController extends BaseController {
private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "FLAC", "RM", "OGG"};
// private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV", "MPEG", "MPG", "MOV"};
//按照王亭亭提的BUG要求 修改视频界面的提示信息改为只支持MP4、flv、mov
private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV", "MOV"};
private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV","OGG","WEBM", "MOV"};
private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "PPT", "PPTX"};
private static final char[] SPLITTER_CHAR_2 = new char[]{'@', '#'};
private static final char[] SPLITTER_CHAR_3 = new char[]{'@', '#', '$'};
......@@ -440,7 +440,8 @@ public class FileUploadController extends BaseController {
String extName = FilenameUtils.getExtension(files[0].getOriginalFilename());
boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
if (!anyMatch) {
return getFailResult("目前仅支持" + String.join("、", VIDEO_TYPE) + "格式");
// return getFailResult("目前仅支持" + String.join("、", VIDEO_TYPE) + "格式");
return getFailResult("支持h264编码的MP4视频、VP8编码的webm视频和Theora编码的ogg视频");
}
}
String videoContentName = null;
......@@ -625,7 +626,8 @@ public class FileUploadController extends BaseController {
String extName = FilenameUtils.getExtension(files[0].getOriginalFilename());
boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
if (!anyMatch) {
return getFailResult("目前仅支持" + String.join("、", VIDEO_TYPE) + "格式");
// return getFailResult("目前仅支持" + String.join("、", VIDEO_TYPE) + "格式");
return getFailResult("支持h264编码的MP4视频、VP8编码的webm视频和Theora编码的ogg视频");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment