From 4460fae46fedb491ccb2782e6984fc8145d809d4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 23 五月 2020 10:31:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/pom.xml | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml
index 851b926..7de0512 100644
--- a/ruoyi/pom.xml
+++ b/ruoyi/pom.xml
@@ -25,7 +25,7 @@
<java.version>1.8</java.version>
<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
<pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
- <fastjson.version>1.2.47</fastjson.version>
+ <fastjson.version>1.2.68</fastjson.version>
<druid.version>1.1.14</druid.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
@@ -47,6 +47,12 @@
<artifactId>spring-boot-starter</artifactId>
</dependency>
+ <!-- web 瀹瑰櫒浣跨敤 undertow 鎬ц兘鏇村己 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-undertow</artifactId>
+ </dependency>
+
<!-- SpringBoot 娴嬭瘯 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -64,21 +70,27 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
<!-- spring-boot-devtools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
</dependency>
-
+
<!-- spring security 瀹夊叏璁よ瘉 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
-
+
<!-- redis 缂撳瓨鎿嶄綔 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -97,19 +109,17 @@
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
-
- <!-- SpringBoot闆嗘垚mybatis妗嗘灦 -->
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis.spring.boot.starter.version}</version>
- </dependency>
-
<!-- pagehelper 鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.spring.boot.starter.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
@@ -253,7 +263,7 @@
<artifactId>lombok</artifactId>
</dependency>
- <!-- 瀹氭椂浠诲姟 -->
+ <!-- 瀹氭椂浠诲姟 -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
--
Gitblit v1.9.3