From e46b6325c49e22f8fc9c26c5485759ae052510de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=85=BE?= <3467447354@qq.com>
Date: Wed, 2 Oct 2024 10:10:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B4=E5=90=88=20Kafka=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 cloud-common-kafka模块中添加 cloud-common-core依赖
- 移除 cloud-modules-carData 中的 Kafka 依赖版本声明
- 在根 pom.xml 中统一管理 Kafka 依赖版本
- 更新 cloud-common-kafka 依赖版本为 3.6.3
---
 cloud-common/cloud-common-kafka/pom.xml     | 6 ++++++
 cloud-modules/cloud-modules-carData/pom.xml | 1 -
 pom.xml                                     | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/cloud-common/cloud-common-kafka/pom.xml b/cloud-common/cloud-common-kafka/pom.xml
index 6bd82ac..b515a5b 100644
--- a/cloud-common/cloud-common-kafka/pom.xml
+++ b/cloud-common/cloud-common-kafka/pom.xml
@@ -23,5 +23,11 @@
             <artifactId>kafka-clients</artifactId>
             <version>3.0.0</version>
         </dependency>
+
+        <!-- 项目公共核心 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-core</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/cloud-modules/cloud-modules-carData/pom.xml b/cloud-modules/cloud-modules-carData/pom.xml
index 7e7c80b..dd2d5f9 100644
--- a/cloud-modules/cloud-modules-carData/pom.xml
+++ b/cloud-modules/cloud-modules-carData/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-kafka</artifactId>
-            <version>3.6.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.iotdb</groupId>
diff --git a/pom.xml b/pom.xml
index 081c4fa..58f348a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
         <hutool.version>5.8.27</hutool.version>
         <knife4j-openapi3.version>4.1.0</knife4j-openapi3.version>
         <xxl-job-core.version>2.4.1</xxl-job-core.version>
+        <kafka.version>3.6.3</kafka.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -218,6 +219,13 @@
                 <version>${muyu.version}</version>
             </dependency>
 
+            <!--kafka-->
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>cloud-common-kafka</artifactId>
+                <version>${kafka.version}</version>
+            </dependency>
+
             <!-- 分布式事务 -->
             <dependency>
                 <groupId>com.muyu</groupId>

From 903fecc2ccf95e86177734e59d5f54962acd978e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=85=BE?= <3467447354@qq.com>
Date: Wed, 2 Oct 2024 10:22:41 +0800
Subject: [PATCH 2/2] 121

---
 .../src/main/java/com/muyu/server/mqtt/Demo.java               | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java
index 007c82e..fa5f209 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java
@@ -2,7 +2,6 @@ package com.muyu.server.mqtt;
 
 import com.alibaba.fastjson.JSONObject;
 
-import com.muyu.common.kafka.constants.KafkaConstants;
 import com.muyu.domain.CarMessage;
 import com.muyu.server.service.CarMessageService;
 import jakarta.annotation.PostConstruct;
@@ -83,7 +82,7 @@ public class Demo {
                         results[i] = futures.get(i).get();
                     }
                     String jsonString = JSONObject.toJSONString( results );
-                    ProducerRecord<String, String> producerRecord = new ProducerRecord<>( KafkaConstants.KafkaTopic, jsonString);
+                    ProducerRecord<String, String> producerRecord = new ProducerRecord<>( "carJsons", jsonString);
                     kafkaProducer.send(producerRecord);
                 }
                 // 接收信息