Merge remote-tracking branch 'origin/release_20240411' into release_20240411

src/main/java/com/lwby/marketing/att/dyvideo/handle/DyvideoBehaviorFlow.java

@@ -200,7 +200,7 @@ public class DyvideoBehaviorFlow extends NodeSwitchFlow<StoryNovelAction> {
                         if (motivateCount < behavoirVal.intValue()) {
                             DYVIDEO_SYS_LOG.info("motivate not up to the standard,motivateCount={},motivateModelCount={},djChanel={},userId={}",motivateCount,behavoirVal,channelId,userId);
                             action.stop(true);
-                            break;
+                            return;
                         }
                         deliveryDeviceInfo.setMotivateCount(String.valueOf(motivateCount));
                         continue;
@@ -209,7 +209,7 @@ public class DyvideoBehaviorFlow extends NodeSwitchFlow<StoryNovelAction> {
                         if (ecpmAvgCount < behavoirVal.intValue()) {
                             DYVIDEO_SYS_LOG.info("ecpm not up to the standard,ecpmAvgCount={},ecpmAvgModelCount={},djChanel={},userId={}",ecpmAvgCount,behavoirVal,channelId,userId);
                             action.stop(true);
-                            break;
+                            return;
                         }
                         deliveryDeviceInfo.setEcpmAvgCount(String.valueOf(ecpmAvgCount));
                         continue;
@@ -218,7 +218,7 @@ public class DyvideoBehaviorFlow extends NodeSwitchFlow<StoryNovelAction> {
                         if (pecpmCount < BehavoirType.MOTIVATEMODELCOUNT.getBehavoirType(appChannel).intValue()) {
                             DYVIDEO_SYS_LOG.info("pecpmCount not up to the standard,pecpmModelCount={},pecpmCount={},motivateModelCount={},motivateCount={},djChanel={},userId={}",behavoirVal,pecpmCount,BehavoirType.MOTIVATEMODELCOUNT.getBehavoirType(appChannel),motivateCount,channelId,userId);
                             action.stop(true);
-                            break;
+                            return;
                         }
 
                         deliveryDeviceInfo.setPecpmCount(String.valueOf(behavoirVal));

src/main/java/com/lwby/marketing/att/dyvideo/handle/UploadDyVideoCallFlow.java

 package com.lwby.marketing.att.dyvideo.handle;
 
+import com.alibaba.fastjson.JSON;
 import com.lwby.marketing.att.CallBackType;
 import com.lwby.marketing.att.dyvideo.DyVideoUniversalProcess;
 import com.lwby.marketing.flow.NodeFlow;
@@ -30,6 +31,7 @@ public class UploadDyVideoCallFlow extends NodeFlow<StoryNovelAction> {
                 up.uploadCallbackUserInfo(action);
             }
             action.getVideoUpload().setActiveTime(System.currentTimeMillis());
+            up.set(String.format("video:upload:%s", action.getOpenId()),60 * 60 * 24 * 7, JSON.toJSONString(action.getVideoUpload()));
             up.notifyResult(action, type.getTopic(),type.getStatus());
             up.set(up.getFirstCheckerKey(action),up.getExpire(action),"1");
         }

src/main/java/com/lwby/marketing/conf/kafka/KafkaConsumerConfig.java

@@ -25,19 +25,19 @@ import java.util.Map;
 @EnableKafka
 public class KafkaConsumerConfig {
 
-    @Value("${spring.kafka2.bootstrap-servers}")
+    @Value("${spring.kafka.bootstrap-servers}")
     private String servers;
 
-    @Value("${spring.kafka2.consumer.enable-auto-commit}")
+    @Value("${spring.kafka.consumer.enable-auto-commit}")
     private boolean enableAutoCommit;
 
-    @Value("${spring.kafka2.consumer.auto-offset-reset}")
+    @Value("${spring.kafka.consumer.auto-offset-reset}")
     private String autoOffsetReset;
 
     @Value("${system.consumer.novel.active.group_id}")
     private String groupId;
 
-    @Value("${spring.kafka2.consumer.max-poll-records}")
+    @Value("${spring.kafka.consumer.max-poll-records}")
     private int maxPollRecordsConfig;
 
 

src/main/java/com/lwby/marketing/conf/kafka/KafkaStoreConsumerConfig.java

@@ -25,19 +25,19 @@ import java.util.Map;
 @EnableKafka
 public class KafkaStoreConsumerConfig {
 
-    @Value("${spring.kafka2.bootstrap-servers}")
+    @Value("${spring.kafka.bootstrap-servers}")
     private String servers;
 
-    @Value("${spring.kafka2.consumer.enable-auto-commit}")
+    @Value("${spring.kafka.consumer.enable-auto-commit}")
     private boolean enableAutoCommit;
 
-    @Value("${spring.kafka2.consumer.auto-offset-reset}")
+    @Value("${spring.kafka.consumer.auto-offset-reset}")
     private String autoOffsetReset;
 
     @Value("${system.consumer.novel.storeActive.group_id}")
     private String groupId;
 
-    @Value("${spring.kafka2.consumer.max-poll-records}")
+    @Value("${spring.kafka.consumer.max-poll-records}")
     private int maxPollRecordsConfig;
 
 

src/main/java/com/lwby/marketing/conf/kafka/VideoAppActiveKafkaConsumerConfig.java

@@ -24,19 +24,19 @@ import java.util.Map;
 @EnableKafka
 public class VideoAppActiveKafkaConsumerConfig {
 
-    @Value("${spring.kafka2.bootstrap-servers}")
+    @Value("${spring.kafka.bootstrap-servers}")
     private String servers;
 
-    @Value("${spring.kafka2.consumer.enable-auto-commit}")
+    @Value("${spring.kafka.consumer.enable-auto-commit}")
     private boolean enableAutoCommit;
 
-    @Value("${spring.kafka2.consumer.auto-offset-reset}")
+    @Value("${spring.kafka.consumer.auto-offset-reset}")
     private String autoOffsetReset;
 
     @Value("${system.consumer.videoapp.active.group_id}")
     private String groupId;
 
-    @Value("${spring.kafka2.consumer.max-poll-records}")
+    @Value("${spring.kafka.consumer.max-poll-records}")
     private int maxPollRecordsConfig;
 
 

src/main/java/com/lwby/marketing/conf/kafka/VideoAppBehavoirKafkaConsumerConfig.java

@@ -25,19 +25,19 @@ import java.util.Map;
 @EnableKafka
 public class VideoAppBehavoirKafkaConsumerConfig {
 
-    @Value("${spring.kafka2.bootstrap-servers}")
+    @Value("${spring.kafka.bootstrap-servers}")
     private String servers;
 
-    @Value("${spring.kafka2.consumer.enable-auto-commit}")
+    @Value("${spring.kafka.consumer.enable-auto-commit}")
     private boolean enableAutoCommit;
 
-    @Value("${spring.kafka2.consumer.auto-offset-reset}")
+    @Value("${spring.kafka.consumer.auto-offset-reset}")
     private String autoOffsetReset;
 
     @Value("${system.consumer.videoapp.behavoir.group_id}")
     private String groupId;
 
-    @Value("${spring.kafka2.consumer.max-poll-records}")
+    @Value("${spring.kafka.consumer.max-poll-records}")
     private int maxPollRecordsConfig;