From 31a271301275ca59e4821b988f482f753ae0b885 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 四月 2020 10:16:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi/pom.xml |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml
index a3ebef2..e8a9fa7 100644
--- a/ruoyi/pom.xml
+++ b/ruoyi/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ruoyi</groupId>
 	<artifactId>ruoyi</artifactId>
-	<version>2.0.0</version>
+	<version>2.2.0</version>
 	<packaging>jar</packaging>
 
 	<name>ruoyi</name>
@@ -36,7 +36,7 @@
 		<oshi.version>3.9.1</oshi.version>
 		<velocity.version>1.7</velocity.version>
 		<mybatis-plus.version>3.3.0</mybatis-plus.version>
-		<hutool.version>5.0.6</hutool.version>
+		<hutool.version>5.1.0</hutool.version>
 	</properties>
 
 	<dependencies>
@@ -45,13 +45,18 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<!--
-			 <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+					<groupId>org.springframework.boot</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- web 瀹瑰櫒浣跨敤 undertow 鎬ц兘鏇村己 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
 
 		<!-- SpringBoot 娴嬭瘯 -->
@@ -104,13 +109,6 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-
-<!--		&lt;!&ndash; SpringBoot闆嗘垚mybatis妗嗘灦 &ndash;&gt;-->
-<!--		<dependency>-->
-<!--			<groupId>org.mybatis.spring.boot</groupId>-->
-<!--			<artifactId>mybatis-spring-boot-starter</artifactId>-->
-<!--			<version>${mybatis.spring.boot.starter.version}</version>-->
-<!--		</dependency>-->
 		
 		<!-- pagehelper 鍒嗛〉鎻掍欢 -->
 		<dependency>
@@ -239,6 +237,7 @@
 			<artifactId>poi-ooxml</artifactId>
 			<version>${poi.version}</version>
 		</dependency>
+
 		<!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
@@ -264,6 +263,19 @@
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 		</dependency>
+
+        <!-- 瀹氭椂浠诲姟 -->
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.mchange</groupId>
+					<artifactId>c3p0</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 	</dependencies>
 
 	<build>

--
Gitblit v1.9.3