From 7cf4a5da87eb083135c1bb04b9dc4b564b6a4753 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 17 十二月 2021 11:17:16 +0800
Subject: [PATCH] !391 修改重置表单bug Merge pull request !391 from 18297093310/jieoschina-master-patch-51652
---
pom.xml | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e4ec7b..df250e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
- <ruoyi.version>3.7.0</ruoyi.version>
+ <ruoyi.version>3.8.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>
@@ -22,17 +22,18 @@
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
- <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
- <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
+ <mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
+ <pagehelper.boot.version>1.4.0</pagehelper.boot.version>
<fastjson.version>1.2.78</fastjson.version>
- <oshi.version>5.8.0</oshi.version>
- <jna.version>5.8.0</jna.version>
+ <oshi.version>5.8.2</oshi.version>
+ <jna.version>5.9.0</jna.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.collections.version>3.2.2</commons.collections.version>
<poi.version>4.1.2</poi.version>
- <velocity.version>1.7</velocity.version>
+ <velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
+ <log4j2.version>2.16.0</log4j2.version>
</properties>
<!-- 依赖声明 -->
@@ -43,7 +44,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.5.5</version>
+ <version>2.5.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -132,14 +133,8 @@
<!-- velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- collections工具类 -->
@@ -154,6 +149,19 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
+ </dependency>
+
+ <!-- log4j日志组件 -->
+ <dependency>
+ <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>
<!-- Token生成与解析-->
@@ -242,7 +250,7 @@
<repository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -253,7 +261,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
--
Gitblit v1.9.2