github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

升级oshi到最新版本6.1.6

pull/297/MERGE
RuoYi 2022-05-11 09:55:07 +08:00
parent ef1cf982e3
commit 5142e2d668
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pom.xml
View File

@ -26,8 +26,7 @@
<mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version> <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
<pagehelper.boot.version>1.4.1</pagehelper.boot.version> <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
<fastjson.version>1.2.80</fastjson.version> <fastjson.version>1.2.80</fastjson.version>
<oshi.version>6.1.2</oshi.version> <oshi.version>6.1.6</oshi.version>
<jna.version>5.10.0</jna.version>
<commons.io.version>2.11.0</commons.io.version> <commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version> <commons.fileupload.version>1.4</commons.fileupload.version>
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
@ -117,18 +116,6 @@
<version>${oshi.version}</version> <version>${oshi.version}</version>
</dependency> </dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>${jna.version}</version>
</dependency>
<!-- Swagger3依赖 --> <!-- Swagger3依赖 -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>

2
ruoyi-admin/src/main/resources/templates/monitor/server/server.html
View File

@ -152,7 +152,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<table class="table table-hover margin bottom"> <table class="table table-hover margin bottom" style="table-layout:fixed;">
<tbody> <tbody>
<tr> <tr>
<td>Java名称</td> <td>Java名称</td>

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -176,7 +176,7 @@ public class SysDeptServiceImpl implements ISysDeptService
public boolean checkDeptExistUser(Long deptId) public boolean checkDeptExistUser(Long deptId)
{ {
int result = deptMapper.checkDeptExistUser(deptId); int result = deptMapper.checkDeptExistUser(deptId);
return result > 0 ? true : false; return result > 0;
} }
/** /**