Commit 70fea19a authored by liqin's avatar liqin 💬

bug fixed

parent 4cb8afb1
...@@ -15,7 +15,6 @@ import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController; ...@@ -15,7 +15,6 @@ import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.tobato.fastdfs.domain.fdfs.FileInfo; import com.github.tobato.fastdfs.domain.fdfs.FileInfo;
import com.github.tobato.fastdfs.domain.fdfs.MetaData; import com.github.tobato.fastdfs.domain.fdfs.MetaData;
import com.github.tobato.fastdfs.exception.FdfsServerException;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -174,6 +173,7 @@ public class FileUploadController extends BaseController { ...@@ -174,6 +173,7 @@ public class FileUploadController extends BaseController {
final Set<MetaData> fileMetaData = FastDFSUtils.getFileMetaData(fileUrlCrypto); final Set<MetaData> fileMetaData = FastDFSUtils.getFileMetaData(fileUrlCrypto);
String md5 = fileMetaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get(); String md5 = fileMetaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get();
asset.setMd5(md5); asset.setMd5(md5);
asset.setFileUrlCrypto(md5 + ".chnmuseum");
} else if (Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) { } else if (Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
metaDataSet.add(new MetaData("fileType", FileTypeEnum.AUDIO.name())); metaDataSet.add(new MetaData("fileType", FileTypeEnum.AUDIO.name()));
handleResult.setFileType(FileTypeEnum.AUDIO.name()); handleResult.setFileType(FileTypeEnum.AUDIO.name());
...@@ -557,7 +557,7 @@ public class FileUploadController extends BaseController { ...@@ -557,7 +557,7 @@ public class FileUploadController extends BaseController {
final long fileSize = fileInfo.getFileSize(); final long fileSize = fileInfo.getFileSize();
final Asset asset = Asset.builder() final Asset asset = Asset.builder()
.fileName(originalFilename) .fileName(originalFilename)
.fileNameCrypto(baseName + ".chnmuseum") .fileNameCrypto(md5 + ".chnmuseum")
.fileExtName(extName) .fileExtName(extName)
.fileType(FileTypeEnum.VIDEO.name()) .fileType(FileTypeEnum.VIDEO.name())
.fileSize(fileSize) .fileSize(fileSize)
......
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