From a7e16d582d64691a8178de5b6d710acaf0e65a8c Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 20 五月 2022 15:56:27 +0800
Subject: [PATCH] !488 修复操作日志列表查询业务类型时的bug Merge pull request !488 from 也曾为你、像超人/N/A
---
pom.xml | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91ac13c..6260529 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.2</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
- <ruoyi.version>3.7.0</ruoyi.version>
+ <ruoyi.version>3.8.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>
@@ -22,16 +22,15 @@
<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.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>
+ <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
+ <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
+ <fastjson.version>1.2.80</fastjson.version>
+ <oshi.version>6.1.6</oshi.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>
</properties>
@@ -43,7 +42,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.5.5</version>
+ <version>2.5.13</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -83,18 +82,6 @@
<version>${oshi.version}</version>
</dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
<!-- Swagger3依赖 -->
<dependency>
<groupId>io.springfox</groupId>
@@ -132,14 +119,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工具类 -->
@@ -242,7 +223,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 +234,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