From 86cb7555ebfd6c3e03aeeaf310df7523abcff8ce Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 02 Apr 2026 11:08:38 +0800
Subject: [PATCH] 代码生成支持表单布局选项
---
pom.xml | 223 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 131 insertions(+), 92 deletions(-)
diff --git a/pom.xml b/pom.xml
index d161756..f924360 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,36 +6,34 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.6.8</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>2.5.0</ruoyi.version>
+ <ruoyi.version>3.6.8</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.3.7.RELEASE</spring-boot.version>
- <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
- <spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
- <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
- <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
- <swagger.fox.version>2.9.2</swagger.fox.version>
- <swagger.core.version>1.5.24</swagger.core.version>
- <tobato.version>1.26.5</tobato.version>
- <kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
- <druid.version>1.2.4</druid.version>
- <dynamic-ds.version>3.2.1</dynamic-ds.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
- <velocity.version>1.7</velocity.version>
- <fastjson.version>1.2.75</fastjson.version>
- <minio.version>8.0.3</minio.version>
- <poi.version>4.1.2</poi.version>
- <common-pool.version>2.6.2</common-pool.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>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.61</fastjson.version>
+ <jjwt.version>0.9.1</jjwt.version>
+ <minio.version>8.2.2</minio.version>
+ <poi.version>4.1.2</poi.version>
+ <springdoc.version>3.0.2</springdoc.version>
+ <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
</properties>
<!-- 依赖声明 -->
@@ -51,7 +49,7 @@
<scope>import</scope>
</dependency>
- <!-- SpringCloud Alibaba 微服务 -->
+ <!-- SpringCloud Alibaba 微服务 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
@@ -68,43 +66,17 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <!-- SpringBoot 监控客户端 -->
+
+ <!-- Springdoc webmvc 依赖配置 -->
<dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-client</artifactId>
- <version>${spring-boot-admin.version}</version>
- </dependency>
-
- <!-- FastDFS 分布式文件系统 -->
- <dependency>
- <groupId>com.github.tobato</groupId>
- <artifactId>fastdfs-client</artifactId>
- <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>
- <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>
<!-- 验证码 -->
<dependency>
- <groupId>com.github.penggle</groupId>
+ <groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
@@ -114,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常用工具类 -->
@@ -130,111 +114,123 @@
<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</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- JSON 解析器和生成器 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
<version>${fastjson.version}</version>
</dependency>
-
- <!-- 公共资源池 -->
+
+ <!-- JWT -->
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${common-pool.version}</version>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>${jjwt.version}</version>
+ </dependency>
+
+ <!-- 线程传递值 -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ <version>${transmittable-thread-local.version}</version>
</dependency>
<!-- 核心模块 -->
- <dependency>
+ <dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-core</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 接口模块 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-swagger</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 安全模块 -->
<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>
+
<!-- 权限范围 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datascope</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 多数据源 -->
<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>
+
<!-- 日志记录 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-log</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 缓存服务 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-redis</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 系统接口 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-system</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
<modules>
- <module>ruoyi-auth</module>
- <module>ruoyi-gateway</module>
- <module>ruoyi-visual</module>
- <module>ruoyi-modules</module>
- <module>ruoyi-api</module>
- <module>ruoyi-common</module>
+ <module>ruoyi-auth</module>
+ <module>ruoyi-gateway</module>
+ <module>ruoyi-visual</module>
+ <module>ruoyi-modules</module>
+ <module>ruoyi-api</module>
+ <module>ruoyi-common</module>
</modules>
<packaging>pom</packaging>
<dependencies>
-
+ <!-- bootstrap 启动器 -->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -242,13 +238,56 @@
<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>
</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>
+ <repository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
\ No newline at end of file
--
Gitblit v1.9.3