From 5494ec36e514fe53334ff175782c2a512b4cbb87 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 09 三月 2021 09:32:49 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
pom.xml | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index b9d170b..c648de5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,33 +6,35 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.2.1</version>
+ <version>3.4.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.2.1</ruoyi.version>
+ <ruoyi.version>3.4.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>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <druid.version>1.2.2</druid.version>
+ <druid.version>1.2.4</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>2.9.2</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
<pagehelper.boot.version>1.3.0</pagehelper.boot.version>
- <fastjson.version>1.2.74</fastjson.version>
- <oshi.version>5.3.6</oshi.version>
- <jna.version>5.6.0</jna.version>
+ <fastjson.version>1.2.75</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>
<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.1</mybatis-plus.version>
+ <mybatis-plus.version>3.4.2</mybatis-plus.version>
<hutool.version>5.4.0</hutool.version>
+ <feign.version>2.2.6.RELEASE</feign.version>
+ <feign-okhttp.version>11.0</feign-okhttp.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -43,7 +45,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.1.18.RELEASE</version>
+ <version>2.2.13.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -183,6 +185,18 @@
<version>${hutool.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ <version>${feign.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.github.openfeign</groupId>
+ <artifactId>feign-okhttp</artifactId>
+ <version>${feign-okhttp.version}</version>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -218,6 +232,13 @@
<version>${ruoyi.version}</version>
</dependency>
+ <!-- demo妯″潡 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-demo</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -228,6 +249,7 @@
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
+ <module>ruoyi-demo</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3