|
@@ -7,7 +7,6 @@ import com.willalp.common.exception.file.FileSizeLimitExceededException;
|
|
|
import com.willalp.common.exception.file.InvalidExtensionException;
|
|
|
import com.willalp.common.utils.DateUtils;
|
|
|
import com.willalp.common.utils.StringUtils;
|
|
|
-import com.willalp.common.utils.uuid.IdUtils;
|
|
|
import org.apache.commons.io.FilenameUtils;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
@@ -116,8 +115,7 @@ public class FileUploadUtils {
|
|
|
|
|
|
File desc = getAbsoluteFile(baseDir, fileName);
|
|
|
file.transferTo(desc);
|
|
|
- String pathFileName = getPathFileName(baseDir, fileName);
|
|
|
- return pathFileName;
|
|
|
+ return getPathFileName(baseDir, fileName);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -126,7 +124,8 @@ public class FileUploadUtils {
|
|
|
public static final String extractFilename(MultipartFile file) {
|
|
|
String fileName = file.getOriginalFilename();
|
|
|
String extension = getExtension(file);
|
|
|
- fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
|
|
|
+// fileName = DateUtils.datePath() + "/" + fileName + "." + extension;
|
|
|
+ fileName = DateUtils.datePath() + "/" + fileName;
|
|
|
return fileName;
|
|
|
}
|
|
|
|