From 8573ffdd7f2da009c9adad9f5eb9f50810c2f184 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 25 六月 2023 22:19:27 +0800
Subject: [PATCH] update satoken 1.34.0 => 1.35.0.RC 优化过期配置 支持多端token自定义有效期
---
pom.xml | 100 +++++++++++++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 45d0cac..9629c9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,41 +4,44 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
<version>${revision}</version>
<name>RuoYi-Vue-Plus</name>
- <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
- <description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
+ <url>https://gitee.com/dromara/RuoYi-Vue-Plus</url>
+ <description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.0.0-SNAPSHOT</revision>
- <spring-boot.version>3.0.4</spring-boot.version>
+ <revision>5.1.0-SNAPSHOT</revision>
+ <spring-boot.version>3.0.8</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
- <spring-boot.mybatis>3.0.0</spring-boot.mybatis>
- <springdoc.version>2.0.3</springdoc.version>
+ <spring-boot.mybatis>3.0.1</spring-boot.mybatis>
+ <springdoc.version>2.1.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
- <easyexcel.version>3.2.1</easyexcel.version>
+ <easyexcel.version>3.3.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.34.0</satoken.version>
+ <satoken.version>1.35.0.RC</satoken.version>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.15</hutool.version>
+ <hutool.version>5.8.18</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>3.0.0</spring-boot-admin.version>
- <redisson.version>3.20.0</redisson.version>
+ <spring-boot-admin.version>3.0.4</spring-boot-admin.version>
+ <redisson.version>3.20.1</redisson.version>
<lock4j.version>2.2.4</lock4j.version>
<dynamic-ds.version>3.6.1</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
- <xxl-job.version>2.3.1</xxl-job.version>
- <mapstruct-plus.version>1.1.6</mapstruct-plus.version>
+ <powerjob.version>4.3.3</powerjob.version>
+ <mapstruct-plus.version>1.3.1</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
<lombok.version>1.18.26</lombok.version>
<bouncycastle.version>1.72</bouncycastle.version>
+ <justauth.version>1.16.5</justauth.version>
+ <!-- 绂荤嚎IP鍦板潃瀹氫綅搴� -->
+ <ip2region.version>2.7.0</ip2region.version>
<!-- 涓存椂淇 snakeyaml 婕忔礊 -->
<snakeyaml.version>1.33</snakeyaml.version>
@@ -46,14 +49,13 @@
<!-- OSS 閰嶇疆 -->
<aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
- <aliyun.sms.version>2.0.23</aliyun.sms.version>
- <tencent.sms.version>3.1.687</tencent.sms.version>
+ <sms4j.version>2.2.0</sms4j.version>
<!-- 鎻掍欢鐗堟湰 -->
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
<maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison>
- <maven-surefire-plugin.version>3.0.0-M9</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
</properties>
@@ -109,9 +111,16 @@
<scope>import</scope>
</dependency>
+ <!-- JustAuth 鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>me.zhyd.oauth</groupId>
+ <artifactId>JustAuth</artifactId>
+ <version>${justauth.version}</version>
+ </dependency>
+
<!-- common 鐨勪緷璧栭厤缃�-->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-bom</artifactId>
<version>${revision}</version>
<type>pom</type>
@@ -232,17 +241,11 @@
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk-s3.version}</version>
</dependency>
-
+ <!--鐭俊sms4j-->
<dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>dysmsapi20170525</artifactId>
- <version>${aliyun.sms.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.tencentcloudapi</groupId>
- <artifactId>tencentcloud-sdk-java-sms</artifactId>
- <version>${tencent.sms.version}</version>
+ <groupId>org.dromara.sms4j</groupId>
+ <artifactId>sms4j-spring-boot-starter</artifactId>
+ <version>${sms4j.version}</version>
</dependency>
<dependency>
@@ -269,12 +272,6 @@
<version>${lock4j.version}</version>
</dependency>
- <!-- xxl-job-core -->
- <dependency>
- <groupId>com.xuxueli</groupId>
- <artifactId>xxl-job-core</artifactId>
- <version>${xxl-job.version}</version>
- </dependency>
<dependency>
<groupId>com.alibaba</groupId>
@@ -302,28 +299,47 @@
<version>${mapstruct-plus.version}</version>
</dependency>
+ <!-- 绂荤嚎IP鍦板潃瀹氫綅搴� ip2region -->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.lionsoul</groupId>
+ <artifactId>ip2region</artifactId>
+ <version>${ip2region.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
<version>${revision}</version>
+ </dependency>
+
+ <!-- PowerJob -->
+ <dependency>
+ <groupId>tech.powerjob</groupId>
+ <artifactId>powerjob-worker-spring-boot-starter</artifactId>
+ <version>${powerjob.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tech.powerjob</groupId>
+ <artifactId>powerjob-official-processors</artifactId>
+ <version>${powerjob.version}</version>
</dependency>
</dependencies>
@@ -441,8 +457,8 @@
<repositories>
<repository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -452,8 +468,8 @@
<pluginRepositories>
<pluginRepository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
--
Gitblit v1.9.3