Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
a82a3d94
Commit
a82a3d94
authored
Sep 22, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级oshi到最新版本v5.2.5
parent
28bceda6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
pom.xml
pom.xml
+12
-1
ruoyi-framework/pom.xml
ruoyi-framework/pom.xml
+0
-10
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
.../src/main/java/com/ruoyi/framework/web/domain/Server.java
+1
-1
No files found.
pom.xml
View file @
a82a3d94
...
...
@@ -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>
...
...
@@ -74,6 +75,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>
...
...
ruoyi-framework/pom.xml
View file @
a82a3d94
...
...
@@ -53,16 +53,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>
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
View file @
a82a3d94
...
...
@@ -189,7 +189,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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment