From a7833a3b722d09240ff957e7b91e057c6f51d596 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 15 五月 2021 14:34:54 +0800
Subject: [PATCH] remove 移除ruoyi自带服务监控(Admin已全部包含)
---
/dev/null | 210 ----------------------------------------------------
sql/ry_20210210.sql | 2
2 files changed, 1 insertions(+), 211 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
deleted file mode 100644
index cc805ad..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.web.controller.monitor;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.Server;
-
-/**
- * 鏈嶅姟鍣ㄧ洃鎺�
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/server")
-public class ServerController
-{
- @PreAuthorize("@ss.hasPermi('monitor:server:list')")
- @GetMapping()
- public AjaxResult getInfo() throws Exception
- {
- Server server = new Server();
- server.copyTo();
- return AjaxResult.success(server);
- }
-}
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
deleted file mode 100644
index 341d0b3..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.ruoyi.framework.web.domain;
-
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.system.*;
-import cn.hutool.system.oshi.CpuInfo;
-import cn.hutool.system.oshi.OshiUtil;
-import com.ruoyi.framework.web.domain.server.*;
-import lombok.Data;
-import oshi.hardware.GlobalMemory;
-import oshi.software.os.FileSystem;
-import oshi.software.os.OSFileStore;
-import oshi.software.os.OperatingSystem;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * 鏈嶅姟鍣ㄧ浉鍏充俊鎭�
- *
- * @author ruoyi
- */
-@Data
-public class Server {
- private static final int OSHI_WAIT_SECOND = 1000;
-
- /**
- * CPU鐩稿叧淇℃伅
- */
- private Cpu cpu = new Cpu();
-
- /**
- * 鍏у瓨鐩稿叧淇℃伅
- */
- private Mem mem = new Mem();
-
- /**
- * JVM鐩稿叧淇℃伅
- */
- private Jvm jvm = new Jvm();
-
- /**
- * 鏈嶅姟鍣ㄧ浉鍏充俊鎭�
- */
- private Sys sys = new Sys();
-
- /**
- * 纾佺洏鐩稿叧淇℃伅
- */
- private List<SysFile> sysFiles = new LinkedList<SysFile>();
-
-
- public void copyTo() {
- setCpuInfo();
- setMemInfo();
- setSysInfo();
- setJvmInfo();
- setSysFiles();
- }
-
- /**
- * 璁剧疆CPU淇℃伅
- */
- private void setCpuInfo() {
- CpuInfo cpuInfo = OshiUtil.getCpuInfo(OSHI_WAIT_SECOND);
- cpu.setCpuNum(cpuInfo.getCpuNum());
- cpu.setTotal(cpuInfo.getToTal());
- cpu.setSys(cpuInfo.getSys());
- cpu.setUsed(cpuInfo.getUsed());
- cpu.setWait(cpuInfo.getWait());
- cpu.setFree(cpuInfo.getFree());
- }
-
- /**
- * 璁剧疆鍐呭瓨淇℃伅
- */
- private void setMemInfo() {
- GlobalMemory memory = OshiUtil.getMemory();
- mem.setTotal(memory.getTotal());
- mem.setUsed(memory.getTotal() - memory.getAvailable());
- mem.setFree(memory.getAvailable());
- }
-
- /**
- * 璁剧疆鏈嶅姟鍣ㄤ俊鎭�
- */
- private void setSysInfo() {
- HostInfo hostInfo = SystemUtil.getHostInfo();
- OsInfo osInfo = SystemUtil.getOsInfo();
- UserInfo userInfo = SystemUtil.getUserInfo();
- sys.setComputerName(hostInfo.getName());
- sys.setComputerIp(hostInfo.getAddress());
- sys.setOsName(osInfo.getName());
- sys.setOsArch(osInfo.getArch());
- sys.setUserDir(userInfo.getCurrentDir());
- }
-
- /**
- * 璁剧疆Java铏氭嫙鏈�
- */
- private void setJvmInfo() {
- JavaInfo javaInfo = SystemUtil.getJavaInfo();
- RuntimeInfo runtimeInfo = SystemUtil.getRuntimeInfo();
- JavaRuntimeInfo javaRuntimeInfo = SystemUtil.getJavaRuntimeInfo();
- jvm.setTotal(runtimeInfo.getTotalMemory());
- jvm.setMax(runtimeInfo.getMaxMemory());
- jvm.setFree(runtimeInfo.getFreeMemory());
- jvm.setVersion(javaInfo.getVersion());
- jvm.setHome(javaRuntimeInfo.getHomeDir());
- }
-
- /**
- * 璁剧疆纾佺洏淇℃伅
- */
- private void setSysFiles() {
- OperatingSystem os = OshiUtil.getOs();
- FileSystem fileSystem = os.getFileSystem();
- List<OSFileStore> fsArray = fileSystem.getFileStores();
- for (OSFileStore fs : fsArray) {
- long free = fs.getUsableSpace();
- long total = fs.getTotalSpace();
- long used = total - free;
- SysFile sysFile = new SysFile();
- sysFile.setDirName(fs.getMount());
- sysFile.setSysTypeName(fs.getType());
- sysFile.setTypeName(fs.getName());
- sysFile.setTotal(convertFileSize(total));
- sysFile.setFree(convertFileSize(free));
- sysFile.setUsed(convertFileSize(used));
- sysFile.setUsage(NumberUtil.mul(NumberUtil.div(used, total, 4), 100));
- sysFiles.add(sysFile);
- }
- }
-
- /**
- * 瀛楄妭杞崲
- *
- * @param size 瀛楄妭澶у皬
- * @return 杞崲鍚庡��
- */
- public String convertFileSize(long size) {
- long kb = 1024;
- long mb = kb * 1024;
- long gb = mb * 1024;
- if (size >= gb) {
- return String.format("%.1f GB", (float) size / gb);
- } else if (size >= mb) {
- float f = (float) size / mb;
- return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
- } else if (size >= kb) {
- float f = (float) size / kb;
- return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
- } else {
- return String.format("%d B", size);
- }
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java
deleted file mode 100644
index 4295f6e..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-import cn.hutool.core.util.NumberUtil;
-
-/**
- * CPU鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Cpu {
- /**
- * 鏍稿績鏁�
- */
- private int cpuNum;
-
- /**
- * CPU鎬荤殑浣跨敤鐜�
- */
- private double total;
-
- /**
- * CPU绯荤粺浣跨敤鐜�
- */
- private double sys;
-
- /**
- * CPU鐢ㄦ埛浣跨敤鐜�
- */
- private double used;
-
- /**
- * CPU褰撳墠绛夊緟鐜�
- */
- private double wait;
-
- /**
- * CPU褰撳墠绌洪棽鐜�
- */
- private double free;
-
- public int getCpuNum() {
- return cpuNum;
- }
-
- public void setCpuNum(int cpuNum) {
- this.cpuNum = cpuNum;
- }
-
- public double getTotal() {
- return NumberUtil.round(NumberUtil.mul(total, 100), 2).doubleValue();
- }
-
- public void setTotal(double total) {
- this.total = total;
- }
-
- public double getSys() {
- return NumberUtil.round(NumberUtil.mul(sys / total, 100), 2).doubleValue();
- }
-
- public void setSys(double sys) {
- this.sys = sys;
- }
-
- public double getUsed() {
- return NumberUtil.round(NumberUtil.mul(used / total, 100), 2).doubleValue();
- }
-
- public void setUsed(double used) {
- this.used = used;
- }
-
- public double getWait() {
- return NumberUtil.round(NumberUtil.mul(wait / total, 100), 2).doubleValue();
- }
-
- public void setWait(double wait) {
- this.wait = wait;
- }
-
- public double getFree() {
- return NumberUtil.round(NumberUtil.mul(free / total, 100), 2).doubleValue();
- }
-
- public void setFree(double free) {
- this.free = free;
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
deleted file mode 100644
index 4b70cbb..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-import java.lang.management.ManagementFactory;
-import java.util.Date;
-
-import cn.hutool.core.date.BetweenFormatter;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
-import com.ruoyi.common.utils.DateUtils;
-
-/**
- * JVM鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Jvm {
- /**
- * 褰撳墠JVM鍗犵敤鐨勫唴瀛樻�绘暟(M)
- */
- private double total;
-
- /**
- * JVM鏈�澶у彲鐢ㄥ唴瀛樻�绘暟(M)
- */
- private double max;
-
- /**
- * JVM绌洪棽鍐呭瓨(M)
- */
- private double free;
-
- /**
- * JDK鐗堟湰
- */
- private String version;
-
- /**
- * JDK璺緞
- */
- private String home;
-
- public double getTotal() {
- return NumberUtil.div(total, (1024 * 1024), 2);
- }
-
- public void setTotal(double total) {
- this.total = total;
- }
-
- public double getMax() {
- return NumberUtil.div(max, (1024 * 1024), 2);
- }
-
- public void setMax(double max) {
- this.max = max;
- }
-
- public double getFree() {
- return NumberUtil.div(free, (1024 * 1024), 2);
- }
-
- public void setFree(double free) {
- this.free = free;
- }
-
- public double getUsed() {
- return NumberUtil.div(total - free, (1024 * 1024), 2);
- }
-
- public double getUsage() {
- return NumberUtil.mul(NumberUtil.div(total - free, total, 4), 100);
- }
-
- /**
- * 鑾峰彇JDK鍚嶇О
- */
- public String getName() {
- return ManagementFactory.getRuntimeMXBean().getVmName();
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getHome() {
- return home;
- }
-
- public void setHome(String home) {
- this.home = home;
- }
-
- /**
- * JDK鍚姩鏃堕棿
- */
- public String getStartTime()
- {
- return DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.getServerStartDate());
- }
-
- /**
- * JDK杩愯鏃堕棿
- */
- public String getRunTime()
- {
- return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate());
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java
deleted file mode 100644
index 757ff57..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-import cn.hutool.core.util.NumberUtil;
-
-/**
- * 鍏у瓨鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Mem
-{
- /**
- * 鍐呭瓨鎬婚噺
- */
- private double total;
-
- /**
- * 宸茬敤鍐呭瓨
- */
- private double used;
-
- /**
- * 鍓╀綑鍐呭瓨
- */
- private double free;
-
- public double getTotal()
- {
- return NumberUtil.div(total, (1024 * 1024 * 1024), 2);
- }
-
- public void setTotal(long total)
- {
- this.total = total;
- }
-
- public double getUsed()
- {
- return NumberUtil.div(used, (1024 * 1024 * 1024), 2);
- }
-
- public void setUsed(long used)
- {
- this.used = used;
- }
-
- public double getFree()
- {
- return NumberUtil.div(free, (1024 * 1024 * 1024), 2);
- }
-
- public void setFree(long free)
- {
- this.free = free;
- }
-
- public double getUsage()
- {
- return NumberUtil.mul(NumberUtil.div(used, total, 4), 100);
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java
deleted file mode 100644
index 45d64d9..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-/**
- * 绯荤粺鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Sys
-{
- /**
- * 鏈嶅姟鍣ㄥ悕绉�
- */
- private String computerName;
-
- /**
- * 鏈嶅姟鍣↖p
- */
- private String computerIp;
-
- /**
- * 椤圭洰璺緞
- */
- private String userDir;
-
- /**
- * 鎿嶄綔绯荤粺
- */
- private String osName;
-
- /**
- * 绯荤粺鏋舵瀯
- */
- private String osArch;
-
- public String getComputerName()
- {
- return computerName;
- }
-
- public void setComputerName(String computerName)
- {
- this.computerName = computerName;
- }
-
- public String getComputerIp()
- {
- return computerIp;
- }
-
- public void setComputerIp(String computerIp)
- {
- this.computerIp = computerIp;
- }
-
- public String getUserDir()
- {
- return userDir;
- }
-
- public void setUserDir(String userDir)
- {
- this.userDir = userDir;
- }
-
- public String getOsName()
- {
- return osName;
- }
-
- public void setOsName(String osName)
- {
- this.osName = osName;
- }
-
- public String getOsArch()
- {
- return osArch;
- }
-
- public void setOsArch(String osArch)
- {
- this.osArch = osArch;
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java
deleted file mode 100644
index 1320cde..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-/**
- * 绯荤粺鏂囦欢鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class SysFile
-{
- /**
- * 鐩樼璺緞
- */
- private String dirName;
-
- /**
- * 鐩樼绫诲瀷
- */
- private String sysTypeName;
-
- /**
- * 鏂囦欢绫诲瀷
- */
- private String typeName;
-
- /**
- * 鎬诲ぇ灏�
- */
- private String total;
-
- /**
- * 鍓╀綑澶у皬
- */
- private String free;
-
- /**
- * 宸茬粡浣跨敤閲�
- */
- private String used;
-
- /**
- * 璧勬簮鐨勪娇鐢ㄧ巼
- */
- private double usage;
-
- public String getDirName()
- {
- return dirName;
- }
-
- public void setDirName(String dirName)
- {
- this.dirName = dirName;
- }
-
- public String getSysTypeName()
- {
- return sysTypeName;
- }
-
- public void setSysTypeName(String sysTypeName)
- {
- this.sysTypeName = sysTypeName;
- }
-
- public String getTypeName()
- {
- return typeName;
- }
-
- public void setTypeName(String typeName)
- {
- this.typeName = typeName;
- }
-
- public String getTotal()
- {
- return total;
- }
-
- public void setTotal(String total)
- {
- this.total = total;
- }
-
- public String getFree()
- {
- return free;
- }
-
- public void setFree(String free)
- {
- this.free = free;
- }
-
- public String getUsed()
- {
- return used;
- }
-
- public void setUsed(String used)
- {
- this.used = used;
- }
-
- public double getUsage()
- {
- return usage;
- }
-
- public void setUsage(double usage)
- {
- this.usage = usage;
- }
-}
diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/ruoyi-ui/src/views/monitor/server/index.vue
deleted file mode 100644
index 8ba3082..0000000
--- a/ruoyi-ui/src/views/monitor/server/index.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
- <div class="app-container">
- <el-row>
- <el-col :span="12" class="card-box">
- <el-card>
- <div slot="header"><span>CPU</span></div>
- <div class="el-table el-table--enable-row-hover el-table--medium">
- <table cellspacing="0" style="width: 100%;">
- <thead>
- <tr>
- <th class="is-leaf"><div class="cell">灞炴��</div></th>
- <th class="is-leaf"><div class="cell">鍊�</div></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><div class="cell">鏍稿績鏁�</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.cpuNum }}</div></td>
- </tr>
- <tr>
- <td><div class="cell">鐢ㄦ埛浣跨敤鐜�</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.used }}%</div></td>
- </tr>
- <tr>
- <td><div class="cell">绯荤粺浣跨敤鐜�</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.sys }}%</div></td>
- </tr>
- <tr>
- <td><div class="cell">褰撳墠绌洪棽鐜�</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.free }}%</div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </el-card>
- </el-col>
-
- <el-col :span="12" class="card-box">
- <el-card>
- <div slot="header"><span>鍐呭瓨</span></div>
- <div class="el-table el-table--enable-row-hover el-table--medium">
- <table cellspacing="0" style="width: 100%;">
- <thead>
- <tr>
- <th class="is-leaf"><div class="cell">灞炴��</div></th>
- <th class="is-leaf"><div class="cell">鍐呭瓨</div></th>
- <th class="is-leaf"><div class="cell">JVM</div></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><div class="cell">鎬诲唴瀛�</div></td>
- <td><div class="cell" v-if="server.mem">{{ server.mem.total }}G</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</div></td>
- </tr>
- <tr>
- <td><div class="cell">宸茬敤鍐呭瓨</div></td>
- <td><div class="cell" v-if="server.mem">{{ server.mem.used}}G</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</div></td>
- </tr>
- <tr>
- <td><div class="cell">鍓╀綑鍐呭瓨</div></td>
- <td><div class="cell" v-if="server.mem">{{ server.mem.free }}G</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</div></td>
- </tr>
- <tr>
- <td><div class="cell">浣跨敤鐜�</div></td>
- <td><div class="cell" v-if="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>
- <td><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </el-card>
- </el-col>
-
- <el-col :span="24" class="card-box">
- <el-card>
- <div slot="header">
- <span>鏈嶅姟鍣ㄤ俊鎭�</span>
- </div>
- <div class="el-table el-table--enable-row-hover el-table--medium">
- <table cellspacing="0" style="width: 100%;">
- <tbody>
- <tr>
- <td><div class="cell">鏈嶅姟鍣ㄥ悕绉�</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.computerName }}</div></td>
- <td><div class="cell">鎿嶄綔绯荤粺</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.osName }}</div></td>
- </tr>
- <tr>
- <td><div class="cell">鏈嶅姟鍣↖P</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</div></td>
- <td><div class="cell">绯荤粺鏋舵瀯</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.osArch }}</div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </el-card>
- </el-col>
-
- <el-col :span="24" class="card-box">
- <el-card>
- <div slot="header">
- <span>Java铏氭嫙鏈轰俊鎭�</span>
- </div>
- <div class="el-table el-table--enable-row-hover el-table--medium">
- <table cellspacing="0" style="width: 100%;">
- <tbody>
- <tr>
- <td><div class="cell">Java鍚嶇О</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>
- <td><div class="cell">Java鐗堟湰</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>
- </tr>
- <tr>
- <td><div class="cell">鍚姩鏃堕棿</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.startTime }}</div></td>
- <td><div class="cell">杩愯鏃堕暱</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.runTime }}</div></td>
- </tr>
- <tr>
- <td colspan="1"><div class="cell">瀹夎璺緞</div></td>
- <td colspan="3"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>
- </tr>
- <tr>
- <td colspan="1"><div class="cell">椤圭洰璺緞</div></td>
- <td colspan="3"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </el-card>
- </el-col>
-
- <el-col :span="24" class="card-box">
- <el-card>
- <div slot="header">
- <span>纾佺洏鐘舵��</span>
- </div>
- <div class="el-table el-table--enable-row-hover el-table--medium">
- <table cellspacing="0" style="width: 100%;">
- <thead>
- <tr>
- <th class="is-leaf"><div class="cell">鐩樼璺緞</div></th>
- <th class="is-leaf"><div class="cell">鏂囦欢绯荤粺</div></th>
- <th class="is-leaf"><div class="cell">鐩樼绫诲瀷</div></th>
- <th class="is-leaf"><div class="cell">鎬诲ぇ灏�</div></th>
- <th class="is-leaf"><div class="cell">鍙敤澶у皬</div></th>
- <th class="is-leaf"><div class="cell">宸茬敤澶у皬</div></th>
- <th class="is-leaf"><div class="cell">宸茬敤鐧惧垎姣�</div></th>
- </tr>
- </thead>
- <tbody v-if="server.sysFiles">
- <tr v-for="sysFile in server.sysFiles">
- <td><div class="cell">{{ sysFile.dirName }}</div></td>
- <td><div class="cell">{{ sysFile.sysTypeName }}</div></td>
- <td><div class="cell">{{ sysFile.typeName }}</div></td>
- <td><div class="cell">{{ sysFile.total }}</div></td>
- <td><div class="cell">{{ sysFile.free }}</div></td>
- <td><div class="cell">{{ sysFile.used }}</div></td>
- <td><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </el-card>
- </el-col>
- </el-row>
- </div>
-</template>
-
-<script>
-import { getServer } from "@/api/monitor/server";
-
-export default {
- name: "Server",
- data() {
- return {
- // 鍔犺浇灞備俊鎭�
- loading: [],
- // 鏈嶅姟鍣ㄤ俊鎭�
- server: []
- };
- },
- created() {
- this.getList();
- this.openLoading();
- },
- methods: {
- /** 鏌ヨ鏈嶅姟鍣ㄤ俊鎭� */
- getList() {
- getServer().then(response => {
- this.server = response.data;
- this.loading.close();
- });
- },
- // 鎵撳紑鍔犺浇灞�
- openLoading() {
- this.loading = this.$loading({
- lock: true,
- text: "鎷煎懡璇诲彇涓�",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
- }
- }
-};
-</script>
\ No newline at end of file
diff --git a/sql/ry_20210210.sql b/sql/ry_20210210.sql
index 8b721ab..1d8ec36 100644
--- a/sql/ry_20210210.sql
+++ b/sql/ry_20210210.sql
@@ -173,7 +173,7 @@
insert into sys_menu values('109', '鍦ㄧ嚎鐢ㄦ埛', '2', '1', 'online', 'monitor/online/index', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '鍦ㄧ嚎鐢ㄦ埛鑿滃崟');
insert into sys_menu values('110', '瀹氭椂浠诲姟', '2', '2', 'job', 'monitor/job/index', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '瀹氭椂浠诲姟鑿滃崟');
insert into sys_menu values('111', '鏁版嵁鐩戞帶', '2', '3', 'druid', 'monitor/druid/index', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', sysdate(), '', null, '鏁版嵁鐩戞帶鑿滃崟');
-insert into sys_menu values('112', '鏈嶅姟鐩戞帶', '2', '4', 'server', 'monitor/server/index', 1, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '鏈嶅姟鐩戞帶鑿滃崟');
+# insert into sys_menu values('112', '鏈嶅姟鐩戞帶', '2', '4', 'server', 'monitor/server/index', 1, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '鏈嶅姟鐩戞帶鑿滃崟');
insert into sys_menu values('113', '缂撳瓨鐩戞帶', '2', '5', 'cache', 'monitor/cache/index', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', sysdate(), '', null, '缂撳瓨鐩戞帶鑿滃崟');
insert into sys_menu values('114', '琛ㄥ崟鏋勫缓', '3', '1', 'build', 'tool/build/index', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate(), '', null, '琛ㄥ崟鏋勫缓鑿滃崟');
insert into sys_menu values('115', '浠g爜鐢熸垚', '3', '2', 'gen', 'tool/gen/index', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate(), '', null, '浠g爜鐢熸垚鑿滃崟');
--
Gitblit v1.9.3