|
@@ -188,7 +188,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
|
|
|
videoItemVO.setPageUrl(bucketData.getMiniPagePath());
|
|
videoItemVO.setPageUrl(bucketData.getMiniPagePath());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- videoItemVO.setShareCover(getShareCover(ContentPlatformPlanService.getVideoCover(video)));
|
|
|
|
|
|
|
+ videoItemVO.setShareCover(getShareCover(planItemVO.getType(), ContentPlatformPlanService.getVideoCover(video)));
|
|
|
videoItemVO.setPageUrl(buildCustomPageUrl(videoItemVO, video));
|
|
videoItemVO.setPageUrl(buildCustomPageUrl(videoItemVO, video));
|
|
|
videoVOList.add(videoItemVO);
|
|
videoVOList.add(videoItemVO);
|
|
|
}
|
|
}
|
|
@@ -775,13 +775,13 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
|
|
|
planItemVO.setCover(videoItem.getCover());
|
|
planItemVO.setCover(videoItem.getCover());
|
|
|
planItemVO.setVideo(videoItem.getVideo());
|
|
planItemVO.setVideo(videoItem.getVideo());
|
|
|
}
|
|
}
|
|
|
- planItemVO.setShareCover(getShareCover(planItemVO.getCover()));
|
|
|
|
|
|
|
+ planItemVO.setShareCover(getShareCover(planItemVO.getType(), planItemVO.getCover()));
|
|
|
result.add(planItemVO);
|
|
result.add(planItemVO);
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private String getShareCover(String cover) {
|
|
|
|
|
|
|
+ private String getShareCover(Integer type, String cover) {
|
|
|
if (!StringUtils.hasText(cover)) {
|
|
if (!StringUtils.hasText(cover)) {
|
|
|
return "";
|
|
return "";
|
|
|
}
|
|
}
|
|
@@ -790,8 +790,10 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
|
|
|
}
|
|
}
|
|
|
// 裁剪
|
|
// 裁剪
|
|
|
cover = cover + "?x-oss-process=image/resize,m_fill,w_600,h_480,limit_0/format,jpg";
|
|
cover = cover + "?x-oss-process=image/resize,m_fill,w_600,h_480,limit_0/format,jpg";
|
|
|
- // 水印
|
|
|
|
|
- if (cover.contains("yishihui")) {
|
|
|
|
|
|
|
+ // 水印 公众号推送不增加播放按钮
|
|
|
|
|
+ if (cover.contains("yishihui")
|
|
|
|
|
+ && type != ContentPlatformGzhPlanTypeEnum.FWH_PUSH.getVal()
|
|
|
|
|
+ && type != ContentPlatformGzhPlanTypeEnum.GZH_PUSH.getVal()) {
|
|
|
cover = cover + "/watermark,image_eXNoL3BpYy93YXRlcm1hcmtlci9pY29uX3BsYXlfd2hpdGUucG5nP3gtb3NzLXByb2Nlc3M9aW1hZ2UvcmVzaXplLHdfMTQ0,g_center";
|
|
cover = cover + "/watermark,image_eXNoL3BpYy93YXRlcm1hcmtlci9pY29uX3BsYXlfd2hpdGUucG5nP3gtb3NzLXByb2Nlc3M9aW1hZ2UvcmVzaXplLHdfMTQ0,g_center";
|
|
|
}
|
|
}
|
|
|
return cover;
|
|
return cover;
|