From c2ff461ff0ec168868c5f8b2138043e294d59a81 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 16 Dec 2025 13:44:40 +0800
Subject: [PATCH] 升级fastjson到最新版2.0.60
---
pom.xml | 100 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 69 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0dff9dd..779be1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,41 +6,52 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.2</version>
+ <version>3.6.6</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.6.2</ruoyi.version>
+ <ruoyi.version>3.6.6</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.7</spring-boot.version>
- <spring-cloud.version>2021.0.5</spring-cloud.version>
- <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
- <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
- <swagger.fox.version>3.0.0</swagger.fox.version>
- <swagger.core.version>1.6.2</swagger.core.version>
+ <spring-boot.version>2.7.18</spring-boot.version>
+ <spring-cloud.version>2021.0.9</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
+ <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
<tobato.version>1.27.2</tobato.version>
<kaptcha.version>2.3.3</kaptcha.version>
- <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
- <druid.version>1.2.15</druid.version>
- <dynamic-ds.version>3.5.2</dynamic-ds.version>
- <commons.io.version>2.11.0</commons.io.version>
- <commons.fileupload.version>1.4</commons.fileupload.version>
+ <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
+ <druid.version>1.2.27</druid.version>
+ <dynamic-ds.version>4.3.1</dynamic-ds.version>
+ <commons.io.version>2.21.0</commons.io.version>
<velocity.version>2.3</velocity.version>
- <fastjson.version>2.0.22</fastjson.version>
+ <fastjson.version>2.0.60</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
- <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
+ <springdoc.version>1.6.9</springdoc.version>
+ <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
+ <!-- override dependency version -->
+ <tomcat.version>9.0.112</tomcat.version>
+ <logback.version>1.2.13</logback.version>
+ <spring-framework.version>5.3.39</spring-framework.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>
@@ -69,6 +80,38 @@
<scope>import</scope>
</dependency>
+ <!-- 覆盖logback的依赖配置-->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+
+ <!-- 覆盖tomcat的依赖配置-->
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
<!-- FastDFS 分布式文件系统 -->
<dependency>
<groupId>com.github.tobato</groupId>
@@ -76,16 +119,11 @@
<version>${tobato.version}</version>
</dependency>
- <!-- Swagger 依赖配置 -->
+ <!-- Springdoc webmvc 依赖配置 -->
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- <version>${swagger.core.version}</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${swagger.core.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<!-- 验证码 -->
@@ -114,13 +152,6 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
- </dependency>
-
- <!-- 文件上传工具类 -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
</dependency>
<!-- 代码生成使用模板 -->
@@ -172,6 +203,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>
--
Gitblit v1.9.3