From 5693bbe1f5c3f6e4b247a767326bcdd84f7f3995 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 11 五月 2022 09:58:25 +0800
Subject: [PATCH] 升级oshi到最新版本6.1.6
---
pom.xml | 15 +--------------
ruoyi-ui/src/views/monitor/server/index.vue | 2 +-
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 65abb93..6260529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,7 @@
<mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
<pagehelper.boot.version>1.4.1</pagehelper.boot.version>
<fastjson.version>1.2.80</fastjson.version>
- <oshi.version>6.1.2</oshi.version>
- <jna.version>5.10.0</jna.version>
+ <oshi.version>6.1.6</oshi.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.collections.version>3.2.2</commons.collections.version>
@@ -81,18 +80,6 @@
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
- </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渚濊禆 -->
diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/ruoyi-ui/src/views/monitor/server/index.vue
index 4b16f0d..15e2e38 100644
--- a/ruoyi-ui/src/views/monitor/server/index.vue
+++ b/ruoyi-ui/src/views/monitor/server/index.vue
@@ -106,7 +106,7 @@
<span>Java铏氭嫙鏈轰俊鎭�</span>
</div>
<div class="el-table el-table--enable-row-hover el-table--medium">
- <table cellspacing="0" style="width: 100%;">
+ <table cellspacing="0" style="width: 100%;table-layout:fixed;">
<tbody>
<tr>
<td class="el-table__cell is-leaf"><div class="cell">Java鍚嶇О</div></td>
--
Gitblit v1.9.3