api-module/src/main/java/com/tzld/piaoquan/api/job/contentplatform/ContentPlatformVideoJob.java

@@ -67,9 +67,14 @@ public class ContentPlatformVideoJob {
             Long now = System.currentTimeMillis();
             if (CollectionUtils.isNotEmpty(dataList)) {
                 List<ContentPlatformVideo> saveList = new ArrayList<>();
+                List<Long> existVideoIds = new ArrayList<>();
                 for (Record record : dataList) {
                     ContentPlatformVideo item = new ContentPlatformVideo();
                     Long videoId = Long.parseLong((String) record.get(0));
+                    if (existVideoIds.contains(videoId)) {
+                        continue;
+                    }
+                    existVideoIds.add(videoId);
                     String category = (String) record.get(1);
                     String title = (String) record.get(2);
                     String videoUrl = (String) record.get(3);
@@ -107,10 +112,10 @@ public class ContentPlatformVideoJob {
                         saveList = saveList.stream().filter(item -> !illegalVideoIds.contains(item.getVideoId())).collect(Collectors.toList());
                     }
                     if (CollectionUtils.isNotEmpty(videoList)) {
-                        List<Long> existVideoIds = videoList.stream().map(ContentPlatformVideo::getVideoId).collect(Collectors.toList());
+                        List<Long> tempExistVideoIds = videoList.stream().map(ContentPlatformVideo::getVideoId).collect(Collectors.toList());
                         List<Long> videoIdList = saveList.stream().map(ContentPlatformVideo::getVideoId).collect(Collectors.toList());
                         planMapperExt.updateOtherVideoStatus(dt, videoIdList, now);
-                        saveList = saveList.stream().filter(item -> !existVideoIds.contains(item.getVideoId())).collect(Collectors.toList());
+                        saveList = saveList.stream().filter(item -> !tempExistVideoIds.contains(item.getVideoId())).collect(Collectors.toList());
                         if (CollectionUtils.isNotEmpty(saveList)) {
                             planMapperExt.batchInsertContentPlatformVideo(saveList);
                         }

api-module/src/main/java/com/tzld/piaoquan/api/job/wecom/thirdpart/WeComSendMsgJob.java

@@ -54,7 +54,7 @@ public class WeComSendMsgJob {
     private Integer duplicateDays;
     @Value("${send.room.msg.video.num:2}")
     private Integer videoNum;
-    @ApolloJsonValue("${send.room.msg.test.roomList:[\"10724205295120197\"]}")
+    @ApolloJsonValue("${send.room.msg.test.roomList:[]}")
     private List<String> testRoomList;
 
     private final static ExecutorService pool = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.SECONDS,
@@ -108,7 +108,7 @@ public class WeComSendMsgJob {
         // 填充视频信息
         String coverUrl = cgiReplyBucketData.getCoverUrl();
         // 实验 封面添加播放按钮水印
-        if (testRoomList.contains(thirdRoomId)) {
+        if (!testRoomList.contains(thirdRoomId)) {
             coverUrl = addPlayWatermark(cgiReplyBucketData.getCoverUrl());
         }
         request.setDesc(cgiReplyBucketData.getTitle());

common-module/src/main/java/com/tzld/piaoquan/growth/common/config/HttpClientConfig.java

@@ -65,7 +65,7 @@ public class HttpClientConfig {
 
     @Bean(name = "proxyHttpClient")
     public CloseableHttpClient proxyHttpClient() {
-        HttpHost proxy = new HttpHost("121.43.150.231", 3128, "http");
+        HttpHost proxy = new HttpHost("121.43.155.197", 8888, "http");
         RequestConfig requestConfig = RequestConfig.custom()
                 .setConnectTimeout(CONNECTION_TIMEOUT)
                 .setSocketTimeout(SOCKET_TIMEOUT)