github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!319 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java. 

Merge pull request !319 from Hacker/N/A
pull/321/head
若依 2021-08-10 03:32:08 +00:00 committed by Gitee
parent fba8008c81 e8782ab4bf
commit 6acfb0d5d9
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -101,21 +101,20 @@ public class CommonController
{
try
{
// 上传文件路径
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
String fileNames = "";
String urls = "";
for (MultipartFile file : files)
{
List<String> fileNames = new ArrayList<>();
List<String> urls = new ArrayList<>();
for (MultipartFile file : files) {
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;
fileNames += fileName + FILE_DELIMETER;
urls += url + FILE_DELIMETER;
fileNames.add(fileName);
urls.add(url);
}
AjaxResult ajax = AjaxResult.success();
ajax.put("fileNames", StringUtils.lastStringDel(fileNames, FILE_DELIMETER));
ajax.put("urls", StringUtils.lastStringDel(urls, FILE_DELIMETER));
ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
return ajax;
}
catch (Exception e)
@ -152,4 +151,4 @@ public class CommonController
log.error("下载文件失败", e);
}
}
}
}