diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js index 6099975..6dfbe55 100644 --- a/taoyao-client-web/src/components/Taoyao.js +++ b/taoyao-client-web/src/components/Taoyao.js @@ -3237,7 +3237,7 @@ class Taoyao extends RemoteClient { /** * 重启系统信令 * - * @returns 重启系统 + * @returns 重启系统结果 */ async systemReboot() { return await this.request(protocol.buildMessage("system::reboot", {})); @@ -3246,7 +3246,7 @@ class Taoyao extends RemoteClient { /** * 关闭系统信令 * - * @returns 关闭系统 + * @returns 关闭系统结果 */ async systemShutdown() { return await this.request(protocol.buildMessage("system::shutdown", {})); diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemInfoProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemInfoProtocol.java index 0a961a8..42a86cd 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemInfoProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemInfoProtocol.java @@ -61,7 +61,6 @@ public class SystemInfoProtocol extends ProtocolClientAdapter { final Map info = new HashMap<>(); // 硬盘 final List diskspace = new ArrayList<>(); -// File.listRoots(); // FileSystems.getDefault().getFileStores(); Stream.of(File.listRoots()).forEach(v -> { diskspace.add(new Diskspace(v.getPath(), v.getFreeSpace(), v.getTotalSpace())); @@ -69,18 +68,18 @@ public class SystemInfoProtocol extends ProtocolClientAdapter { info.put("diskspace", diskspace); // 内存 final Runtime runtime = Runtime.getRuntime(); - info.put("maxMemory", runtime.maxMemory()); - info.put("freeMemory", runtime.freeMemory()); + info.put("maxMemory", runtime.maxMemory()); + info.put("freeMemory", runtime.freeMemory()); info.put("totalMemory", runtime.totalMemory()); - info.put("maxMemoryGracefully", FileUtils.formatSize(runtime.maxMemory())); - info.put("freeMemoryGracefully", FileUtils.formatSize(runtime.freeMemory())); + info.put("maxMemoryGracefully", FileUtils.formatSize(runtime.maxMemory())); + info.put("freeMemoryGracefully", FileUtils.formatSize(runtime.freeMemory())); info.put("totalMemoryGracefully", FileUtils.formatSize(runtime.totalMemory())); // 其他 info.put("osArch", System.getProperty("os.arch")); info.put("osName", System.getProperty("os.name")); - info.put("osVersion", System.getProperty("os.version")); - info.put("javaVmName", System.getProperty("java.vm.name")); - info.put("javaVersion", System.getProperty("java.version")); + info.put("osVersion", System.getProperty("os.version")); + info.put("javaVmName", System.getProperty("java.vm.name")); + info.put("javaVersion", System.getProperty("java.version")); info.put("cpuProcessors", runtime.availableProcessors()); // 响应 message.setBody(info); diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemRebootProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemRebootProtocol.java index 61ae453..34b78ed 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemRebootProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemRebootProtocol.java @@ -19,9 +19,9 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @Description( + memo = "重启系统", flow = { "信令服务+)终端", - "终端->信令服务+)终端", "终端=>信令服务+)终端" } )