From a12f6472da6118fa6e70211c3a86063239b97528 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 17 一月 2023 16:24:06 +0800
Subject: [PATCH] update 优化 实体类中校验注解的提示信息
---
pom.xml | 108 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 70 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5efd58c..fd9fdbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,21 +6,21 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>4.5.0</version>
+ <version>${revision}</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>4.5.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.7.7</spring-boot.version>
+ <revision>5.0.0-SNAPSHOT</revision>
+ <spring-boot.version>3.0.1</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
- <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
- <springdoc.version>1.6.14</springdoc.version>
+ <java.version>17</java.version>
+ <spring-boot.mybatis>3.0.0</spring-boot.mybatis>
+ <springdoc.version>2.0.2</springdoc.version>
+ <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
<easyexcel.version>3.1.5</easyexcel.version>
<velocity.version>2.3</velocity.version>
@@ -29,10 +29,10 @@
<p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.8.11</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
+ <spring-boot-admin.version>3.0.0-M8</spring-boot-admin.version>
<redisson.version>3.19.1</redisson.version>
- <lock4j.version>2.2.3</lock4j.version>
- <dynamic-ds.version>3.5.2</dynamic-ds.version>
+ <lock4j.version>2.2.4</lock4j.version>
+ <dynamic-ds.version>3.6.1</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<xxl-job.version>2.3.1</xxl-job.version>
<lombok.version>1.18.24</lombok.version>
@@ -45,6 +45,13 @@
<!-- SMS 閰嶇疆 -->
<aliyun.sms.version>2.0.23</aliyun.sms.version>
<tencent.sms.version>3.1.660</tencent.sms.version>
+
+ <!-- 鎻掍欢鐗堟湰 -->
+ <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+ <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
+ <maven-compiler-plugin.verison>3.10.1</maven-compiler-plugin.verison>
+ <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+ <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
</properties>
<profiles>
@@ -101,14 +108,14 @@
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-webmvc-core</artifactId>
+ <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-javadoc</artifactId>
- <version>${springdoc.version}</version>
+ <groupId>com.github.therapi</groupId>
+ <artifactId>therapi-runtime-javadoc</artifactId>
+ <version>${therapi-javadoc.version}</version>
</dependency>
<dependency>
@@ -149,7 +156,7 @@
<!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ -->
<dependency>
<groupId>cn.dev33</groupId>
- <artifactId>sa-token-spring-boot-starter</artifactId>
+ <artifactId>sa-token-spring-boot3-starter</artifactId>
<version>${satoken.version}</version>
</dependency>
<!-- Sa-Token 鏁村悎 jwt -->
@@ -170,6 +177,12 @@
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>${dynamic-ds.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${spring-boot.mybatis}</version>
</dependency>
<dependency>
@@ -225,17 +238,6 @@
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.redisson</groupId>
- <artifactId>redisson-spring-data-30</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.redisson</groupId>
- <artifactId>redisson-spring-data-27</artifactId>
- <version>${redisson.version}</version>
</dependency>
<dependency>
@@ -268,56 +270,56 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-job</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-oss</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- SMS鐭俊妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-sms</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
@@ -342,7 +344,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.9.0</version>
+ <version>${maven-compiler-plugin.verison}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -351,7 +353,7 @@
<path>
<groupId>com.github.therapi</groupId>
<artifactId>therapi-runtime-javadoc-scribe</artifactId>
- <version>0.15.0</version>
+ <version>${therapi-javadoc.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
@@ -370,15 +372,45 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
- <argLine>-Dfile.encoding=UTF-8</argLine>
+ <argLine>
+ -Dfile.encoding=UTF-8
+ --add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.lang.invoke=ALL-UNNAMED
+ </argLine>
<!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
<groups>${profiles.active}</groups>
<!-- 鎺掗櫎鏍囩 -->
<excludedGroups>exclude</excludedGroups>
</configuration>
</plugin>
+ <!-- 缁熶竴鐗堟湰鍙风鐞� -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>${flatten-maven-plugin.version}</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
<resource>
--
Gitblit v1.9.3