From a82a3d94651646c52e10e2aad9651e3b7877f230 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 22 Sep 2020 18:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7oshi=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=ACv5.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 13 ++++++++++++- ruoyi-framework/pom.xml | 10 ---------- .../java/com/ruoyi/framework/web/domain/Server.java | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 03819415..6eece91c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,8 @@ 2.3.2 1.2.5 1.2.73 - 3.9.1 + 5.2.5 + 5.5.0 2.5 1.3.3 3.17 @@ -73,6 +74,16 @@ oshi-core ${oshi.version} + + + net.java.dev.jna + jna + + + + net.java.dev.jna + jna-platform + diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index ebf48830..6cb3c707 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -53,16 +53,6 @@ oshi-core - - net.java.dev.jna - jna - - - - net.java.dev.jna - jna-platform - - com.ruoyi diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java index 93e411bb..30a1957e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java @@ -189,7 +189,7 @@ public class Server private void setSysFiles(OperatingSystem os) { FileSystem fileSystem = os.getFileSystem(); - OSFileStore[] fsArray = fileSystem.getFileStores(); + List fsArray = fileSystem.getFileStores(); for (OSFileStore fs : fsArray) { long free = fs.getUsableSpace();