From 00e2c7f04d3714e0c1185dfba8fe7dcf3cb1c3ea Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 21 Sep 2020 12:27:11 +0800
Subject: [PATCH] 升级Spring Cloud组件到最新版
---
pom.xml | 17 +++++------------
ruoyi-common/ruoyi-common-core/pom.xml | 36 ++++++++++++++++++------------------
2 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 11524c6..ecdc3f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,11 +17,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
- <spring-cloud.version>Hoxton.SR4</spring-cloud.version>
- <spring-boot-admin.version>2.2.3</spring-boot-admin.version>
+ <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
+ <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+ <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+ <spring-boot-admin.version>2.3.0</spring-boot-admin.version>
<spring-boot.mybatis>2.1.2</spring-boot.mybatis>
- <nacos.version>1.3.0</nacos.version>
<swagger.fox.version>2.9.2</swagger.fox.version>
<swagger.core.version>1.5.24</swagger.core.version>
<kaptcha.version>2.3.2</kaptcha.version>
@@ -51,17 +51,10 @@
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
- <version>2.2.1.RELEASE</version>
+ <version>${spring-cloud-alibaba.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <!-- Alibaba Nacos 配置 -->
- <dependency>
- <groupId>com.alibaba.nacos</groupId>
- <artifactId>nacos-client</artifactId>
- <version>${nacos.version}</version>
- </dependency>
<!-- SpringBoot 依赖配置 -->
<dependency>
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 4d7608f..a372e07 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -16,13 +16,13 @@
</description>
<dependencies>
-
+
<!-- SpringCloud Openfeign -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
-
+
<!-- Spring Context Support -->
<dependency>
<groupId>org.springframework</groupId>
@@ -34,73 +34,73 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
-
+
<!-- Apache Commons Pool2 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
-
+
<!-- Pagehelper -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency>
-
- <!-- Java Validation -->
+
+ <!-- Hibernate Validator -->
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
</dependency>
-
+
<!-- Jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
-
+
<!-- Alibaba Fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
-
+
<!-- Apache Lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
+
<!-- Commons Io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-
+
<!-- Commons Fileupload -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
-
+
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
-
+
<!-- Java Servlet -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-
+
<!-- Swagger -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
-
+
</dependencies>
-
+
</project>
--
Gitblit v1.9.3