From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-manage/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java b/screen-manage/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java
index 3ecc6e7..4f013e0 100644
--- a/screen-manage/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java
+++ b/screen-manage/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java
@@ -19,7 +19,7 @@
 @Configuration
 @EnableKafka
 public class KafkaConsumerConfig {
-    @Value("${kafka.consumer.servers}")
+    @Value("47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092")
     private String servers;
     @Value("${kafka.consumer.enable.auto.commit}")
     private boolean enableAutoCommit;
@@ -36,7 +36,7 @@
     @Value("${kafka.groupId.state}")
     private String stateGroupId;
 
-    @Bean
+    @Bean("insertListenerContainerFactory")
     public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, String>> insertListenerContainerFactory() {
         ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
         factory.setConsumerFactory(insertConsumerFactory());
@@ -46,7 +46,7 @@
         return factory;
     }
 
-    @Bean
+    @Bean("stateListenerContainerFactory")
     public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, String>> stateListenerContainerFactory() {
         ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
         factory.setConsumerFactory(stateConsumerFactory());
@@ -71,8 +71,8 @@
     }
 
     /*
-    * ������������
-    * */
+     * ������������
+     * */
     public Map<String, Object> consumerConfigs() {
         Map<String, Object> propsMap = new HashMap<>();
         propsMap.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, servers);

--
Gitblit v1.8.0