bug fixed

src/main/java/cn/chnmuseum/party/model/Asset.java

 package cn.chnmuseum.party.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -62,9 +61,8 @@ public class Asset implements Serializable {
     @TableField("file_cat")
     private String fileCat;
 
-    @ApiModelProperty(hidden = true)
+    @ApiModelProperty("下载链接")
     @TableField("file_url")
-    @JSONField(serialize = false)
     private String fileUrl;
 
     @ApiModelProperty("Base64加密链接")

src/main/java/cn/chnmuseum/party/web/controller/FileUploadController.java

@@ -177,50 +177,52 @@ public class FileUploadController extends BaseController {
                     String md5 = fileMetaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get();
                     asset.setMd5(md5);
                     asset.setIntro(Base64.getEncoder().encodeToString(fileUrl.getBytes()));
-                    asset.setFileUrlCrypto(md5 + ".chnmuseum");
+                    asset.setFileNameCrypto(md5 + ".chnmuseum");
+                    asset.setFileUrlCrypto(fileUrlCrypto);
                 } else if (Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
                     metaDataSet.add(new MetaData("fileType", FileTypeEnum.AUDIO.name()));
                     handleResult.setFileType(FileTypeEnum.AUDIO.name());
                     asset.setFileType(FileTypeEnum.AUDIO.name());
                     fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
+                    asset.setFileUrl(fileUrl);
                 } else if (Arrays.stream(IMAGE_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
                     metaDataSet.add(new MetaData("fileType", FileTypeEnum.IMAGE.name()));
                     handleResult.setFileType(FileTypeEnum.IMAGE.name());
                     asset.setFileType(FileTypeEnum.IMAGE.name());
                     fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
                     asset.setThumbnail(fileUrl);
+                    asset.setFileUrl(fileUrl);
                 } else if (Arrays.stream(DOC_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
                     metaDataSet.add(new MetaData("fileType", FileTypeEnum.DOCUMENT.name()));
                     handleResult.setFileType(FileTypeEnum.DOCUMENT.name());
                     asset.setFileType(FileTypeEnum.DOCUMENT.name());
                     fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
+                    asset.setFileUrl(fileUrl);
                 }
                 final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
-                final int crc32 = fileInfo.getCrc32();
-                final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32).last(" limit 1"));
-
                 final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000);
                 asset.setFileSize(fileInfo.getFileSize());
-                asset.setFileUrl(fileUrl);
-                asset.setFileUrlCrypto(fileUrlCrypto);
                 asset.setFileCat(FileCatEnum.EXHIBITION_BOARD_DATUM.name());
                 asset.setLanguage(language);
-                if (Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
-                    asset.setCrc32((long) crc32);
-                }
                 asset.setCreateTime(createTime);
                 asset.setUpdateTime(createTime);
-                if (one != null) {
-                    try {
-                        FastDFSUtils.deleteFile(fileUrl);
-                        FastDFSUtils.deleteFile(fileUrlCrypto);
-                    } catch (Throwable ignored) {
+                if (Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
+                    final int crc32 = fileInfo.getCrc32();
+                    final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32).last(" limit 1"));
+                    asset.setCrc32((long) crc32);
+                    if (one != null) {
+                        try {
+                            FastDFSUtils.deleteFile(fileUrl);
+                            FastDFSUtils.deleteFile(fileUrlCrypto);
+                        } catch (Throwable ignored) {
+                        }
+                        asset.setFileUrl(one.getFileUrl());
+                        asset.setIntro(one.getIntro());
+                        asset.setFileUrlCrypto(one.getFileUrlCrypto());
+                        asset.setFileNameCrypto(one.getFileNameCrypto());
+                        asset.setMd5(one.getMd5());
+                        asset.setCrc32(one.getCrc32());
                     }
-                    asset.setFileUrl(one.getFileUrl());
-                    asset.setIntro(one.getIntro());
-                    asset.setFileUrlCrypto(one.getFileUrlCrypto());
-                    asset.setMd5(one.getMd5());
-                    asset.setCrc32(one.getCrc32());
                 }
                 this.assetService.save(asset);
                 datumUrlList.add(asset);
@@ -561,7 +563,6 @@ public class FileUploadController extends BaseController {
                         .fileExtName(extName)
                         .fileType(FileTypeEnum.VIDEO.name())
                         .fileSize(fileSize)
-                        .fileUrl(fileUrl)
                         .intro(Base64.getEncoder().encodeToString(fileUrl.getBytes()))
                         .fileUrlCrypto(fileUrlCrypto)
                         .fileCat(FileCatEnum.VIDEO_CONTENT.name())
@@ -575,9 +576,9 @@ public class FileUploadController extends BaseController {
                 if (one != null) {
                     FastDFSUtils.deleteFile(fileUrl);
                     FastDFSUtils.deleteFile(fileUrlCrypto);
-                    asset.setFileUrl(one.getFileUrl());
                     asset.setIntro(one.getIntro());
                     asset.setFileUrlCrypto(one.getFileUrlCrypto());
+                    asset.setFileNameCrypto(one.getFileNameCrypto());
                     asset.setMd5(one.getMd5());
                     asset.setCrc32(one.getCrc32());
                 }