|
@ -271,7 +271,6 @@ public class FileUploadController extends EnvelopRestEndpoint {
|
|
|
System.out.println("第"+files.getChunk());
|
|
|
return success("未传完",uploadVO);
|
|
|
}else {
|
|
|
|
|
|
File file1 = new File(taskid);
|
|
|
logger.info("size:"+file1.getTotalSpace());
|
|
|
FileInputStream input = new FileInputStream(file1);
|
|
@ -288,16 +287,13 @@ public class FileUploadController extends EnvelopRestEndpoint {
|
|
|
logger.info(rs);
|
|
|
JSONObject json = JSON.parseObject(rs);
|
|
|
uploadVO = objectMapper.readValue(json.getJSONObject("obj").toJSONString(),UploadVO.class);
|
|
|
|
|
|
}else {
|
|
|
// 得到文件的完整名称 xxx.txt
|
|
|
String originalFilename = multipartFile.getOriginalFilename();
|
|
|
|
|
|
//判断文件名称是否有包含后缀,及前端是否有传后缀名称,有的话拼接图片后缀
|
|
|
if(originalFilename.lastIndexOf(".") == 0 && StringUtils.isNotEmpty(filename)){
|
|
|
originalFilename = originalFilename +"."+filename;
|
|
|
}
|
|
|
|
|
|
InputStream inputStream = multipartFile.getInputStream();
|
|
|
uploadVO = fileUploadService.uploadStream(inputStream,originalFilename,fastdfs_file_url);
|
|
|
file1.delete();
|