From c80956a06c564085c789d964febf9c7a99858196 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 28 十一月 2020 20:39:54 +0800
Subject: [PATCH] 三级菜单自动配置组件

---
 pom.xml |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6678f21..02b597a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ruoyi</groupId>
 	<artifactId>ruoyi</artifactId>
-	<version>3.1.0</version>
+	<version>3.2.1</version>
 	<packaging>jar</packaging>
 
 	<name>ruoyi</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.1.RELEASE</version>
+		<version>2.1.17.RELEASE</version>
 		<relativePath />
 	</parent>
 
@@ -23,10 +23,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<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.73</fastjson.version>
-		<druid.version>1.1.22</druid.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+		<mybatis.spring.boot.starter.version>2.1.3</mybatis.spring.boot.starter.version>
+		<pagehelper.spring.boot.starter.version>1.3.0</pagehelper.spring.boot.starter.version>
+		<fastjson.version>1.2.74</fastjson.version>
+		<druid.version>1.2.2</druid.version>
 		<commons.io.version>2.5</commons.io.version>
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
 		<bitwalker.version>1.19</bitwalker.version>
@@ -34,7 +35,8 @@
 		<kaptcha.version>2.3.2</kaptcha.version>
 		<swagger.version>2.9.2</swagger.version>
 		<poi.version>3.17</poi.version>
-		<oshi.version>3.9.1</oshi.version>
+		<oshi.version>5.3.6</oshi.version>
+        <jna.version>5.6.0</jna.version>
 		<velocity.version>1.7</velocity.version>
 	</properties>
 
@@ -207,16 +209,6 @@
 			<groupId>com.github.oshi</groupId>
 			<artifactId>oshi-core</artifactId>
 			<version>${oshi.version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>net.java.dev.jna</groupId>
-			<artifactId>jna</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>net.java.dev.jna</groupId>
-			<artifactId>jna-platform</artifactId>
 		</dependency>
 		
 		<!-- excel宸ュ叿 -->

--
Gitblit v1.9.3