From 47793b7c905f2bcdf8c2034d82a5415722c89a8f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 九月 2020 18:21:23 +0800
Subject: [PATCH] 升级oshi到最新版本v5.2.5
---
pom.xml | 13 ++-----------
src/main/java/com/ruoyi/framework/web/domain/Server.java | 2 +-
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index f57599d..fc4fde5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,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.2.5</oshi.version>
+ <jna.version>5.5.0</jna.version>
<velocity.version>1.7</velocity.version>
</properties>
@@ -208,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宸ュ叿 -->
diff --git a/src/main/java/com/ruoyi/framework/web/domain/Server.java b/src/main/java/com/ruoyi/framework/web/domain/Server.java
index 93e411b..30a1957 100644
--- a/src/main/java/com/ruoyi/framework/web/domain/Server.java
+++ b/src/main/java/com/ruoyi/framework/web/domain/Server.java
@@ -189,7 +189,7 @@
private void setSysFiles(OperatingSystem os)
{
FileSystem fileSystem = os.getFileSystem();
- OSFileStore[] fsArray = fileSystem.getFileStores();
+ List<OSFileStore> fsArray = fileSystem.getFileStores();
for (OSFileStore fs : fsArray)
{
long free = fs.getUsableSpace();
--
Gitblit v1.9.3