|
@@ -278,7 +278,8 @@ public class FileStoreUtils {
|
|
|
|
|
|
public String uploadFile(InputStream inputStream, String md5, UploadFileEnum uploadFileEnum, String path) {
|
|
|
try {
|
|
|
- String fileMd5 = DigestUtils.md5Hex(inputStream);
|
|
|
+ InputStream md5InputStream = inputStream;
|
|
|
+ String fileMd5 = DigestUtils.md5Hex(md5InputStream);
|
|
|
if (!Objects.equals(fileMd5, md5)) {
|
|
|
throw ExceptionResultEnum.MD5_EQUALS_FALSE.exception();
|
|
|
}
|
|
@@ -288,12 +289,12 @@ public class FileStoreUtils {
|
|
|
String type;
|
|
|
//上传至oss
|
|
|
if (oss || fssDomain.getConfig().startsWith(SystemConstant.START_PARENT)) {
|
|
|
- this.ossUpload(fileName, inputStream, fileMd5, uploadFileEnum.getFssType());
|
|
|
+ this.ossUpload(fileName, inputStream, md5, uploadFileEnum.getFssType());
|
|
|
type = SystemConstant.OSS;
|
|
|
}
|
|
|
// 上传本地服务器
|
|
|
else {
|
|
|
- this.localUpload(fileName, inputStream, fileMd5, uploadFileEnum.getFssType());
|
|
|
+ this.localUpload(fileName, inputStream, md5, uploadFileEnum.getFssType());
|
|
|
type = SystemConstant.LOCAL;
|
|
|
}
|
|
|
return JSON.toJSONString(new FilePathVo(fileName, uploadFileEnum, type));
|