From 1b5b0d8775c566999cb1c8fced1450e12ead78b9 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 03:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20sa-token-dubbo=20=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=B8=E5=85=B3=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml | 12 +++++++-----
 sa-token-demo/sa-token-demo-dubbo-provider/pom.xml | 12 +++++++-----
 sa-token-dependencies/pom.xml                      |  2 +-
 sa-token-plugin/sa-token-dubbo/pom.xml             |  3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
index c912a407..910dcd21 100644
--- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
@@ -9,8 +9,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<!--<version>2.3.3.RELEASE</version>-->
-		<version>2.5.14</version>
+		<!--<version>2.3.1.RELEASE</version>-->
+		<version>2.5.15</version>
 	</parent>
 
 	<!-- 指定一些属性 -->
@@ -18,6 +18,8 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<sa-token.version>1.34.1</sa-token.version>
+		<dubbo.version>2.7.21</dubbo.version>
+		<nacos.version>1.4.2</nacos.version>
 	</properties>
 	
 	<dependencies>
@@ -50,19 +52,19 @@
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-spring-boot-starter</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		
 		<!-- Dubbo 注册到 Nacos -->
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-registry-nacos</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.nacos</groupId>
 			<artifactId>nacos-client</artifactId>
-			<version>1.4.1</version>
+			<version>${nacos.version}</version>
 		</dependency>
 		
 		<!-- Sa-Token 整合 Dubbo -->
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
index 58f8ffb8..026c80ce 100644
--- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
@@ -9,8 +9,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<!--<version>2.3.3.RELEASE</version>-->
-		<version>2.5.14</version>
+		<!--<version>2.3.1.RELEASE</version>-->
+		<version>2.5.15</version>
 	</parent>
 
 	<!-- 指定一些属性 -->
@@ -18,6 +18,8 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<sa-token.version>1.34.1</sa-token.version>
+		<dubbo.version>2.7.21</dubbo.version>
+		<nacos.version>1.4.2</nacos.version>
 	</properties>
 	
 	<dependencies>
@@ -50,19 +52,19 @@
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-spring-boot-starter</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		
 		<!-- Dubbo 注册到 Nacos -->
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-registry-nacos</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.nacos</groupId>
 			<artifactId>nacos-client</artifactId>
-			<version>1.4.1</version>
+			<version>${nacos.version}</version>
 		</dependency>
 		
 		<!-- Sa-Token 整合 Dubbo -->
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 64fbdf02..a5b95a55 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -29,7 +29,7 @@
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
 		<commons-pool2.version>2.5.0</commons-pool2.version>
-    <dubbo.version>2.7.21</dubbo.version>
+		<dubbo.version>2.7.21</dubbo.version>
 		<grpc-spring-boot-starter.version>2.10.1.RELEASE</grpc-spring-boot-starter.version>
 		<hutool-jwt.version>5.8.9</hutool-jwt.version>
 		<jjwt.version>0.9.1</jjwt.version>
diff --git a/sa-token-plugin/sa-token-dubbo/pom.xml b/sa-token-plugin/sa-token-dubbo/pom.xml
index a7ca941d..9a9687ae 100644
--- a/sa-token-plugin/sa-token-dubbo/pom.xml
+++ b/sa-token-plugin/sa-token-dubbo/pom.xml
@@ -27,8 +27,9 @@
 	    <dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo</artifactId>
+			<optional>true</optional>
 		</dependency>
-	    
+
 		<!-- <dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-spring-boot-starter</artifactId>