From 5cce09b5c2e520954d85e6e42b9b6f55472dbb59 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 03 二月 2023 00:39:15 +0800
Subject: [PATCH] fix 修复 翻译模块 无法翻译实体属性值为 Null 的字段的问题
---
pom.xml | 120 +++++++++++++++++++++++++----------------------------------
1 files changed, 51 insertions(+), 69 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3f7ef30..8af1669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,25 +13,26 @@
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <revision>4.5.0</revision>
- <spring-boot.version>2.7.7</spring-boot.version>
+ <revision>5.0.0-SNAPSHOT</revision>
+ <spring-boot.version>3.0.2</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>
- <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>
+ <easyexcel.version>3.2.0</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.34.0</satoken.version>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<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</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>
@@ -49,7 +50,7 @@
<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>2.22.2</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
</properties>
@@ -105,16 +106,25 @@
<scope>import</scope>
</dependency>
+ <!-- common 鐨勪緷璧栭厤缃�-->
<dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-webmvc-core</artifactId>
- <version>${springdoc.version}</version>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-bom</artifactId>
+ <version>${revision}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-javadoc</artifactId>
+ <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
<version>${springdoc.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.therapi</groupId>
+ <artifactId>therapi-runtime-javadoc</artifactId>
+ <version>${therapi-javadoc.version}</version>
</dependency>
<dependency>
@@ -155,7 +165,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 +180,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-core</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
@@ -179,8 +194,20 @@
</dependency>
<dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${spring-boot.mybatis}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -231,17 +258,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>
@@ -270,56 +286,24 @@
<version>${snakeyaml.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟 -->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-job</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- 鏍稿績妯″潡-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-framework</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${revision}</version>
</dependency>
- <!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
+ <artifactId>ruoyi-job</artifactId>
<version>${revision}</version>
</dependency>
- <!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-oss</artifactId>
+ <artifactId>ruoyi-generator</artifactId>
<version>${revision}</version>
</dependency>
- <!-- SMS鐭俊妯″潡 -->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-sms</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
@@ -331,15 +315,9 @@
<modules>
<module>ruoyi-admin</module>
- <module>ruoyi-framework</module>
- <module>ruoyi-system</module>
- <module>ruoyi-job</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
- <module>ruoyi-demo</module>
<module>ruoyi-extend</module>
- <module>ruoyi-oss</module>
- <module>ruoyi-sms</module>
+ <module>ruoyi-modules</module>
</modules>
<packaging>pom</packaging>
@@ -357,7 +335,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>
@@ -378,7 +356,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<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>
<!-- 鎺掗櫎鏍囩 -->
--
Gitblit v1.9.3