From 5354ecf64d26910ff2f24e8259a39bfd5d8fe642 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 14 Apr 2021 18:54:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.3=E3=80=91=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../README.md | 0 .../pom.xml | 16 ++++- .../system/SystemHardwareCalculator.java | 0 .../controller/MonitorStatusController.java | 62 +++++++++++++++++++ .../holder/SystemHardwareInfoHolder.java | 0 .../monitor-spring-boot-starter/pom.xml | 2 +- kernel-o-monitor/pom.xml | 2 +- 7 files changed, 79 insertions(+), 3 deletions(-) rename kernel-o-monitor/{monitor-sdk-system-info => monitor-business-system-info}/README.md (100%) rename kernel-o-monitor/{monitor-sdk-system-info => monitor-business-system-info}/pom.xml (70%) rename kernel-o-monitor/{monitor-sdk-system-info => monitor-business-system-info}/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java (100%) create mode 100644 kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/controller/MonitorStatusController.java rename kernel-o-monitor/{monitor-sdk-system-info => monitor-business-system-info}/src/main/java/cn/stylefeng/roses/kernel/monitor/system/holder/SystemHardwareInfoHolder.java (100%) diff --git a/kernel-o-monitor/monitor-sdk-system-info/README.md b/kernel-o-monitor/monitor-business-system-info/README.md similarity index 100% rename from kernel-o-monitor/monitor-sdk-system-info/README.md rename to kernel-o-monitor/monitor-business-system-info/README.md diff --git a/kernel-o-monitor/monitor-sdk-system-info/pom.xml b/kernel-o-monitor/monitor-business-system-info/pom.xml similarity index 70% rename from kernel-o-monitor/monitor-sdk-system-info/pom.xml rename to kernel-o-monitor/monitor-business-system-info/pom.xml index 0c526b108..a6656caad 100644 --- a/kernel-o-monitor/monitor-sdk-system-info/pom.xml +++ b/kernel-o-monitor/monitor-business-system-info/pom.xml @@ -11,7 +11,7 @@ ../pom.xml - monitor-sdk-system-info + monitor-business-system-info jar @@ -38,6 +38,20 @@ ${oshi.version} + + + + cn.stylefeng.roses + scanner-api + 7.0.3 + + + + + org.springframework.boot + spring-boot-starter-web + + diff --git a/kernel-o-monitor/monitor-sdk-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java b/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java similarity index 100% rename from kernel-o-monitor/monitor-sdk-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java rename to kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java diff --git a/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/controller/MonitorStatusController.java b/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/controller/MonitorStatusController.java new file mode 100644 index 000000000..94e37d720 --- /dev/null +++ b/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/controller/MonitorStatusController.java @@ -0,0 +1,62 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.monitor.system.controller; + +import cn.stylefeng.roses.kernel.monitor.system.SystemHardwareCalculator; +import cn.stylefeng.roses.kernel.monitor.system.holder.SystemHardwareInfoHolder; +import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; +import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; +import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; +import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 系统监控控制器 + * + * @author fengshuonan + * @date 2021/4/14 18:44 + */ +@RestController +@ApiResource(name = "监控的控制器") +public class MonitorStatusController { + + @Resource + private SystemHardwareInfoHolder systemHardwareInfoHolder; + + /** + * 将应用设为默认应用，用户进入系统会默认进这个应用的菜单 + * + * @author fengshuonan + * @date 2020/6/29 16:49 + */ + @GetResource(name = "获取系统信息", path = "/getSystemInfo") + public ResponseData getSystemInfo() { + SystemHardwareCalculator systemHardwareInfo = systemHardwareInfoHolder.getSystemHardwareInfo(); + return new SuccessResponseData(systemHardwareInfo); + } + +} diff --git a/kernel-o-monitor/monitor-sdk-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/holder/SystemHardwareInfoHolder.java b/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/holder/SystemHardwareInfoHolder.java similarity index 100% rename from kernel-o-monitor/monitor-sdk-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/holder/SystemHardwareInfoHolder.java rename to kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/holder/SystemHardwareInfoHolder.java diff --git a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml index e31c9c952..9cbe1f266 100644 --- a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml +++ b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ cn.stylefeng.roses - monitor-sdk-system-info + monitor-business-system-info 7.0.3 diff --git a/kernel-o-monitor/pom.xml b/kernel-o-monitor/pom.xml index d5175c1ea..912f9bb5a 100644 --- a/kernel-o-monitor/pom.xml +++ b/kernel-o-monitor/pom.xml @@ -18,7 +18,7 @@ monitor-api monitor-integration-beetl - monitor-sdk-system-info + monitor-business-system-info monitor-spring-boot-starter monitor-sdk-prometheus