From 2b3820223cfff97335eaff4276f9c19babba05ab Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 05 Jan 2021 10:30:05 +0800
Subject: [PATCH] 修复IE11浏览器报错问题
---
pom.xml | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9bdf130..5dcf2a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,31 +6,35 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.4.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>2.1.0</ruoyi.version>
+ <ruoyi.version>2.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>
- <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.mybatis>2.1.2</spring-boot.mybatis>
- <nacos.version>1.3.0</nacos.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>
+ <tobato.version>1.26.5</tobato.version>
<kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.2.12</pagehelper.boot.version>
+ <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
+ <druid.version>1.2.2</druid.version>
+ <dynamic-ds.version>3.2.1</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.70</fastjson.version>
- <poi.version>3.17</poi.version>
+ <fastjson.version>1.2.74</fastjson.version>
+ <minio.version>8.0.3</minio.version>
+ <poi.version>4.1.2</poi.version>
<common-pool.version>2.6.2</common-pool.version>
</properties>
@@ -51,17 +55,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>
@@ -77,6 +74,13 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring-boot-admin.version}</version>
+ </dependency>
+
+ <!-- FastDFS 分布式文件系统 -->
+ <dependency>
+ <groupId>com.github.tobato</groupId>
+ <artifactId>fastdfs-client</artifactId>
+ <version>${tobato.version}</version>
</dependency>
<!-- Mybatis 依赖配置 -->
@@ -181,6 +185,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>
--
Gitblit v1.9.3