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 { @@ -272,7 +272,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
272 break; 272 break;
273 case BLOCK_VIDEO: 273 case BLOCK_VIDEO:
274 String[] urls = StringUtils.split(data,","); 274 String[] urls = StringUtils.split(data,",");
275 - dataObject.put("coverImg", urls[0]); 275 + dataObject.put("coverUrl", urls[0]);
276 dataObject.put("videoUrl", urls[1]); 276 dataObject.put("videoUrl", urls[1]);
277 dataObject.put("fileId", urls[2]); 277 dataObject.put("fileId", urls[2]);
278 break; 278 break;
@@ -1275,7 +1275,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService { @@ -1275,7 +1275,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
1275 rspBo.setActionUrl(linkTUrl); 1275 rspBo.setActionUrl(linkTUrl);
1276 } 1276 }
1277 else if("video".equals(content.getTemplateKey())){ 1277 else if("video".equals(content.getTemplateKey())){
1278 - rspBo.setCoverImg(JSON.parseObject(data.getString("data")).getString("coverImg")); 1278 + rspBo.setCoverImg(JSON.parseObject(data.getString("data")).getString("coverUrl"));
1279 rspBo.setVideoUrl(JSON.parseObject(data.getString("data")).getString("videoUrl")); 1279 rspBo.setVideoUrl(JSON.parseObject(data.getString("data")).getString("videoUrl"));
1280 } 1280 }
1281 } 1281 }
@@ -1528,7 +1528,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService { @@ -1528,7 +1528,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
1528 //拼接文章预览的url 类似：http://yoho-community-web.test3.ingress.dev.yohocorp.com/grass/article/1408536?type=preview 1528 //拼接文章预览的url 类似：http://yoho-community-web.test3.ingress.dev.yohocorp.com/grass/article/1408536?type=preview
1529 rspBo.setPreviewUrl(previewUrl + article.getId() + "?type=preview"); 1529 rspBo.setPreviewUrl(previewUrl + article.getId() + "?type=preview");
1530 //短视频封面图 1530 //短视频封面图
1531 - rspBo.setCoverImg(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("coverImg")); 1531 + rspBo.setCoverImg(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("coverUrl"));
1532 //短视频url 1532 //短视频url
1533 rspBo.setVideoUrl(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("videoUrl")); 1533 rspBo.setVideoUrl(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("videoUrl"));
1534 rspBo.setFileId(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("fileId")); 1534 rspBo.setFileId(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("fileId"));