platform / platform-cms · Commits

Go to a project

Authored by 周少峰
Commit 08c6199bfe1ca4d0493c04cc39143ccfe029ec67 2 parents c1839950 eeda13bd

Merge branch 'test6.9.8' of git.yoho.cn:platform/platform-cms into test6.9.8

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
... ... @@ -272,7 +272,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
break;
case BLOCK_VIDEO:
String[] urls = StringUtils.split(data,",");
dataObject.put("coverImg", urls[0]);
dataObject.put("coverUrl", urls[0]);
dataObject.put("videoUrl", urls[1]);
dataObject.put("fileId", urls[2]);
break;
... ... @@ -1275,7 +1275,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
rspBo.setActionUrl(linkTUrl);
}
else if("video".equals(content.getTemplateKey())){
rspBo.setCoverImg(JSON.parseObject(data.getString("data")).getString("coverImg"));
rspBo.setCoverImg(JSON.parseObject(data.getString("data")).getString("coverUrl"));
rspBo.setVideoUrl(JSON.parseObject(data.getString("data")).getString("videoUrl"));
}
}
... ... @@ -1528,7 +1528,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
//拼接文章预览的url 类似：http://yoho-community-web.test3.ingress.dev.yohocorp.com/grass/article/1408536?type=preview
rspBo.setPreviewUrl(previewUrl + article.getId() + "?type=preview");
//短视频封面图
rspBo.setCoverImg(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("coverImg"));
rspBo.setCoverImg(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("coverUrl"));
//短视频url
rspBo.setVideoUrl(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("videoUrl"));
rspBo.setFileId(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("fileId"));
... ...