ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化上传文件路径

This commit is contained in:
zhujj 2018-12-24 14:35:06 +08:00
parent 2e3a373da4
commit 9421179880
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java
View File

@ -57,7 +57,7 @@ public class UploadFileController extends BaseController {
if (null != module) {
filePath=module+ File.separator+ DateUtil.today()+ File.separator;
}
String fileName = FileUploadUtils.upload( Global.getAvatarPath()+filePath, file,originalFileName);
String fileName = FileUploadUtils.upload( Global.getAvatarPath()+filePath, file,false,originalFileName);
AjaxResult ajaxResult = new AjaxResult();
ajaxResult.put( "fileName", filePath+fileName );
ajaxResult.put( "code", "200" );

13
ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/FileUploadUtils.java
View File

@ -54,7 +54,7 @@ public class FileUploadUtils {
*/
public static final String upload(MultipartFile file) throws IOException {
try {
return upload( getDefaultBaseDir(), file, FileUploadUtils.IMAGE_JPG_EXTENSION );
return upload( getDefaultBaseDir(), file,true, FileUploadUtils.IMAGE_JPG_EXTENSION );
} catch (Exception e) {
throw new IOException( e );
}
@ -70,7 +70,7 @@ public class FileUploadUtils {
*/
public static final String upload(String baseDir, MultipartFile file) throws IOException {
try {
return upload( baseDir, file, FileUploadUtils.IMAGE_JPG_EXTENSION );
return upload( baseDir, file,true, FileUploadUtils.IMAGE_JPG_EXTENSION );
} catch (Exception e) {
throw new IOException( e );
}
@ -88,7 +88,7 @@ public class FileUploadUtils {
* @throws FileNameLengthLimitExceededException 文件名太长
* @throws IOException 比如读写文件出错时
*/
public static final String upload(String baseDir, MultipartFile file, String extension)
public static final String upload(String baseDir, MultipartFile file,boolean needDatePathAndRandomName, String extension)
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException {
int fileNamelength = file.getOriginalFilename().length();
@ -99,7 +99,10 @@ public class FileUploadUtils {
assertAllowed( file );
String fileName = encodingFilename( file.getOriginalFilename(), extension );
String fileName = extension;
if(needDatePathAndRandomName){
fileName =encodingFilename( file.getOriginalFilename(), extension );
}
File desc = getAbsoluteFile( baseDir, baseDir + fileName );
file.transferTo( desc );
@ -127,7 +130,7 @@ public class FileUploadUtils {
return filename;
}
/**
/**` 、。，
* 文件大小校验
*
* @param file 上传的文件