From 7421d7cccee99d7c60a0c8af8e7e6aeabc2f2666 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Wed, 29 Mar 2023 10:44:23 +0800
Subject: [PATCH] !313 异步保存日志的时候，报错被吞 ，导致没跑进RemoteLogFallbackFactory中 Merge pull request !313 from Llorando/master
---
pom.xml | 114 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index 42d8110..b613ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,40 +6,35 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.5.0</version>
+ <version>3.6.2</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.5.0</ruoyi.version>
+ <ruoyi.version>3.6.2</ruoyi.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.version>2.6.7</spring-boot.version>
- <spring-cloud.version>2021.0.1</spring-cloud.version>
- <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
- <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
- <alibaba.seata.version>1.5.1</alibaba.seata.version>
- <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
- <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+ <spring-boot.version>2.7.7</spring-boot.version>
+ <spring-cloud.version>2021.0.5</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
+ <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
<swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version>
- <kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
- <druid.version>1.2.11</druid.version>
- <dynamic-ds.version>3.5.0</dynamic-ds.version>
+ <kaptcha.version>2.3.3</kaptcha.version>
+ <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
+ <druid.version>1.2.16</druid.version>
+ <dynamic-ds.version>3.5.2</dynamic-ds.version>
<commons.io.version>2.11.0</commons.io.version>
- <commons.fileupload.version>1.4</commons.fileupload.version>
<velocity.version>2.3</velocity.version>
- <fastjson.version>2.0.8</fastjson.version>
+ <fastjson.version>2.0.25</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
- <commons-collections.version>3.2.2</commons-collections.version>
- <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+ <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
</properties>
<!-- 依赖声明 -->
@@ -64,20 +59,6 @@
<scope>import</scope>
</dependency>
- <!-- Alibaba Nacos 配置 -->
- <dependency>
- <groupId>com.alibaba.nacos</groupId>
- <artifactId>nacos-client</artifactId>
- <version>${alibaba.nacos.version}</version>
- </dependency>
-
- <!-- Alibaba Seata 配置 -->
- <dependency>
- <groupId>io.seata</groupId>
- <artifactId>seata-spring-boot-starter</artifactId>
- <version>${alibaba.seata.version}</version>
- </dependency>
-
<!-- SpringBoot 依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -94,13 +75,6 @@
<version>${tobato.version}</version>
</dependency>
- <!-- Mybatis 依赖配置 -->
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${spring-boot.mybatis}</version>
- </dependency>
-
<!-- Swagger 依赖配置 -->
<dependency>
<groupId>io.swagger</groupId>
@@ -115,7 +89,7 @@
<!-- 验证码 -->
<dependency>
- <groupId>com.github.penggle</groupId>
+ <groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
@@ -141,25 +115,11 @@
<version>${poi.version}</version>
</dependency>
- <!-- 文件上传工具类 -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
- </dependency>
-
<!-- 代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- </dependency>
-
- <!-- Collection 增强Java集合框架 -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
</dependency>
<!-- JSON 解析器和生成器 -->
@@ -218,6 +178,13 @@
<version>${ruoyi.version}</version>
</dependency>
+ <!-- 分布式事务 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-seata</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
<!-- 日志记录 -->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -272,6 +239,47 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
+ <repositories>
+ <repository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
\ No newline at end of file
--
Gitblit v1.9.3