From 7ebcb4bf8af0d5ee8f6ef7bc5e091ae9fb817103 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 30 May 2021 18:20:35 +0800
Subject: [PATCH] 修复升级cloud引起的代码生成报错
---
pom.xml | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index d161756..ab67c92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,25 +17,26 @@
<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.3.7.RELEASE</spring-boot.version>
- <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
- <spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
- <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
- <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
+ <spring-boot.version>2.5.0</spring-boot.version>
+ <spring-cloud.version>2020.0.2</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+ <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
+ <spring-boot.mybatis>2.1.4</spring-boot.mybatis>
<swagger.fox.version>2.9.2</swagger.fox.version>
<swagger.core.version>1.5.24</swagger.core.version>
<tobato.version>1.26.5</tobato.version>
<kaptcha.version>2.3.2</kaptcha.version>
<pagehelper.boot.version>1.3.0</pagehelper.boot.version>
- <druid.version>1.2.4</druid.version>
- <dynamic-ds.version>3.2.1</dynamic-ds.version>
+ <druid.version>1.2.6</druid.version>
+ <dynamic-ds.version>3.3.2</dynamic-ds.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<velocity.version>1.7</velocity.version>
- <fastjson.version>1.2.75</fastjson.version>
- <minio.version>8.0.3</minio.version>
+ <fastjson.version>1.2.76</fastjson.version>
+ <minio.version>8.2.1</minio.version>
<poi.version>4.1.2</poi.version>
<common-pool.version>2.6.2</common-pool.version>
+ <commons-collections.version>3.2.2</commons-collections.version>
</properties>
<!-- 依赖声明 -->
@@ -150,6 +151,13 @@
</exclusions>
</dependency>
+ <!-- Collection 增强Java集合框架 -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+
<!-- JSON 解析器和生成器 -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -234,7 +242,11 @@
<packaging>pom</packaging>
<dependencies>
-
+ <!-- bootstrap 启动器 -->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ </dependency>
</dependencies>
<build>
--
Gitblit v1.9.3