ronger 2022-01-08 21:24:28 +08:00 committed by GitHub
commit 16ad1d32e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions

View File

@ -7,7 +7,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.net.URLEncoder;
import java.util.Arrays;
/**
* 文件操作工具类
@ -35,13 +34,20 @@ public class FileUtils {
* @return
*/
public static String getExtend(String filename, String defExt) {
if ((filename != null) && (filename.length() > 0)) {
int i = filename.lastIndexOf('.');
if ((i > 0) && (i < (filename.length() - 1))) {
return (filename.substring(i + 1)).toLowerCase();
}
if (StringUtils.isEmpty(filename)) {
return defExt.toLowerCase();
}
int i = filename.lastIndexOf('.');
if ((i > 0) && (i < (filename.length() - 1))) {
String result = filename.substring(i + 1).toLowerCase();
if (result.contains("?")) {
return result.split("\\?")[0];
}
return result;
}
return defExt.toLowerCase();
}

View File

@ -187,8 +187,7 @@ public class UploadController {
String localPath = Utils.getProperty("resource.file-path") + "/" + typePath + "/";
String orgName = url.substring(url.lastIndexOf("."));
String fileName = System.currentTimeMillis() + FileUtils.getExtend(orgName).toLowerCase();
String fileName = System.currentTimeMillis() + "." + FileUtils.getExtend(url);
String savePath = file.getPath() + File.separator + fileName;