From cfb52117fc8b2b8dcd34644fd60c678a5693edbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 23 Dec 2022 14:51:38 +0800
Subject: [PATCH] =?UTF-8?q?reset=20=E5=9B=9E=E6=BB=9A=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B1=8F=E8=94=BD=20fastjson=20=E7=AD=89?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=B9=8B=E5=90=8E=20=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E8=BF=90=E8=A1=8C=E6=9C=9F=E9=97=B4=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E7=B1=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 14 ++++----
 ruoyi-common/ruoyi-common-dubbo/pom.xml       | 32 -----------------
 ruoyi-common/ruoyi-common-seata/pom.xml       | 35 -------------------
 ruoyi-common/ruoyi-common-sentinel/pom.xml    | 13 -------
 ruoyi-visual/ruoyi-nacos/pom.xml              |  1 +
 ruoyi-visual/ruoyi-seata-server/pom.xml       |  1 +
 ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml |  3 +-
 7 files changed, 11 insertions(+), 88 deletions(-)

diff --git a/pom.xml b/pom.xml
index 341ac76b..e3c71aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,14 +41,10 @@
         <elasticsearch.version>7.14.0</elasticsearch.version>
         <skywalking-toolkit.version>8.13.0</skywalking-toolkit.version>
 
-        <!-- alibaba 相关依赖 -->
-        <sentinel.version>1.8.6</sentinel.version>
-        <seata.version>1.6.1</seata.version>
-        <nacos.version>2.2.0</nacos.version>
-        <dubbo.version>3.1.3</dubbo.version>
-
         <!-- 临时修复 snakeyaml 漏洞 -->
         <snakeyaml.version>1.33</snakeyaml.version>
+        <!-- 临时修复 fastjson 漏洞 -->
+        <fastjson.version>1.2.83</fastjson.version>
 
         <!-- OSS 配置 -->
         <aws-java-sdk-s3.version>1.12.349</aws-java-sdk-s3.version>
@@ -342,6 +338,12 @@
                 <version>${snakeyaml.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml
index 876355f1..941c55b5 100644
--- a/ruoyi-common/ruoyi-common-dubbo/pom.xml
+++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml
@@ -15,18 +15,6 @@
         ruoyi-common-dubbo
     </description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-dependencies-bom</artifactId>
-                <version>${dubbo.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.ruoyi</groupId>
@@ -56,10 +44,6 @@
                     <groupId>com.alibaba</groupId>
                     <artifactId>fastjson</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.alibaba.fastjson2</groupId>
-                    <artifactId>fastjson2</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.google.code.gson</groupId>
                     <artifactId>gson</artifactId>
@@ -67,22 +51,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml
index 8413ec27..5af69bc2 100644
--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ b/ruoyi-common/ruoyi-common-seata/pom.xml
@@ -15,18 +15,6 @@
         ruoyi-common-seata 分布式事务
     </description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-dependencies</artifactId>
-                <version>${seata.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 	<dependencies>
 
         <!-- SpringBoot Seata -->
@@ -38,34 +26,11 @@
                     <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.alibaba</groupId>
                     <artifactId>druid</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>fastjson</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/ruoyi-common/ruoyi-common-sentinel/pom.xml b/ruoyi-common/ruoyi-common-sentinel/pom.xml
index 6a6c8387..ad768df9 100644
--- a/ruoyi-common/ruoyi-common-sentinel/pom.xml
+++ b/ruoyi-common/ruoyi-common-sentinel/pom.xml
@@ -19,19 +19,6 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>fastjson</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.83</version>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Sentinel Datasource Nacos -->
diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml
index 5dc915e7..c7890452 100644
--- a/ruoyi-visual/ruoyi-nacos/pom.xml
+++ b/ruoyi-visual/ruoyi-nacos/pom.xml
@@ -27,6 +27,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <nacos.version>2.2.0</nacos.version>
         <nacos.lib.path>${project.basedir}/src/main/resources/lib</nacos.lib.path>
     </properties>
 
diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml
index 6addb0a0..e1995333 100644
--- a/ruoyi-visual/ruoyi-seata-server/pom.xml
+++ b/ruoyi-visual/ruoyi-seata-server/pom.xml
@@ -27,6 +27,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <seata.version>1.6.1</seata.version>
         <jcommander.version>1.72</jcommander.version>
         <druid.version>1.2.12</druid.version>
     </properties>
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
index 5e4abe4b..3eeaf1ae 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
@@ -13,8 +13,8 @@
     <packaging>jar</packaging>
 
     <properties>
+        <sentinel.version>1.8.6</sentinel.version>
         <curator.version>4.0.1</curator.version>
-        <fastjson.version>1.2.83</fastjson.version>
     </properties>
 
     <dependencies>
@@ -94,7 +94,6 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>${fastjson.version}</version>
         </dependency>
     </dependencies>