From f12a9c1d98506cc4680e2a8d4d643d7d90712ada Mon Sep 17 00:00:00 2001
From: fjn <1194361820@qq.com>
Date: Fri, 22 Jan 2021 14:26:09 +0800
Subject: [PATCH] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  7 ++---
 sqlhelper-examples/pom.xml                    | 10 +++----
 .../sqlhelper-examples-client-feign/pom.xml   | 26 +++++++++----------
 .../pom.xml                                   |  4 ---
 .../pom.xml                                   |  4 ---
 .../pom.xml                                   | 14 +++-------
 .../pom.xml                                   |  5 ----
 .../pom.xml                                   |  4 ---
 8 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4858fc6a2..045574bc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,12 +154,15 @@
                 <groupId>com.github.fangjinuo.easyjson</groupId>
                 <artifactId>easyjson-jackson</artifactId>
                 <version>${easyjson.version}</version>
-                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>com.fasterxml.jackson.core</groupId>
                         <artifactId>jackson-databind</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.github.fangjinuo.langx</groupId>
+                        <artifactId>langx-java</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -277,7 +280,6 @@
                 <groupId>com.github.fangjinuo.langx</groupId>
                 <artifactId>langx-java</artifactId>
                 <version>${langx-java.version}</version>
-                <scope>provided</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -296,7 +298,6 @@
         <dependency>
             <groupId>com.github.fangjinuo.langx</groupId>
             <artifactId>langx-java</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/sqlhelper-examples/pom.xml b/sqlhelper-examples/pom.xml
index cc3f08701..02e49034d 100644
--- a/sqlhelper-examples/pom.xml
+++ b/sqlhelper-examples/pom.xml
@@ -273,11 +273,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>com.github.fangjinuo.langx</groupId>
-                <artifactId>langx-java</artifactId>
-                <version>${langx-java.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.fangjinuo.langx</groupId>
                 <artifactId>langx-java8</artifactId>
@@ -298,7 +293,10 @@
             <artifactId>h2</artifactId>
             <version>1.4.199</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.github.fangjinuo.easyjson</groupId>
+            <artifactId>easyjson-jackson</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-feign/pom.xml b/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-feign/pom.xml
index 78fc294c8..48b9bf525 100644
--- a/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-feign/pom.xml
+++ b/sqlhelper-examples/sqlhelper-examples-client/sqlhelper-examples-client-feign/pom.xml
@@ -18,22 +18,9 @@
             <artifactId>sqlhelper-dialect</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.fangjinuo.easyjson</groupId>
-            <artifactId>easyjson-jackson</artifactId>
-            <version>${easyjson.version}</version>
-        </dependency>
-
-        <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>
@@ -51,6 +38,10 @@
                     <groupId>io.github.openfeign</groupId>
                     <artifactId>feign-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.github.fangjinuo.easyjson</groupId>
+                    <artifactId>easyjson-jackson</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -58,6 +49,15 @@
             <artifactId>spring-retry</artifactId>
             <version>1.3.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.fangjinuo.langx</groupId>
+            <artifactId>langx-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.fangjinuo.easyjson</groupId>
+            <artifactId>easyjson-jackson</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatis/pom.xml b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatis/pom.xml
index 6ead201f2..97745589a 100644
--- a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatis/pom.xml
+++ b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatis/pom.xml
@@ -55,10 +55,6 @@
             <artifactId>sqlhelper-mybatis-spring-boot-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.fangjinuo.easyjson</groupId>
-            <artifactId>easyjson-jackson</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.fangjinuo.sqlhelper</groupId>
             <artifactId>sqlhelper-mybatis-over-pagehelper</artifactId>
diff --git a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_2x/pom.xml b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_2x/pom.xml
index 5ca136095..0f44e9a6b 100644
--- a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_2x/pom.xml
+++ b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_2x/pom.xml
@@ -39,10 +39,6 @@
             <version>${mybatis_jdk8.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.fangjinuo.easyjson</groupId>
-            <artifactId>easyjson-jackson</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.fangjinuo.sqlhelper</groupId>
             <artifactId>sqlhelper-mybatis-over-pagehelper</artifactId>
diff --git a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_3x/pom.xml b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_3x/pom.xml
index 78b06b02f..aa31ac215 100644
--- a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_3x/pom.xml
+++ b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-mybatisplus_3x/pom.xml
@@ -60,15 +60,6 @@
             <version>${mybatis_jdk8.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.fangjinuo.easyjson</groupId>
-            <artifactId>easyjson-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.fangjinuo.sqlhelper</groupId>
-            <artifactId>sqlhelper-mybatis-over-pagehelper</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.github.fangjinuo.audit</groupId>
             <artifactId>audit-spring-boot-starter</artifactId>
@@ -99,7 +90,10 @@
         <dependency>
             <groupId>com.github.fangjinuo.langx</groupId>
             <artifactId>langx-java8</artifactId>
-            <version>${langx-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.fangjinuo.sqlhelper</groupId>
+            <artifactId>sqlhelper-mybatis-over-pagehelper</artifactId>
         </dependency>
     </dependencies>
     <build>
diff --git a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-springjdbc/pom.xml b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-springjdbc/pom.xml
index 797067710..998e41440 100644
--- a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-springjdbc/pom.xml
+++ b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-springjdbc/pom.xml
@@ -89,11 +89,6 @@
             <artifactId>sqlhelper-springjdbc-spring-boot-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.fangjinuo.easyjson</groupId>
-            <artifactId>easyjson-jackson</artifactId>
-        </dependency>
-
     </dependencies>
     <build>
         <plugins>
diff --git a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-tkmapper/pom.xml b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-tkmapper/pom.xml
index 40e52a5a8..4a1613553 100644
--- a/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-tkmapper/pom.xml
+++ b/sqlhelper-examples/sqlhelper-examples-service/sqlhelper-examples-service-tkmapper/pom.xml
@@ -34,10 +34,6 @@
             <artifactId>sqlhelper-dbutils</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.fangjinuo.easyjson</groupId>
-            <artifactId>easyjson-jackson</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.fangjinuo.sqlhelper</groupId>
             <artifactId>sqlhelper-mybatis-over-pagehelper</artifactId>