From 2d7fd84c57e6659c9ba46ac9f4e2d3bddf879e2b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 14 Jan 2022 10:53:30 +0800
Subject: [PATCH] swagger 在 springboot 2.6.x 不兼容问题的处理
---
pom.xml | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 286e85b..fc2f97e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,40 +6,40 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.2.0</ruoyi.version>
+ <ruoyi.version>3.3.0</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.5.6</spring-boot.version>
- <spring-cloud.version>2020.0.4</spring-cloud.version>
+ <spring-boot.version>2.6.2</spring-boot.version>
+ <spring-cloud.version>2021.0.0</spring-cloud.version>
<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.3</alibaba.nacos.version>
- <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
+ <spring-boot-admin.version>2.6.0</spring-boot-admin.version>
<spring-boot.mybatis>2.2.0</spring-boot.mybatis>
<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.0</pagehelper.boot.version>
+ <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
<druid.version>1.2.8</druid.version>
<dynamic-ds.version>3.5.0</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>1.2.78</fastjson.version>
+ <fastjson.version>1.2.79</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
- <common-pool.version>2.10.0</common-pool.version>
<commons-collections.version>3.2.2</commons-collections.version>
<transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+ <log4j2.version>2.17.1</log4j2.version>
</properties>
<!-- 依赖声明 -->
@@ -183,11 +183,17 @@
<version>${transmittable-thread-local.version}</version>
</dependency>
- <!-- 公共资源池 -->
+ <!-- log4j日志组件 -->
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${common-pool.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${log4j2.version}</version>
</dependency>
<!-- 核心模块 -->
--
Gitblit v1.9.3