diff --git a/pom.xml b/pom.xml index d03c5d64..dfc05b33 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 @@ -81,6 +82,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 c901e06f..190454ad 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -65,16 +65,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 7ffa538e..63b03da7 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(); diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss index 3dad4c39..e7464c66 100644 --- a/ruoyi-ui/src/assets/styles/sidebar.scss +++ b/ruoyi-ui/src/assets/styles/sidebar.scss @@ -63,6 +63,12 @@ width: 100% !important; } + .el-menu-item, .el-submenu__title { + overflow: hidden !important; + text-overflow: ellipsis !important; + white-space: nowrap !important; + } + // menu hover .submenu-title-noDropdown, .el-submenu__title {