From 9ebaf936c13f7654dc5d58962872b7b4cd054a07 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 08 一月 2023 16:07:48 +0800
Subject: [PATCH] reset 回滚 错误优化导致问题
---
pom.xml | 141 ++++++++++++++++++-----------------------------
1 files changed, 54 insertions(+), 87 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9cdf260..30d5132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,48 +6,76 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>4.3.1</version>
+ <version>4.4.0</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.3.1</ruoyi-vue-plus.version>
- <spring-boot.version>2.7.5</spring-boot.version>
+ <ruoyi-vue-plus.version>4.4.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.7.7</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.12</springdoc.version>
+ <springdoc.version>1.6.14</springdoc.version>
<poi.version>5.2.3</poi.version>
- <easyexcel.version>3.1.1</easyexcel.version>
+ <easyexcel.version>3.1.4</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.33.0</satoken.version>
- <mybatis-plus.version>3.5.2</mybatis-plus.version>
+ <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.8</hutool.version>
+ <hutool.version>5.8.11</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>2.7.7</spring-boot-admin.version>
- <redisson.version>3.17.7</redisson.version>
- <lock4j.version>2.2.2</lock4j.version>
+ <spring-boot-admin.version>2.7.9</spring-boot-admin.version>
+ <redisson.version>3.19.0</redisson.version>
+ <lock4j.version>2.2.3</lock4j.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
- <tlog.version>1.5.0</tlog.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>
- <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
- <guava.version>31.1-jre</guava.version>
<!-- 涓存椂淇 snakeyaml 婕忔礊 -->
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>1.33</snakeyaml.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.324</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.373</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
- <aliyun.sms.version>2.0.22</aliyun.sms.version>
- <tencent.sms.version>3.1.611</tencent.sms.version>
+ <aliyun.sms.version>2.0.23</aliyun.sms.version>
+ <tencent.sms.version>3.1.660</tencent.sms.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>local</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>local</profiles.active>
+ <logging.level>debug</logging.level>
+ </properties>
+ </profile>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>dev</profiles.active>
+ <logging.level>debug</logging.level>
+ </properties>
+ <activation>
+ <!-- 榛樿鐜 -->
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <profiles.active>prod</profiles.active>
+ <logging.level>warn</logging.level>
+ </properties>
+ </profile>
+ </profiles>
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
@@ -149,11 +177,7 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-extension</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
+
<!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
<dependency>
<groupId>p6spy</groupId>
@@ -181,7 +205,7 @@
<dependency>
<groupId>com.tencentcloudapi</groupId>
- <artifactId>tencentcloud-sdk-java</artifactId>
+ <artifactId>tencentcloud-sdk-java-sms</artifactId>
<version>${tencent.sms.version}</version>
</dependency>
@@ -216,36 +240,9 @@
</dependency>
<dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-web-spring-boot-starter</artifactId>
- <version>${tlog.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
- <version>${tlog.version}</version>
- </dependency>
-
- <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ <version>${alibaba-ttl.version}</version>
</dependency>
<!-- 涓存椂淇 snakeyaml 婕忔礊 -->
@@ -394,8 +391,8 @@
<repositories>
<repository>
<id>public</id>
- <name>huawei nexus</name>
- <url>https://mirrors.huaweicloud.com/repository/maven/</url>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -405,8 +402,8 @@
<pluginRepositories>
<pluginRepository>
<id>public</id>
- <name>huawei nexus</name>
- <url>https://mirrors.huaweicloud.com/repository/maven/</url>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -415,36 +412,6 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
- <profiles>
- <profile>
- <id>local</id>
- <properties>
- <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
- <profiles.active>local</profiles.active>
- <logging.level>debug</logging.level>
- </properties>
- </profile>
- <profile>
- <id>dev</id>
- <properties>
- <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
- <profiles.active>dev</profiles.active>
- <logging.level>debug</logging.level>
- </properties>
- <activation>
- <!-- 榛樿鐜 -->
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>prod</id>
- <properties>
- <profiles.active>prod</profiles.active>
- <logging.level>warn</logging.level>
- </properties>
- </profile>
- </profiles>
</project>
--
Gitblit v1.9.3