Merge remote-tracking branch 'origin/dev.carData' into dev

# Conflicts:
#	cloud-common/pom.xml

cloud-common/cloud-common-kafka/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>cloud-common</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>cloud-common-kafka</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

cloud-common/cloud-common-kafka/src/main/java/com/muyu/kafkaconfig/KafkaConfig.java

@@ -1,4 +1,4 @@
-package com.muyu.carData.config.kafkaconfig;
+package com.muyu.kafkaconfig;
 
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;

cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.muyu.kafkaconfig.KafkaConfig

cloud-modules/cloud-modules-carData/pom.xml

@@ -83,9 +83,9 @@
             <version>2.9.3</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-            <version>3.0.0</version>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-kafka</artifactId>
+            <version>3.6.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.iotdb</groupId>

cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/CarDataApplication.java

@@ -4,9 +4,6 @@ import com.muyu.carData.listener.MyListener;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-import javax.swing.*;
 
 /**
  * @Author：张腾

cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/consumer/MyKafkaConsumer.java

@@ -29,7 +29,7 @@ public class MyKafkaConsumer implements InitializingBean {
     @Autowired
     private KafkaConsumer kafkaConsumer;
 
-    private final String topicName = "test";
+    private final String topicName = "carJsons";
 
     @Override
     public void afterPropertiesSet() throws Exception {
@@ -43,13 +43,14 @@ public class MyKafkaConsumer implements InitializingBean {
                 for (ConsumerRecord<String, String> consumerRecord : consumerRecords) {
                     //从consumerRecord中获取消费数据
                     String value = consumerRecord.value();
-                    log.info("从Kafka中消费的原始数据：{}",value);
-                    //转换为java对象
-                    Student stu = JSONUtil.toBean(value, Student.class);
-                    log.info("消费数据转换为Java对象：{}",stu);
+                    log.info("从Kafka中消费的原始数据===============>>：{}",value);
                 }
             }
         });
         thread.start();
+
+        log.info("启动线程结束监听topic:{}",topicName);
+
+
     }
 }

pom.xml

@@ -10,7 +10,7 @@
 
     <name>muyu</name>
     <url>http://www.muyu.vip</url>
-    <description>若依微服务系统</description>
+    <description>智能车联系统</description>
 
     <properties>
         <muyu.version>3.6.3</muyu.version>