From 3ab03bf0e7809b9c0b5fc07b4644412086bc9249 Mon Sep 17 00:00:00 2001
From: Michelle.Chung <1242874891@qq.com>
Date: 星期四, 23 二月 2023 20:31:57 +0800
Subject: [PATCH] fix 修正创建租户失败时未关闭忽略租户问题 ;
---
pom.xml | 81 ++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd9fdbd..3fd70c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<revision>5.0.0-SNAPSHOT</revision>
- <spring-boot.version>3.0.1</spring-boot.version>
+ <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>17</java.version>
@@ -22,29 +22,30 @@
<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>3.0.0-M8</spring-boot-admin.version>
- <redisson.version>3.19.1</redisson.version>
+ <spring-boot-admin.version>3.0.0</spring-boot-admin.version>
+ <redisson.version>3.19.2</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>
+ <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>
@@ -102,6 +103,15 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-bom</artifactId>
<version>${hutool.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- common 鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-bom</artifactId>
+ <version>${revision}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -171,6 +181,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-core</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
@@ -188,6 +203,12 @@
<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>
@@ -266,56 +287,31 @@
<version>${snakeyaml.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟 -->
+ <!-- 鍔犲瘑鍖呭紩鍏� -->
<dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-job</artifactId>
- <version>${revision}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>${bouncycastle.version}</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>
@@ -327,15 +323,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>
@@ -366,6 +356,9 @@
<version>${spring-boot.version}</version>
</path>
</annotationProcessorPaths>
+ <compilerArgs>
+ <arg>-parameters</arg>
+ </compilerArgs>
</configuration>
</plugin>
<!-- 鍗曞厓娴嬭瘯浣跨敤 -->
--
Gitblit v1.9.3