From cb5a6d29e2ca814c7291a3fec811f96d2974b0ce Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 23 二月 2022 16:55:09 +0800
Subject: [PATCH] 页面若未匹配到字典标签则返回原字典值
---
pom.xml | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index ebf3f28..ddc2875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,32 +6,32 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.5.0</version>
+ <version>3.8.1</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
- <ruoyi.version>3.5.0</ruoyi.version>
+ <ruoyi.version>3.8.1</ruoyi.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.1.1</maven-jar-plugin.version>
- <druid.version>1.2.6</druid.version>
+ <druid.version>1.2.8</druid.version>
<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.0</pagehelper.boot.version>
- <fastjson.version>1.2.76</fastjson.version>
- <oshi.version>5.6.0</oshi.version>
- <jna.version>5.7.0</jna.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
+ <kaptcha.version>2.3.2</kaptcha.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.79</fastjson.version>
+ <oshi.version>6.1.2</oshi.version>
+ <jna.version>5.10.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>
</properties>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.2.13.RELEASE</version>
+ <version>2.5.9</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -99,11 +99,13 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
+ <version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- io常用工具类 -->
@@ -130,14 +132,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工具类 -->
@@ -240,7 +236,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>
@@ -251,7 +247,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