From 5744162c6d24e5c4225cc40f02c59b53aceb3219 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 11 六月 2021 10:29:30 +0800
Subject: [PATCH] 升级oshi到最新版本v5.7.4

---
 pom.xml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c07c413..499f796 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,8 @@
 		<kaptcha.version>2.3.2</kaptcha.version>
 		<swagger.version>3.0.0</swagger.version>
 		<poi.version>4.1.2</poi.version>
-		<oshi.version>5.6.0</oshi.version>
-        <jna.version>5.7.0</jna.version>
+		<oshi.version>5.7.4</oshi.version>
+        <jna.version>5.8.0</jna.version>
 		<velocity.version>1.7</velocity.version>
 	</properties>
 
@@ -172,11 +172,13 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
-            <exclusion>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-            </exclusion>
+            <version>${swagger.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
         <!-- 闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎3.0.0涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.6.2鐗堟湰 -->

--
Gitblit v1.9.3