From 0568060b17a1bf77510399c8eaf93ee7cad8f16e 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: Tue, 10 May 2022 14:49:44 +0800
Subject: [PATCH] update springboot-admin 2.6.6 => 2.6.7 update sa-token 1.29.0
 => 1.30.0 update hutool 5.7.22 => 5.8.0 update druid 1.2.8 => 1.2.9

---
 pom.xml                                       | 21 ++++++++++---------
 .../auth/listener/UserActionListener.java     |  4 +---
 .../satoken/config/SaTokenConfiguration.java  |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 54ffd023f..5656438b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,35 +19,30 @@
         <java.version>1.8</java.version>
         <spring-boot.version>2.6.7</spring-boot.version>
         <spring-cloud.version>2021.0.2</spring-cloud.version>
-        <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
-        <spring-boot-admin.version>2.6.6</spring-boot-admin.version>
+        <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
         <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
         <swagger.core.version>1.5.22</swagger.core.version>
         <mybatis-plus.version>3.5.1</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <druid.version>1.2.8</druid.version>
+        <druid.version>1.2.9</druid.version>
         <dynamic-ds.version>3.5.1</dynamic-ds.version>
         <velocity.version>2.3</velocity.version>
         <poi.version>4.1.2</poi.version>
         <commons-compress.version>1.21</commons-compress.version>
         <easyexcel.version>3.0.5</easyexcel.version>
-        <cglib.version>3.3.0</cglib.version>
-        <hutool.version>5.7.22</hutool.version>
+        <hutool.version>5.8.0</hutool.version>
         <redisson.version>3.17.0</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
         <xxl-job.version>2.3.0</xxl-job.version>
         <knife4j-aggregation.version>2.0.9</knife4j-aggregation.version>
         <knife4j.version>3.0.3</knife4j.version>
-        <satoken.version>1.29.0</satoken.version>
+        <satoken.version>1.30.0</satoken.version>
 
         <!-- 统一 guava 版本 解决隐式漏洞问题 -->
         <guava.version>30.0-jre</guava.version>
 
         <!-- OSS 配置 -->
-        <qiniu.version>7.9.5</qiniu.version>
-        <aliyun.oss.version>3.14.0</aliyun.oss.version>
-        <qcloud.cos.version>5.6.72</qcloud.cos.version>
-        <minio.version>8.3.8</minio.version>
+        <aws-java-sdk-s3.version>1.12.215</aws-java-sdk-s3.version>
         <okhttp.version>4.9.3</okhttp.version>
 
         <!-- SMS 配置 -->
@@ -252,6 +247,12 @@
                 <version>${okhttp.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-s3</artifactId>
+                <version>${aws-java-sdk-s3.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.aliyun</groupId>
                 <artifactId>dysmsapi20170525</artifactId>
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/listener/UserActionListener.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/listener/UserActionListener.java
index eaf350c53..39fad0ad2 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/listener/UserActionListener.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/listener/UserActionListener.java
@@ -3,7 +3,6 @@ package com.ruoyi.auth.listener;
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.listener.SaTokenListener;
 import cn.dev33.satoken.stp.SaLoginModel;
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
@@ -37,13 +36,12 @@ public class UserActionListener implements SaTokenListener {
      * 每次登录时触发
      */
     @Override
-    public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) {
+    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) {
         UserType userType = UserType.getUserType(loginId.toString());
         if (userType == UserType.SYS_USER) {
             UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
             String ip = ServletUtils.getClientIP();
             LoginUser user = LoginHelper.getLoginUser();
-            String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
             SysUserOnline userOnline = new SysUserOnline();
             userOnline.setIpaddr(ip);
             userOnline.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java
index c33c7cc23..9959d67cf 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java
@@ -1,6 +1,6 @@
 package com.ruoyi.common.satoken.config;
 
-import cn.dev33.satoken.jwt.StpLogicJwtForStyle;
+import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
 import cn.dev33.satoken.stp.StpLogic;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,7 +15,7 @@ public class SaTokenConfiguration {
 
     @Bean
     public StpLogic getStpLogicJwt() {
-        return new StpLogicJwtForStyle();
+        return new StpLogicJwtForSimple();
     }
 
 }