Merge branch '7-短剧app关键行为优化' into 'release_20240408_01'

调整kafka

See merge request !41

src/main/java/com/lwby/marketing/att/UniversalProcess.java

@@ -30,8 +30,8 @@ public class UniversalProcess {
     @Resource
     public JdbcTemplate videoInlandJdbcTemplate;
 
-    @Resource(name = "novelKafka")
-    public KafkaTemplate<String, String> novelKafkaTemplate;
+    @Resource(name = "storyKafka")
+    public KafkaTemplate<String, String> storyKafkaTemplate;
 
     @Resource
     public RedisTemplate<String, String> redisTemplate;

src/main/java/com/lwby/marketing/att/bystory/DyStoryUniversalProcess.java

@@ -53,7 +53,7 @@ public class DyStoryUniversalProcess extends UniversalProcess {
         ddi.setUserId(action.getUserId());
 
         String jsonString = JSONObject.toJSONString(ddi);
-        ListenableFuture<SendResult<String, String>> active_result = novelKafkaTemplate.send(topic, jsonString);
+        ListenableFuture<SendResult<String, String>> active_result = storyKafkaTemplate.send(topic, jsonString);
         active_result.addCallback(
                 result -> DYSTORY_SYS_LOG.info("归因成功[{}],归因类型[{}]", jsonString, status.desc),
                 ex -> DYSTORY_ERROR_LOG.error("归因失败[{}],归因类型[{}]", jsonString, status.desc, ex)

src/main/java/com/lwby/marketing/att/dyvideo/DyVideoUniversalProcess.java

@@ -76,7 +76,7 @@ public class DyVideoUniversalProcess extends UniversalProcess {
         ddi.setOpenId(action.getOpenId());
 
         String jsonString = JSONObject.toJSONString(ddi);
-        ListenableFuture<SendResult<String, String>> active_result = novelKafkaTemplate.send(topic, jsonString);
+        ListenableFuture<SendResult<String, String>> active_result = storyKafkaTemplate.send(topic, jsonString);
         active_result.addCallback(
                 result -> DYVIDEO_SYS_LOG.info("归因成功[{}],归因类型[{}]", jsonString, status.desc),
                 ex -> DYVIDEO_ERROR_LOG.error("归因失败[{}],归因类型[{}]", jsonString, status.desc, ex)

src/main/java/com/lwby/marketing/att/novel/NovelUniversalProcess.java

@@ -47,7 +47,7 @@ public class NovelUniversalProcess extends UniversalProcess {
         ddi.setDevice_status(exists(PRIZE_FLOW_PREFIX.concat(String.valueOf(ddi.getUserId()))) ? 2 : 0);
 
         String jsonString = JSONObject.toJSONString(ddi);
-        ListenableFuture<SendResult<String, String>> active_result = novelKafkaTemplate.send("ocpc_result_test", jsonString);
+        ListenableFuture<SendResult<String, String>> active_result = storyKafkaTemplate.send("ocpc_result_test", jsonString);
         active_result.addCallback(
                 result -> NOVEL_SYS_LOG.info("归因成功[{}],归因类型[{}]", jsonString, status.desc),
                 ex -> NOVEL_ERROR_LOG.error("归因失败[{}],归因类型[{}]", jsonString, status.desc, ex)

src/main/java/com/lwby/marketing/att/videoapp/VideoAppUniversalProcess.java

@@ -61,7 +61,7 @@ public class VideoAppUniversalProcess extends UniversalProcess {
         ddi.setUserId(action.getUserId());
 
         String jsonString = JSONObject.toJSONString(ddi);
-        ListenableFuture<SendResult<String, String>> active_result = novelKafkaTemplate.send(topic, jsonString);
+        ListenableFuture<SendResult<String, String>> active_result = storyKafkaTemplate.send(topic, jsonString);
         active_result.addCallback(
                 result -> VIDEOAPP_SYS_LOG.info("归因成功[{}],归因类型[{}]", jsonString, status.desc),
                 ex -> VIDEOAPP_ERROR_LOG.error("归因失败[{}],归因类型[{}]", jsonString, status.desc, ex)