diff --git a/pom.xml b/pom.xml index fb414282..1c494a23 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,8 @@ <swagger.version>2.9.2</swagger.version> <pagehelper.boot.version>1.2.5</pagehelper.boot.version> <fastjson.version>1.2.73</fastjson.version> - <oshi.version>3.9.1</oshi.version> + <oshi.version>5.2.5</oshi.version> + <jna.version>5.5.0</jna.version> <commons.io.version>2.5</commons.io.version> <commons.fileupload.version>1.3.3</commons.fileupload.version> <poi.version>3.17</poi.version> @@ -109,6 +110,16 @@ <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> + <!-- swagger2--> <dependency> <groupId>io.springfox</groupId> diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 0f5a6c0e..030c8d6b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.system; import java.util.List; - import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 498eb87b..0ec95b51 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -71,16 +71,6 @@ <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> - <!-- 系统模块--> <dependency> <groupId>com.ruoyi</groupId> 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 26aed47d..e7312f05 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 @@ -190,7 +190,7 @@ public class Server 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();