优化代码

RuoYi

2023-02-21 ad76d4301c1b37a316b58a020d70817d3d89fad0

 src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -2,6 +2,7 @@


import java.io.File;

import java.io.IOException;

import java.nio.file.Paths;

import java.util.Objects;

import org.apache.commons.io.FilenameUtils;

import org.springframework.web.multipart.MultipartFile;

@@ -10,8 +11,8 @@
import com.ruoyi.common.exception.file.FileSizeLimitExceededException;

import com.ruoyi.common.exception.file.InvalidExtensionException;

import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.common.utils.IdUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.uuid.Seq;

import com.ruoyi.framework.config.RuoYiConfig;



/**

@@ -101,8 +102,8 @@
            throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,

            InvalidExtensionException

    {

        int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();

        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)

        int fileNameLength = Objects.requireNonNull(file.getOriginalFilename()).length();

        if (fileNameLength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)

        {

            throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);

        }

@@ -111,8 +112,8 @@


        String fileName = extractFilename(file);



        File desc = getAbsoluteFile(baseDir, fileName);

        file.transferTo(desc);

        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();

        file.transferTo(Paths.get(absPath));

        return getPathFileName(baseDir, fileName);

    }



@@ -121,10 +122,8 @@
     */

    public static final String extractFilename(MultipartFile file)

    {

        String fileName = file.getOriginalFilename();

        String extension = getExtension(file);

        fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;

        return fileName;

        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),

                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));

    }



    public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException

@@ -194,7 +193,6 @@
                throw new InvalidExtensionException(allowedExtension, extension, fileName);

            }

        }



    }



    /**