|
|
@@ -3,6 +3,7 @@ package com.boman.file.controller;
|
|
|
import com.boman.domain.dto.AjaxResult;
|
|
|
import com.boman.domain.dto.FileDto;
|
|
|
import org.apache.commons.lang3.BooleanUtils;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -35,7 +36,7 @@ public class SysFileController
|
|
|
* 文件上传请求
|
|
|
*/
|
|
|
@PostMapping("upload")
|
|
|
- public R<SysFile> upload(MultipartFile file)
|
|
|
+ public R<SysFile> upload(MultipartFile file, String filename)
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
@@ -46,10 +47,17 @@ public class SysFileController
|
|
|
String staticPath = urlList.get(0);
|
|
|
String absolutePath = urlList.get(1);
|
|
|
String originalName = urlList.get(2);
|
|
|
- sysFile.setName(originalName);
|
|
|
+ if(StringUtils.isEmpty(filename)) {
|
|
|
+ sysFile.setName(originalName);
|
|
|
+ sysFile.setOriginalName(originalName);
|
|
|
+ }else {
|
|
|
+ sysFile.setName(filename);
|
|
|
+ sysFile.setOriginalName(filename);
|
|
|
+ }
|
|
|
+
|
|
|
sysFile.setUrl(staticPath);
|
|
|
sysFile.setAbsolutePath(absolutePath);
|
|
|
- sysFile.setOriginalName(originalName);
|
|
|
+
|
|
|
|
|
|
return R.ok(sysFile);
|
|
|
}
|
zh