上传功能完善

This commit is contained in:
x ronger 2019-12-18 01:15:01 +08:00
parent 6356d963a1
commit bb5e30e352

View File

@ -26,11 +26,12 @@ import java.util.Set;
@RequestMapping("/api/v1/upload") @RequestMapping("/api/v1/upload")
public class UploadController { public class UploadController {
private final static String UPLOAD_SIMPLE_URL = "/api/upload/file";
private final static String UPLOAD_URL = "/api/upload/file/batch"; private final static String UPLOAD_URL = "/api/upload/file/batch";
public static final String ctxHeadPicPath = "/usr/local/src/tomcat-hp/webapps/vertical"; public static final String ctxHeadPicPath = "/usr/local/src/tomcat-hp/webapps/vertical";
@PostMapping("/file") @PostMapping("/file")
public GlobalResult uploadPicture(@RequestParam(value = "file", required = false) MultipartFile multipartFile, Integer type, HttpServletRequest request){ public GlobalResult uploadPicture(@RequestParam(value = "file", required = false) MultipartFile multipartFile,@RequestParam(defaultValue = "1")Integer type, HttpServletRequest request){
if (multipartFile == null) { if (multipartFile == null) {
return GlobalResultGenerator.genErrorResult("请选择要上传的文件"); return GlobalResultGenerator.genErrorResult("请选择要上传的文件");
} }
@ -54,24 +55,20 @@ public class UploadController {
} }
String localPath = Utils.getProperty("resource.file-path")+"/"+typePath+"/"; String localPath = Utils.getProperty("resource.file-path")+"/"+typePath+"/";
Map succMap = new HashMap(10);
Set errFiles = new HashSet();
String orgName = multipartFile.getOriginalFilename(); String orgName = multipartFile.getOriginalFilename();
String fileName = System.currentTimeMillis()+"."+ FileUtils.getExtend(orgName).toLowerCase(); String fileName = System.currentTimeMillis()+"."+ FileUtils.getExtend(orgName).toLowerCase();
String savePath = file.getPath() + File.separator + fileName; String savePath = file.getPath() + File.separator + fileName;
Map data = new HashMap(2);
File saveFile = new File(savePath); File saveFile = new File(savePath);
try { try {
FileCopyUtils.copy(multipartFile.getBytes(), saveFile); FileCopyUtils.copy(multipartFile.getBytes(), saveFile);
succMap.put(orgName,localPath+fileName); data.put("url", localPath+fileName);
} catch (IOException e) { } catch (IOException e) {
errFiles.add(orgName); data.put("message", "上传失败!");
} }
Map data = new HashMap(2);
data.put("errFiles",errFiles);
data.put("succMap",succMap);
return GlobalResultGenerator.genSuccessResult(data); return GlobalResultGenerator.genSuccessResult(data);
} }
@ -122,6 +119,19 @@ public class UploadController {
return GlobalResultGenerator.genSuccessResult(data); return GlobalResultGenerator.genSuccessResult(data);
} }
@GetMapping("/simple/token")
public GlobalResult uploadSimpleToken(HttpServletRequest request) throws BaseApiException {
String authHeader = request.getHeader(JwtConstants.AUTHORIZATION);
if(StringUtils.isBlank(authHeader)){
throw new BaseApiException(ErrorCode.UNAUTHORIZED);
}
TokenUser tokenUser = UserUtils.getTokenUser(authHeader);
Map map = new HashMap(2);
map.put("uploadToken", tokenUser.getToken());
map.put("uploadURL", UPLOAD_SIMPLE_URL);
return GlobalResultGenerator.genSuccessResult(map);
}
@GetMapping("/token") @GetMapping("/token")
public GlobalResult uploadToken(HttpServletRequest request) throws BaseApiException { public GlobalResult uploadToken(HttpServletRequest request) throws BaseApiException {
String authHeader = request.getHeader(JwtConstants.AUTHORIZATION); String authHeader = request.getHeader(JwtConstants.AUTHORIZATION);