From 7079a4e7e41fa803b226709e4ea393c849fd4ddf 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: Wed, 10 Nov 2021 13:31:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20satoken=201.27.0=20=3D>=201.28.0=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20jwt=20=E6=8F=92=E4=BB=B6=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=20token=20=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                         |  8 +++++++-
 ruoyi-admin/src/main/resources/application.yml  |  4 +++-
 ruoyi-common/pom.xml                            |  5 +++++
 .../ruoyi/framework/config/SaTokenConfig.java   | 17 +++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java

diff --git a/pom.xml b/pom.xml
index 80e82c2cd..55a8c8826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <poi.version>4.1.2</poi.version>
         <easyexcel.version>2.2.11</easyexcel.version>
         <velocity.version>1.7</velocity.version>
-        <satoken.version>1.27.0</satoken.version>
+        <satoken.version>1.28.0</satoken.version>
         <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.7.15</hutool.version>
@@ -142,6 +142,12 @@
                 <artifactId>sa-token-spring-aop</artifactId>
                 <version>${satoken.version}</version>
             </dependency>
+            <!-- Sa-Token 整合 jwt -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jwt</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
 
             <!-- jdk11 缺失依赖 jaxb-->
             <dependency>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 563323241..2bec04a1b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -114,7 +114,9 @@ sa-token:
   # token前缀
   token-prefix: "Bearer"
   # token风格
-  token-style: random-128
+  token-style: uuid
+  # jwt秘钥
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
   # 是否输出操作日志
   is-log: true
 
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 847969ea1..2b0f9406c 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -44,6 +44,11 @@
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-aop</artifactId>
         </dependency>
+        <!-- Sa-Token 整合 jwt -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-jwt</artifactId>
+        </dependency>
 
         <!-- 自定义验证注解 -->
         <dependency>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
new file mode 100644
index 000000000..9c9813f80
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
@@ -0,0 +1,17 @@
+package com.ruoyi.framework.config;
+
+import cn.dev33.satoken.jwt.StpLogicJwtForStyle;
+import cn.dev33.satoken.stp.StpLogic;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SaTokenConfig {
+
+    @Bean
+    public StpLogic getStpLogicJwt() {
+        // Sa-Token 整合 jwt (Style模式)
+        return new StpLogicJwtForStyle();
+    }
+
+}