Merge branch 'feature/video' of git.yoho.cn:platform/platform-cms into feature/video

@@ -1531,6 +1531,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
             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"));
             rspBoList.add(rspBo);
         });
         return rspBoList;

@@ -239,4 +239,7 @@ qq.secretKey = ${qq.secretKey}
 uic.service.url=${uic.service.url}
 preview.url=${preview.url}
 
-file.excel.saveDir=${file.excel.saveDir}
\ No newline at end of file
+file.excel.saveDir=${file.excel.saveDir}
+
+tencent.cloud.secretId=${tencent.cloud.secretId}
+tencent.cloud.secretKey=${tencent.cloud.secretKey}
\ No newline at end of file