From 34b1d06ec5196b7025d3fc8a3aa54998a545b41f Mon Sep 17 00:00:00 2001
From: Shikong <919411476@qq.com>
Date: Tue, 25 Apr 2023 14:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  1 +
 .idea/encodings.xml                           |  2 ++
 common/pom.xml                                | 35 +++++++++++++++++++
 .../study/springcloud}/utils/JsonUtils.java   |  2 +-
 .../producer/controller/SimpleController.java |  2 +-
 .../kafka/tests/KafkaConfigTest.java          |  2 +-
 kafka-01/pom.xml                              |  6 ++++
 pom.xml                                       | 19 ++++++++++
 8 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 common/pom.xml
 rename {kafka-01/kafka-01-common/src/main/java/cn/skcks/study/springcloud/kafka/common => common/src/main/java/cn/skcks/study/springcloud}/utils/JsonUtils.java (98%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 432bb89..781c3f8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,6 +9,7 @@
         <outputRelativeToContentRoot value="true" />
         <module name="kafka-01-producer" />
         <module name="kafka-01-common" />
+        <module name="common" />
         <module name="provider" />
         <module name="consumer" />
         <module name="kafka-01-consumer" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 887371d..a39078e 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/kafka-01/kafka-01-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/kafka-01/kafka-01-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/kafka-01/kafka-01-consumer/src/main/java" charset="UTF-8" />
diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 0000000..26f5085
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,35 @@
+<?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>cn.skcks.study.springcloud</groupId>
+        <artifactId>spring-cloud-study</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>common</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!--Jackson包-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/kafka-01/kafka-01-common/src/main/java/cn/skcks/study/springcloud/kafka/common/utils/JsonUtils.java b/common/src/main/java/cn/skcks/study/springcloud/utils/JsonUtils.java
similarity index 98%
rename from kafka-01/kafka-01-common/src/main/java/cn/skcks/study/springcloud/kafka/common/utils/JsonUtils.java
rename to common/src/main/java/cn/skcks/study/springcloud/utils/JsonUtils.java
index 05b52c2..56cdd75 100644
--- a/kafka-01/kafka-01-common/src/main/java/cn/skcks/study/springcloud/kafka/common/utils/JsonUtils.java
+++ b/common/src/main/java/cn/skcks/study/springcloud/utils/JsonUtils.java
@@ -1,4 +1,4 @@
-package cn.skcks.study.springcloud.kafka.common.utils;
+package cn.skcks.study.springcloud.utils;
 
 import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/kafka-01/kafka-01-producer/src/main/java/cn/skcks/study/springcloud/kafka/producer/controller/SimpleController.java b/kafka-01/kafka-01-producer/src/main/java/cn/skcks/study/springcloud/kafka/producer/controller/SimpleController.java
index d5cf76d..1d4d318 100644
--- a/kafka-01/kafka-01-producer/src/main/java/cn/skcks/study/springcloud/kafka/producer/controller/SimpleController.java
+++ b/kafka-01/kafka-01-producer/src/main/java/cn/skcks/study/springcloud/kafka/producer/controller/SimpleController.java
@@ -1,7 +1,7 @@
 package cn.skcks.study.springcloud.kafka.producer.controller;
 
 import cn.skcks.study.springcloud.kafka.common.model.dto.Message;
-import cn.skcks.study.springcloud.kafka.common.utils.JsonUtils;
+import cn.skcks.study.springcloud.utils.JsonUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.core.KafkaTemplate;
diff --git a/kafka-01/kafka-01-producer/src/test/java/cn/skcks/study/springcloud/kafka/tests/KafkaConfigTest.java b/kafka-01/kafka-01-producer/src/test/java/cn/skcks/study/springcloud/kafka/tests/KafkaConfigTest.java
index b767bae..bfd355f 100644
--- a/kafka-01/kafka-01-producer/src/test/java/cn/skcks/study/springcloud/kafka/tests/KafkaConfigTest.java
+++ b/kafka-01/kafka-01-producer/src/test/java/cn/skcks/study/springcloud/kafka/tests/KafkaConfigTest.java
@@ -1,7 +1,7 @@
 package cn.skcks.study.springcloud.kafka.tests;
 
 import cn.skcks.study.springcloud.kafka.TestApplication;
-import cn.skcks.study.springcloud.kafka.common.utils.JsonUtils;
+import cn.skcks.study.springcloud.utils.JsonUtils;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.AdminClient;
diff --git a/kafka-01/pom.xml b/kafka-01/pom.xml
index f563891..263851b 100644
--- a/kafka-01/pom.xml
+++ b/kafka-01/pom.xml
@@ -46,5 +46,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>cn.skcks.study.springcloud</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index abdb0cd..f2730d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
     <modules>
         <module>nacos-01</module>
         <module>kafka-01</module>
+        <module>common</module>
     </modules>
 
     <properties>
@@ -23,6 +24,7 @@
         <spring-cloud.version>2021.0.6</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
         <lombok.version>1.18.26</lombok.version>
+        <jackson.version>2.15.0</jackson.version>
     </properties>
 
     <dependencyManagement>
@@ -59,6 +61,23 @@
                 <version>${lombok.version}</version>
                 <scope>provided</scope>
             </dependency>
+
+            <!--Jackson包-->
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>