|
@@ -61,7 +61,9 @@ public class FileUploadUtil {
|
|
|
} else if (videoFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
} else if (videoFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
|
prefix = "video/";
|
|
prefix = "video/";
|
|
|
}
|
|
}
|
|
|
- return aliOSSUtil.uploadFile(multipartFile, prefix + fileNameAndType.get("name") + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type"));
|
|
|
|
|
|
|
+ // 去除文件名中的逗号,避免URL拼接时被错误分割
|
|
|
|
|
+ String fileName = fileNameAndType.get("name").replaceAll(",", "");
|
|
|
|
|
+ return aliOSSUtil.uploadFile(multipartFile, prefix + fileName + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type"));
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.error("FileUpload.uploadOneFile ERROR Msg={}", e.getMessage());
|
|
log.error("FileUpload.uploadOneFile ERROR Msg={}", e.getMessage());
|
|
|
throw new RuntimeException(e);
|
|
throw new RuntimeException(e);
|
|
@@ -111,14 +113,17 @@ public class FileUploadUtil {
|
|
|
uploadDir += "/image";
|
|
uploadDir += "/image";
|
|
|
prefix = "image/";
|
|
prefix = "image/";
|
|
|
log.info("FileUpload.uploadMoreFile 获取到图片文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
log.info("FileUpload.uploadMoreFile 获取到图片文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
|
- filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + fileNameAndType.get("name") + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
|
|
|
|
+ // 去除文件名中的逗号,避免URL拼接时被错误分割
|
|
|
|
|
+ String imageFileName = fileNameAndType.get("name").replaceAll(",", "");
|
|
|
|
|
+ filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + imageFileName + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
;
|
|
;
|
|
|
} else if (videoFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
} else if (videoFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
|
uploadDir += "/video/";
|
|
uploadDir += "/video/";
|
|
|
prefix = "video/";
|
|
prefix = "video/";
|
|
|
//上传视频文件
|
|
//上传视频文件
|
|
|
log.info("FileUpload.uploadMoreFile 获取到视频文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
log.info("FileUpload.uploadMoreFile 获取到视频文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
|
- String videoFileName = fileNameAndType.get("name") + RandomCreateUtil.getRandomNum(6);
|
|
|
|
|
|
|
+ // 去除文件名中的逗号,避免URL拼接时被错误分割
|
|
|
|
|
+ String videoFileName = fileNameAndType.get("name").replaceAll(",", "") + RandomCreateUtil.getRandomNum(6);
|
|
|
String cacheVideoPath = copyFile(uploadDir, multipartFile);
|
|
String cacheVideoPath = copyFile(uploadDir, multipartFile);
|
|
|
filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + videoFileName + "." + fileNameAndType.get("type")));
|
|
filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + videoFileName + "." + fileNameAndType.get("type")));
|
|
|
//缓存视频截图使用
|
|
//缓存视频截图使用
|
|
@@ -140,17 +145,23 @@ public class FileUploadUtil {
|
|
|
uploadDir += "/voice";
|
|
uploadDir += "/voice";
|
|
|
prefix = "voice/";
|
|
prefix = "voice/";
|
|
|
log.info("FileUpload.uploadMoreFile 获取到语音文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
log.info("FileUpload.uploadMoreFile 获取到语音文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
|
- filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + fileNameAndType.get("name") + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
|
|
|
|
+ // 去除文件名中的逗号,避免URL拼接时被错误分割
|
|
|
|
|
+ String voiceFileName = fileNameAndType.get("name").replaceAll(",", "");
|
|
|
|
|
+ filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + voiceFileName + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
} else if (privacyFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
} else if (privacyFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
|
uploadDir += "/privacy/";
|
|
uploadDir += "/privacy/";
|
|
|
prefix = "privacy/";
|
|
prefix = "privacy/";
|
|
|
log.info("FileUpload.uploadMoreFile 获取到隐私文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
log.info("FileUpload.uploadMoreFile 获取到隐私文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
|
- filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + fileNameAndType.get("name") + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
|
|
|
|
+ // 去除文件名中的逗号,避免URL拼接时被错误分割
|
|
|
|
|
+ String privacyFileName = fileNameAndType.get("name").replaceAll(",", "");
|
|
|
|
|
+ filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + privacyFileName + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
} else if (ohterFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
} else if (ohterFileType.contains(fileNameAndType.get("type").toLowerCase())) {
|
|
|
uploadDir += "/other/";
|
|
uploadDir += "/other/";
|
|
|
prefix = "other/";
|
|
prefix = "other/";
|
|
|
log.info("FileUpload.uploadMoreFile 获取到其他文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
log.info("FileUpload.uploadMoreFile 获取到其他文件准备复制 {} {} {}", uploadDir, prefix, multipartFile.getOriginalFilename());
|
|
|
- filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + fileNameAndType.get("name") + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
|
|
|
|
+ // 去除文件名中的逗号,避免URL拼接时被错误分割
|
|
|
|
|
+ String otherFileName = fileNameAndType.get("name").replaceAll(",", "");
|
|
|
|
|
+ filePathList.add(aliOSSUtil.uploadFile(multipartFile, prefix + otherFileName + RandomCreateUtil.getRandomNum(6) + "." + fileNameAndType.get("type")));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return filePathList;
|
|
return filePathList;
|
|
@@ -186,7 +197,9 @@ public class FileUploadUtil {
|
|
|
//获取文件
|
|
//获取文件
|
|
|
MultipartFile multipartFile = multipartRequest.getFileMap().get(storeImgVo.getName());
|
|
MultipartFile multipartFile = multipartRequest.getFileMap().get(storeImgVo.getName());
|
|
|
Map<String, String> fileInfo = FileUtil.getFileNameAndType(multipartFile);
|
|
Map<String, String> fileInfo = FileUtil.getFileNameAndType(multipartFile);
|
|
|
- String videoFileName = fileInfo.get("name") + RandomCreateUtil.getRandomNum(6);
|
|
|
|
|
|
|
+ // 去除文件名中的逗号,避免URL拼接时被错误分割
|
|
|
|
|
+ String cleanFileName = fileInfo.get("name").replaceAll(",", "");
|
|
|
|
|
+ String videoFileName = cleanFileName + RandomCreateUtil.getRandomNum(6);
|
|
|
String prefix;
|
|
String prefix;
|
|
|
String filePath = "";
|
|
String filePath = "";
|
|
|
if (imageFileType.contains(fileInfo.get("type").toLowerCase())) {
|
|
if (imageFileType.contains(fileInfo.get("type").toLowerCase())) {
|