Merge branch 'dev-xym-add-exp' of Server/long-article-manage into master

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CardServiceImpl.java

@@ -45,20 +45,7 @@ public class CardServiceImpl implements CardService {
 
     private static final List<String> useShareImgPathList = new ArrayList<String>();
 
-    private static final List<String> useSmallPlayImgPathList = new ArrayList<String>() {{
-        add("生活情感叁读");
-        add("缘来养心厅");
-        add("心灵情感驿站");
-        add("生活良读");
-        add("祝福养心厅");
-        add("音药金曲厅");
-        add("音药养心馆");
-        add("农耕趣时刻");
-        add("趣史论");
-        add("妙招持家帮手");
-        add("多彩妙生活");
-        add("史记趣言");
-    }};
+    private static final List<String> useSmallPlayImgPathList = new ArrayList<String>();
 
 
     public JSONObject createGzhPath(String videoId, String sharedUid, String ghId, Integer miniProgramType) throws UnsupportedEncodingException {

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CrawlerVideoServiceImpl.java

@@ -284,6 +284,7 @@ public class CrawlerVideoServiceImpl {
     }
 
     public boolean pushOss(String contentId) {
+        log.info("VideoDownload and pushOss contentId={}", contentId);
         CrawlerVideoExample example = new CrawlerVideoExample();
         example.createCriteria().andContentIdEqualTo(contentId).andDownloadStatusEqualTo(0);
         example.setOrderByClause("score desc");

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/MatchVideoServiceImpl.java

@@ -408,7 +408,7 @@ public class MatchVideoServiceImpl {
                             log.error("上传小程序视频线程异常", e);
                         }
                     }
-                    log.info("启动匹配小程序线程结束");
+                    log.info("上传小程序视频线程结束");
                     countDownLatch.countDown();
                 }));
             }
@@ -440,6 +440,7 @@ public class MatchVideoServiceImpl {
     }
 
     public void processUploadCrawlerVideo(MatchVideo matchVideo) {
+        log.info("processUploadCrawlerVideo matchVideo={}", matchVideo);
         if (matchVideo.getContentStatus() != ContentStatusEnum.CRAWLER_SUCCESS.getStatusCode()) {
             return;
         }
@@ -452,7 +453,7 @@ public class MatchVideoServiceImpl {
             }
             String lockKey = String.format(UPLOAD_CRAWLER_LOCK_KEY, matchVideo.getContentId());
             String lockValue = UUID.randomUUID().toString();
-            boolean lock = redisLock.tryLock(lockKey, lockValue, 10, TimeUnit.MINUTES);
+            boolean lock = redisLock.tryLock(lockKey, lockValue, 20, TimeUnit.MINUTES);
             if (lock) {
                 boolean res = crawlerVideoService.uploadCrawlerVideo(matchVideo);
                 if (res) {