|
@@ -524,8 +524,10 @@ public class DisplayController extends BaseController {
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "upload avatar")
|
|
|
- @PostMapping(value = "/upload/coverImage")
|
|
|
- public ResponseEntity uploadAvatar(@RequestParam("coverImage") MultipartFile file,
|
|
|
+ @PostMapping(value = "/{displayId}/upload/coverImage")
|
|
|
+ public ResponseEntity uploadAvatar(@PathVariable("displayId") Long displayId,
|
|
|
+ @RequestParam("coverImage") MultipartFile file,
|
|
|
+ @ApiIgnore @CurrentUser User user,
|
|
|
HttpServletRequest request) {
|
|
|
|
|
|
|
|
@@ -533,8 +535,16 @@ public class DisplayController extends BaseController {
|
|
|
ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("file can not be EMPTY");
|
|
|
return ResponseEntity.status(resultMap.getCode()).body(resultMap);
|
|
|
}
|
|
|
-
|
|
|
+ if (null == displayId) {
|
|
|
+ ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("file can not be EMPTY");
|
|
|
+ return ResponseEntity.status(resultMap.getCode()).body(resultMap);
|
|
|
+ }
|
|
|
+ System.out.println(file.getOriginalFilename());
|
|
|
String avatar = displayService.uploadAvatar(file);
|
|
|
+ DisplayUpdate display = new DisplayUpdate();
|
|
|
+ display.setId(displayId);
|
|
|
+ display.setAvatar(avatar);
|
|
|
+ displayService.updateDisplay(display,user);
|
|
|
return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(avatar));
|
|
|
}
|
|
|
|
|
@@ -565,7 +575,7 @@ public class DisplayController extends BaseController {
|
|
|
return ResponseEntity.status(resultMap.getCode()).body(resultMap);
|
|
|
}
|
|
|
|
|
|
- System.out.println("请求 URL>>>>"+ request.getHeader("Host"));
|
|
|
+ System.out.println("请求 URL>>>>" + request.getHeader("Host"));
|
|
|
String slideBGImage = displaySlideService.uploadSlideBGImage(slideId, file, user);
|
|
|
return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(slideBGImage));
|
|
|
}
|