Merge branch 'dev-xym-no-cover' of Server/long-article-manage into master

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/bo/VideoDetail.java

@@ -1,8 +1,10 @@
 package com.tzld.piaoquan.longarticle.model.bo;
 
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString
 public class VideoDetail {
 
     private Integer crawlerVideoId;
@@ -15,7 +17,9 @@ public class VideoDetail {
 
     private String videoId;
 
-    private String videoCover;
+    private String shareImgPath;
+
+    private String coverImgPath;
 
     private String videoPath;
 

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

@@ -33,6 +33,18 @@ public class CardServiceImpl implements CardService {
     @Autowired
     AigcService aigcService;
 
+    private static final List<String> useShareImgPathList = new ArrayList<String>() {{
+        add("生活之大全");
+        add("生活小优招");
+        add("持家有妙招");
+        add("快乐生活妙技巧");
+        add("麒阁史记");
+        add("趣史论");
+        add("农耕趣时刻");
+        add("退休无忧生活");
+        add("繁花史阁");
+    }};
+
 
     public JSONObject createGzhPath(String videoId, String sharedUid, String ghId, Integer miniProgramType) throws UnsupportedEncodingException {
         String rootShareId = UUID.randomUUID().toString();
@@ -89,7 +101,7 @@ public class CardServiceImpl implements CardService {
     }
 
     public PublishMiniprogram generateSingleCard(Integer index, Integer miniId, VideoDetail videoDetail,
-                                                   PlanAccount planAccount, PublishContent publishContent) throws UnsupportedEncodingException {
+                                                 PlanAccount planAccount, PublishContent publishContent) throws UnsupportedEncodingException {
         String strMiniId = String.valueOf(miniId);
         JSONObject miniInfo = miniProgramMap.getJSONObject(strMiniId);
         String avatar = miniInfo.getString("avatar");
@@ -112,7 +124,11 @@ public class CardServiceImpl implements CardService {
         publishMiniprogram.setVideoId(Long.parseLong(videoId));
         publishMiniprogram.setSource(videoDetail.getSource());
         publishMiniprogram.setVideoTitle(videoDetail.getKimiTitle());
-        publishMiniprogram.setVideoCover(videoDetail.getVideoCover());
+        if (useShareImgPathList.contains(planAccount.getAccountName())) {
+            publishMiniprogram.setVideoCover(videoDetail.getShareImgPath());
+        } else {
+            publishMiniprogram.setVideoCover(videoDetail.getCoverImgPath());
+        }
         publishMiniprogram.setVideoPath(videoDetail.getVideoPath());
         publishMiniprogram.setProductionPath(jsonObject.getString("productionPath"));
         publishMiniprogram.setRootSourceId(jsonObject.getString("rootSourceId"));

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

@@ -104,6 +104,7 @@ public class CoreServiceImpl implements CoreService {
         add("家家生活指南");
         add("历史长河流淌");
         add("暖心一隅");
+        add("梦游的超级兵");
     }};
     public void initAccountSpecialSettings() {
         List<SpecialSettingVO> specialSettings = aigcService.getSpecialSetting();

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/impl/VideoServiceImpl.java

@@ -19,10 +19,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import static com.tzld.piaoquan.longarticle.common.constants.RedisConstant.REDIS_COOKIE_KEY;
 
@@ -41,7 +38,6 @@ public class VideoServiceImpl implements VideoService {
     private RedisTemplate<String, Object> redisTemplate;
 
 
-
     public VideoDetail publish(String ossPath, String uid, String title) {
         String videoId = publishToPQ(ossPath, uid, title);
         if (videoId == null) {
@@ -53,7 +49,7 @@ public class VideoServiceImpl implements VideoService {
     private String publishToPQ(String ossPath, String uid, String title) {
         try {
             String cookie = (String) redisTemplate.opsForValue().get(REDIS_COOKIE_KEY);
-            if(StringUtils.isEmpty(cookie)){
+            if (StringUtils.isEmpty(cookie)) {
                 cookie = "JSESSIONID=4DEA2B5173BB9A9E82DB772C0ACDBC9F; JSESSIONID=D02C334150025222A0B824A98B539B78";
             }
             Map<String, Object> payload = new HashMap<>();
@@ -94,6 +90,7 @@ public class VideoServiceImpl implements VideoService {
         return null;
     }
 
+
     private VideoDetail getPQVideoDetail(String videoId) {
         try {
             Map<String, Object> data = new HashMap<>();
@@ -109,11 +106,13 @@ public class VideoServiceImpl implements VideoService {
             if (!CollectionUtils.isEmpty(data)) {
                 String id = list.get(0).getStr("id");
                 String shareImgPath = list.get(0).getStr("shareImgPath");
+                String coverImgPath = getCoverImgPath(shareImgPath);
                 String videoPath = list.get(0).getStr("videoPath");
                 if (StringUtils.isNotEmpty(id)) {
                     videoDetail.setVideoId(id);
                 }
-                videoDetail.setVideoCover(shareImgPath);
+                videoDetail.setShareImgPath(shareImgPath);
+                videoDetail.setCoverImgPath(coverImgPath);
                 videoDetail.setVideoPath(videoPath);
             }
             return videoDetail;
@@ -123,6 +122,20 @@ public class VideoServiceImpl implements VideoService {
         return null;
     }
 
+    private String getCoverImgPath(String shareImgPath) {
+        String[] split = shareImgPath.split("/");
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String s : split) {
+            if (!s.startsWith("watermark")) {
+                stringBuilder.append(s).append("/");
+            }
+        }
+        if (stringBuilder.length() > 0) {
+            stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+        }
+        return stringBuilder.toString();
+    }
+
     @Override
     public void miniProgramVideoOff(String traceId) {
         try {