From af8d62e5e20b8a8d131bdf326b7d2304d0a96b88 Mon Sep 17 00:00:00 2001
From: PowderSnow <1109835296@qq.com>
Date: Mon, 13 May 2024 03:21:59 +0800
Subject: [PATCH] update ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java. 目前报”验证码已失效“的场景是uuid为空，应通过判断captcha是否为null得出验证码是否已过期的结果。
---
pom.xml | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index 35eba21..6e9a835 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,45 +6,50 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.4</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.6.0</ruoyi.version>
+ <ruoyi.version>3.6.4</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <spring-boot.version>2.7.2</spring-boot.version>
- <spring-cloud.version>2021.0.3</spring-cloud.version>
- <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
- <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
- <alibaba.seata.version>1.5.1</alibaba.seata.version>
- <spring-boot-admin.version>2.7.3</spring-boot-admin.version>
- <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+ <spring-boot.version>2.7.18</spring-boot.version>
+ <spring-cloud.version>2021.0.8</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
+ <spring-framework.version>5.3.33</spring-framework.version>
+ <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
<swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version>
- <kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
- <druid.version>1.2.11</druid.version>
- <dynamic-ds.version>3.5.1</dynamic-ds.version>
- <commons.io.version>2.11.0</commons.io.version>
- <commons.fileupload.version>1.4</commons.fileupload.version>
+ <kaptcha.version>2.3.3</kaptcha.version>
+ <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
+ <druid.version>1.2.20</druid.version>
+ <dynamic-ds.version>4.2.0</dynamic-ds.version>
+ <commons.io.version>2.13.0</commons.io.version>
<velocity.version>2.3</velocity.version>
- <fastjson.version>2.0.12</fastjson.version>
+ <fastjson.version>2.0.43</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
- <commons-collections.version>3.2.2</commons-collections.version>
- <transmittable-thread-local.version>2.13.2</transmittable-thread-local.version>
+ <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
</properties>
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
+
+ <!-- SpringFramework的依赖配置-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring-framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- SpringCloud 微服务 -->
<dependency>
@@ -64,20 +69,6 @@
<scope>import</scope>
</dependency>
- <!-- Alibaba Nacos 配置 -->
- <dependency>
- <groupId>com.alibaba.nacos</groupId>
- <artifactId>nacos-client</artifactId>
- <version>${alibaba.nacos.version}</version>
- </dependency>
-
- <!-- Alibaba Seata 配置 -->
- <dependency>
- <groupId>io.seata</groupId>
- <artifactId>seata-spring-boot-starter</artifactId>
- <version>${alibaba.seata.version}</version>
- </dependency>
-
<!-- SpringBoot 依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -94,13 +85,6 @@
<version>${tobato.version}</version>
</dependency>
- <!-- Mybatis 依赖配置 -->
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${spring-boot.mybatis}</version>
- </dependency>
-
<!-- Swagger 依赖配置 -->
<dependency>
<groupId>io.swagger</groupId>
@@ -115,7 +99,7 @@
<!-- 验证码 -->
<dependency>
- <groupId>com.github.penggle</groupId>
+ <groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
@@ -141,25 +125,11 @@
<version>${poi.version}</version>
</dependency>
- <!-- 文件上传工具类 -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
- </dependency>
-
<!-- 代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- </dependency>
-
- <!-- Collection 增强Java集合框架 -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
</dependency>
<!-- JSON 解析器和生成器 -->
@@ -204,6 +174,13 @@
<version>${ruoyi.version}</version>
</dependency>
+ <!-- 数据脱敏 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-sensitive</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
<!-- 权限范围 -->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -215,6 +192,13 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datasource</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!-- 分布式事务 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-seata</artifactId>
<version>${ruoyi.version}</version>
</dependency>
@@ -272,6 +256,22 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<repositories>
--
Gitblit v1.9.3