From ad15978ccb3b0fcf772141a6115430c81045b86e Mon Sep 17 00:00:00 2001
From: jackytang <jackytang520@126.com>
Date: 星期二, 03 八月 2021 00:10:31 +0800
Subject: [PATCH] Fix 修复DictUtils方法报错
---
pom.xml | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 967354c..181958e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,30 +6,45 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>2.6.0</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
- <spring-boot.version>2.3.11.RELEASE</spring-boot.version>
+ <ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.3</spring-boot.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>
- <knife4j.version>3.0.2</knife4j.version>
+ <knife4j.version>3.0.3</knife4j.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3</mybatis-plus.version>
- <hutool.version>5.7.1</hutool.version>
- <feign.version>2.2.6.RELEASE</feign.version>
- <feign-okhttp.version>11.0</feign-okhttp.version>
- <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
- <redisson.version>3.15.2</redisson.version>
+ <hutool.version>5.7.6</hutool.version>
+ <feign.version>3.0.3</feign.version>
+ <feign-okhttp.version>11.2</feign-okhttp.version>
+ <okhttp.version>4.9.1</okhttp.version>
+ <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
+ <redisson.version>3.16.1</redisson.version>
+ <lock4j.version>2.2.1</lock4j.version>
+ <datasource.version>3.4.1</datasource.version>
+
+ <!-- OSS 閰嶇疆 -->
+ <qiniu.version>7.8.0</qiniu.version>
+ <aliyun.oss.version>3.13.0</aliyun.oss.version>
+ <qcloud.cos.version>5.6.47</qcloud.cos.version>
+ <minio.version>8.3.0</minio.version>
+
+ <!-- docker 閰嶇疆 -->
+ <docker.registry.url>localhost</docker.registry.url>
+ <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
+ <docker.namespace>ruoyi</docker.namespace>
+ <docker.plugin.version>1.2.2</docker.plugin.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -79,6 +94,13 @@
<version>${jwt.version}</version>
</dependency>
+ <!-- dynamic-datasource 澶氭暟鎹簮-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <version>${datasource.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
@@ -89,6 +111,7 @@
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -108,6 +131,12 @@
</dependency>
<dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
<version>${spring-boot-admin.version}</version>
@@ -124,7 +153,11 @@
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+ <version>${lock4j.version}</version>
+ </dependency>
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -163,6 +196,13 @@
<!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-oss</artifactId>
+ <version>${ruoyi-vue-plus.version}</version>
+ </dependency>
+
+ <!-- demo妯″潡 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -178,6 +218,8 @@
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-demo</module>
+ <module>ruoyi-extend</module>
+ <module>ruoyi-oss</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3