From 78ef398257008415f0b2ef275c1885c4fc38908a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 十二月 2020 11:55:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-framework/pom.xml | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 7f4669f..969197a 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.0.0</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,6 +17,7 @@
<dependencies>
+ <!-- BEGIN 濡傛灉鎯充娇鐢� Tomcat 娉ㄩ噴鎺変互涓嬩唬鐮� -->
<!-- SpringBoot Web瀹瑰櫒 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -28,12 +29,19 @@
</exclusion>
</exclusions>
</dependency>
-
<!-- web 瀹瑰櫒浣跨敤 undertow 鎬ц兘鏇村己 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
+ <!-- END -->
+
+ <!-- BEGIN 濡傛灉鎯充娇鐢� Tomcat 瑙ｉ櫎浠ヤ笅浠ｇ爜娉ㄩ噴 -->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+ <!-- END -->
<!-- SpringBoot 鎷︽埅鍣� -->
<dependency>
@@ -47,20 +55,22 @@
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
+ <!-- 楠岃瘉鐮� -->
+ <dependency>
+ <groupId>com.github.penggle</groupId>
+ <artifactId>kaptcha</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- 鑾峰彇绯荤粺淇℃伅 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
</dependency>
<!-- 绯荤粺妯″潡-->
--
Gitblit v1.9.3