Compare commits
No commits in common. "7e85418e3163aa996b38fe6a5748db6f2a76f3aa" and "235334711466f602955fff73c39ac52faff4e9c1" have entirely different histories.
7e85418e31
...
2353347114
|
|
@ -48,8 +48,7 @@ public class SysFileServiceImpl implements SysFileService {
|
|||
FileInfo file = new FileInfo();
|
||||
StandardMultipartHttpServletRequest req = (StandardMultipartHttpServletRequest) request;
|
||||
String photoType = req.getParameter("fileType");
|
||||
// String userId = req.getParameter("userId");
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
String userId = req.getParameter("userId");
|
||||
HashMap<String, Object> map = getFile(req);
|
||||
List<MultipartFile> items = (List<MultipartFile>) map.get("filePath");
|
||||
MultipartFile item = items.get(0);
|
||||
|
|
@ -62,7 +61,7 @@ public class SysFileServiceImpl implements SysFileService {
|
|||
long size = item.getSize()/1024/1024;
|
||||
file.setFileName(fileName);
|
||||
file.setFileUrl(url);
|
||||
file.setCreator(userId.toString());
|
||||
file.setCreator(userId);
|
||||
file.setType(type);
|
||||
file.setSize(size + "M");
|
||||
file.setWords(words);
|
||||
|
|
@ -98,7 +97,7 @@ public class SysFileServiceImpl implements SysFileService {
|
|||
String tmpName = multipartFile.getOriginalFilename();// 完整路径 IE
|
||||
tmpName = tmpName.substring(tmpName.lastIndexOf("\\") + 1);
|
||||
tmpName = IdUtil.fastSimpleUUID() + tmpName;
|
||||
String imageFiles="/data/sgzb/" + fileType + "/";
|
||||
String imageFiles="/data/sz/zstp/" + fileType + "/";
|
||||
String os = System.getProperty("os.name");
|
||||
if(os.toLowerCase().startsWith("win")){
|
||||
imageFiles="D://files/" + fileType + "/";
|
||||
|
|
|
|||
Loading…
Reference in New Issue