From 4ffb0acc35d85a78959edb97ef80e23a92cefc89 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 11 三月 2023 23:59:05 +0800
Subject: [PATCH] fix 修复 超管切换租户后 点击个人中心报错
---
pom.xml | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8af1669..477365b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<revision>5.0.0-SNAPSHOT</revision>
- <spring-boot.version>3.0.2</spring-boot.version>
+ <spring-boot.version>3.0.4</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
@@ -22,35 +22,38 @@
<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.2.0</easyexcel.version>
+ <easyexcel.version>3.2.1</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>
+ <hutool.version>5.8.15</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
<spring-boot-admin.version>3.0.0</spring-boot-admin.version>
- <redisson.version>3.19.1</redisson.version>
+ <redisson.version>3.20.0</redisson.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>
+ <mapstruct-plus.version>1.1.6</mapstruct-plus.version>
+ <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
+ <lombok.version>1.18.26</lombok.version>
+ <bouncycastle.version>1.72</bouncycastle.version>
<!-- 涓存椂淇 snakeyaml 婕忔礊 -->
<snakeyaml.version>1.33</snakeyaml.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.373</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
<aliyun.sms.version>2.0.23</aliyun.sms.version>
- <tencent.sms.version>3.1.660</tencent.sms.version>
+ <tencent.sms.version>3.1.687</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>
+ <maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison>
+ <maven-surefire-plugin.version>3.0.0-M9</maven-surefire-plugin.version>
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
</properties>
@@ -286,6 +289,19 @@
<version>${snakeyaml.version}</version>
</dependency>
+ <!-- 鍔犲瘑鍖呭紩鍏� -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.github.linpeilie</groupId>
+ <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+ <version>${mapstruct-plus.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
@@ -347,7 +363,20 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring-boot.version}</version>
</path>
+ <path>
+ <groupId>io.github.linpeilie</groupId>
+ <artifactId>mapstruct-plus-processor</artifactId>
+ <version>${mapstruct-plus.version}</version>
+ </path>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok-mapstruct-binding</artifactId>
+ <version>${mapstruct-plus.lombok.version}</version>
+ </path>
</annotationProcessorPaths>
+ <compilerArgs>
+ <arg>-parameters</arg>
+ </compilerArgs>
</configuration>
</plugin>
<!-- 鍗曞厓娴嬭瘯浣跨敤 -->
@@ -356,11 +385,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
- <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