From 6101a3bf0d3f7e8de375a0b9bfa7ce71a111144c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 25 九月 2020 11:15:57 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-framework/pom.xml | 10 ----------
ruoyi-ui/src/assets/styles/sidebar.scss | 6 ++++++
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java | 2 +-
pom.xml | 13 ++++++++++++-
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index d03c5d6..dfc05b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,8 @@
<kaptcha.version>2.3.2</kaptcha.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>
@@ -81,6 +82,16 @@
<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>
<!-- swagger2-->
<dependency>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index c901e06..190454a 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -65,16 +65,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 7ffa538..63b03da 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 @@
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();
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
index 3dad4c3..e7464c6 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 {
--
Gitblit v1.9.3