|
@@ -170,14 +170,18 @@ public class VideoPostService {
|
|
|
try {
|
|
try {
|
|
|
ObjectMeta objectMeta = ossService.getObjectMeta(coverFileId);
|
|
ObjectMeta objectMeta = ossService.getObjectMeta(coverFileId);
|
|
|
if (objectMeta == null) {
|
|
if (objectMeta == null) {
|
|
|
|
|
+ log.error("cover objectId {} not exist", coverFileId);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ String currentCover = videoPost.getCoverUrl();
|
|
|
String coverUrl = objectMeta.getUrl();
|
|
String coverUrl = objectMeta.getUrl();
|
|
|
- ossService.deleteByObjectUrl(coverUrl);
|
|
|
|
|
videoRepository.updateVideoCover(videoId, coverUrl);
|
|
videoRepository.updateVideoCover(videoId, coverUrl);
|
|
|
|
|
+ if (currentCover != null && !currentCover.isBlank()) {
|
|
|
|
|
+ ossService.deleteByObjectUrl(currentCover);
|
|
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
- log.error("{}", e.getMessage());;
|
|
|
|
|
|
|
+ log.error("{}", e.getMessage());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -220,20 +224,16 @@ public class VideoPostService {
|
|
|
|
|
|
|
|
public void deleteVideo(String videoId) {
|
|
public void deleteVideo(String videoId) {
|
|
|
VideoPost videoPost = videoRepository.getVideoPost(videoId);
|
|
VideoPost videoPost = videoRepository.getVideoPost(videoId);
|
|
|
- long owner = -1L;
|
|
|
|
|
|
|
+ long owner = videoPost.getPublishBy();
|
|
|
|
|
+ //owner = -1L;
|
|
|
if (owner == UserContext.getUserId()) {
|
|
if (owner == UserContext.getUserId()) {
|
|
|
// 删除 videoId 关联的所有数据, 包括观看记录, 用户收藏, 视频数据, 视频标签, 推荐数据等
|
|
// 删除 videoId 关联的所有数据, 包括观看记录, 用户收藏, 视频数据, 视频标签, 推荐数据等
|
|
|
String coverUrl = videoPost.getCoverUrl();
|
|
String coverUrl = videoPost.getCoverUrl();
|
|
|
ossService.deleteByObjectUrl(coverUrl);
|
|
ossService.deleteByObjectUrl(coverUrl);
|
|
|
-
|
|
|
|
|
List<VideoUrlDto> list = videoRepository.getVideoUrls(videoId);
|
|
List<VideoUrlDto> list = videoRepository.getVideoUrls(videoId);
|
|
|
for (VideoUrlDto videoUrlDto : list) {
|
|
for (VideoUrlDto videoUrlDto : list) {
|
|
|
String videoFileId = videoUrlDto.getObjectId();
|
|
String videoFileId = videoUrlDto.getObjectId();
|
|
|
- try {
|
|
|
|
|
- ossService.deleteByObjectId(videoFileId);
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- log.error("{}", e.getMessage());;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ ossService.deleteByObjectId(videoFileId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
videoRepository.deleteVideoPost(videoId);
|
|
videoRepository.deleteVideoPost(videoId);
|