From 8eac239e48680c37fa822e40b54a5bdad908043a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 09 Jul 2021 21:10:08 +0800
Subject: [PATCH] FileUpload组件支持多文件上传
---
pom.xml | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 037f1c3..4d55708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,33 +6,38 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.3.0</version>
+ <version>3.0.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>2.3.0</ruoyi.version>
+ <ruoyi.version>3.0.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>
- <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.3</spring-boot.mybatis>
- <swagger.fox.version>2.9.2</swagger.fox.version>
- <swagger.core.version>1.5.24</swagger.core.version>
+ <spring-boot.version>2.5.1</spring-boot.version>
+ <spring-cloud.version>2020.0.3</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+ <alibaba.nacos.version>2.0.2</alibaba.nacos.version>
+ <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
+ <spring-boot.mybatis>2.1.4</spring-boot.mybatis>
+ <swagger.fox.version>3.0.0</swagger.fox.version>
+ <swagger.core.version>1.6.2</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>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
+ <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
+ <druid.version>1.2.6</druid.version>
+ <dynamic-ds.version>3.4.0</dynamic-ds.version>
+ <commons.io.version>2.10.0</commons.io.version>
+ <commons.fileupload.version>1.4</commons.fileupload.version>
<velocity.version>1.7</velocity.version>
- <fastjson.version>1.2.74</fastjson.version>
- <poi.version>3.17</poi.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>
<!-- 依赖声明 -->
@@ -55,6 +60,13 @@
<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>${alibaba.nacos.version}</version>
</dependency>
<!-- SpringBoot 依赖配置 -->
@@ -139,6 +151,19 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Collection 增强Java集合框架 -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
</dependency>
<!-- JSON 解析器和生成器 -->
@@ -182,6 +207,13 @@
<artifactId>ruoyi-common-datascope</artifactId>
<version>${ruoyi.version}</version>
</dependency>
+
+ <!-- 多数据源 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-datasource</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
<!-- 日志记录 -->
<dependency>
@@ -218,7 +250,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