From 571a25d4865e8865cf1e80f3ba86cc4cbebe8d03 Mon Sep 17 00:00:00 2001
From: gowshwah <145280043+nodjoy@users.noreply.github.com>
Date: Thu, 12 Mar 2026 16:42:31 +0800
Subject: [PATCH] update docker image version for master branch
---
pom.xml | 72 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index d4d13b4..e4f9016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,35 +6,34 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.2</version>
+ <version>3.6.7</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.6.2</ruoyi.version>
+ <ruoyi.version>3.6.7</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>
- <tobato.version>1.27.2</tobato.version>
+ <java.version>17</java.version>
+ <spring-boot.version>4.0.3</spring-boot.version>
+ <spring-cloud.version>2025.1.0</spring-cloud.version>
+ <spring-cloud-alibaba.version>2025.1.0.0</spring-cloud-alibaba.version>
+ <spring-boot-admin.version>4.0.2</spring-boot-admin.version>
+ <mybatis-spring-boot.version>4.0.1</mybatis-spring-boot.version>
<kaptcha.version>2.3.3</kaptcha.version>
- <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
- <druid.version>1.2.16</druid.version>
- <dynamic-ds.version>3.5.2</dynamic-ds.version>
- <commons.io.version>2.11.0</commons.io.version>
+ <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
+ <druid.version>1.2.28</druid.version>
+ <dynamic-ds.version>4.5.0</dynamic-ds.version>
+ <commons.io.version>2.21.0</commons.io.version>
<velocity.version>2.3</velocity.version>
- <fastjson.version>2.0.34</fastjson.version>
+ <fastjson.version>2.0.61</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>3.0.2</springdoc.version>
+ <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
</properties>
<!-- 依赖声明 -->
@@ -68,23 +67,11 @@
<scope>import</scope>
</dependency>
- <!-- FastDFS 分布式文件系统 -->
+ <!-- Springdoc webmvc 依赖配置 -->
<dependency>
- <groupId>com.github.tobato</groupId>
- <artifactId>fastdfs-client</artifactId>
- <version>${tobato.version}</version>
- </dependency>
-
- <!-- Swagger 依赖配置 -->
- <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-starter-webmvc-ui</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<!-- 验证码 -->
@@ -99,6 +86,18 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>mybatis-spring</artifactId>
+ <groupId>org.mybatis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${mybatis-spring-boot.version}</version>
</dependency>
<!-- io常用工具类 -->
@@ -161,6 +160,13 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-security</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!-- 数据脱敏 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-sensitive</artifactId>
<version>${ruoyi.version}</version>
</dependency>
@@ -232,7 +238,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
<configuration>
+ <parameters>true</parameters>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
--
Gitblit v1.9.3