changes

liuhaonan

2022-11-14 5cfaa9b36929545906d57c48c0f07a7c6f23d157

 sandu-common/src/main/java/com/sandu/common/file/impl/LocalFileUploadImpl.java

@@ -8,7 +8,6 @@
import com.sandu.common.enums.FileStorageEnums;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.*;
import com.sandu.common.file.config.FileProperties;
import com.sandu.common.file.config.NovaFileConfig;
import com.sandu.common.util.SpringContextHolder;
import lombok.AllArgsConstructor;
@@ -35,8 +34,7 @@
@AllArgsConstructor
public class LocalFileUploadImpl implements IFileUpload {

    private static List<String> videoSuffixList = CollectionUtil.newArrayList("mp4", "mov", "avi", "mkv", "m4v", "wmv",
            "asf", "asx", "rm", "rmvb", "3gp", "dat", "flv", "vob");
    private static List<String> videoSuffixList = CollectionUtil.newArrayList("mp4", "mov", "avi", "mkv", "m4v", "wmv", "asf", "asx", "rm", "rmvb", "3gp", "dat", "flv", "vob");

    private final FileToThumbnail fileToThumbnail;

@@ -52,7 +50,7 @@
        File dest;
        try {
            String type = Optional.ofNullable(FileTypeUtil.getType(multipartFile.getInputStream(), originalFilename)).orElse("");
            dest = new File(fileProperties.getUploadRootPath() + type + File.separator + date + File.separator + fileName).getCanonicalFile();
            dest = new File(fileProperties.getUploadRootPath() + File.separator + type + File.separator + date + File.separator + fileName).getCanonicalFile();

            if (!dest.getParentFile().exists()) {
                dest.getParentFile().mkdirs();
@@ -67,8 +65,10 @@
        FileUploadDto uploadDto = new FileUploadDto();
        uploadDto.setOriginName(originalFilename);
        uploadDto.setFileName(fileName);
        uploadDto.setRealUrl(dest.getPath());
        uploadDto.setFileUrl(fileProperties.getRealUrl() + dest.getPath());
        System.out.println(File.separator);
        uploadDto.setRealUrl(dest.getPath().replaceAll("\\\\", "/"));
        System.out.println(dest.getPath());
        uploadDto.setFileUrl(dest.getPath().replace(fileProperties.getUploadRootPath(), "").replaceAll("\\\\", "/"));
        uploadDto.setFileType(FileUtil.getType(dest));
        uploadDto.setStorageType(FileStorageEnums.LOCAL.getCode());
        uploadDto.setFileSize(size);
@@ -95,10 +95,9 @@
            }
            try {
                InputStream inputStream = multipartFile.getInputStream();
                String screenShot = fileProperties.getUploadRootPath() + uploadDto.getFileType()
                        + File.separator + date + File.separator + "screenShot" + uuidStr + ".jpg";
                String screenShot = fileProperties.getUploadRootPath() + uploadDto.getFileType() + File.separator + date + File.separator + "screenShot" + uuidStr + ".jpg";
                String thumbnailForVideo = fileToThumbnail.getThumbnailForVideo(inputStream, screenShot);
                uploadDto.setScreenShot(fileProperties.getRealUrl() + thumbnailForVideo);
                uploadDto.setScreenShot(thumbnailForVideo);
                inputStream.close();
            } catch (IOException e) {
                throw new RuntimeException(e);
@@ -130,4 +129,18 @@
        }
        return null;
    }

    public static void main(String[] args) {
//        String a = "E:\\\\file\\\\png\\\\2022-11-14\\\\bc8cbe61-2c81-4dac-911a-91b711eebc24\\\\png";
//        System.out.println(a);
//        System.out.println(a.replaceAll("\\\\", "/"));
        File f = null;
        try {
            f = new File("E:\\file\\png\\2022-11-14\\cc4ce72e-2304-4f45-81e5-3b57519d57b6.png").getCanonicalFile();
        } catch (IOException e) {
            e.printStackTrace();
        }
        System.out.println(File.separator);
        System.out.println(f.getPath());
    }
}