From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-common/pom.xml | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/rsf-common/pom.xml b/rsf-common/pom.xml
index 1409cae..c55643b 100644
--- a/rsf-common/pom.xml
+++ b/rsf-common/pom.xml
@@ -18,7 +18,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<gson.version>2.11.0</gson.version>
<fastjson.version>1.2.58</fastjson.version>
- <mysql-driver.version>5.1.47</mysql-driver.version>
</properties>
<dependencies>
@@ -46,8 +45,8 @@
<artifactId>jedis</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>com.ibeetl</groupId>
@@ -56,21 +55,25 @@
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-driver.version}</version>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.1</version>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+ <version>3.5.12</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
- <version>3.4.1</version>
+ <version>3.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-jsqlparser</artifactId>
+ <version>3.5.12</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -113,16 +116,10 @@
<artifactId>aspectjweaver</artifactId>
<version>1.9.19</version> <!-- 鐢ㄤ簬缁囧叆鍒囬潰 -->
</dependency>
- <!-- swagger -->
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>3.0.2</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>2.8.16</version>
</dependency>
<!-- jjwt -->
<dependency>
@@ -160,8 +157,8 @@
<!-- druid -->
<dependency>
<groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>1.2.6</version>
+ <artifactId>druid-spring-boot-3-starter</artifactId>
+ <version>1.2.27</version>
</dependency>
</dependencies>
--
Gitblit v1.9.1