From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 八月 2024 11:36:41 +0800 Subject: [PATCH] 1、完善代码和application.yml配置文件,去掉不用的引入文件; 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断; 3、凡是有Server的应用,加载资源方式改为用springboot的工具类加载; 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2,以实现可以在jar包情况下能够扫描类(.class)注解。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java index 9a9f330..44a85ec 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/MwInfoVo.java @@ -1,6 +1,9 @@ package com.dy.rtuMw.server.local.localProtocol; +import com.dy.common.util.*; import lombok.Data; + +import java.util.LinkedList; /** * @Author: liurunyu @@ -28,6 +31,10 @@ public Integer taskTreePoolTotalInstance = 0 ;//浠诲姟鏍戞睜浠诲姟瀹炰緥鎬绘暟 + public SysJvmUtil.JvmInfoVo jvmInfoVo ; + public SysMemoryUtil.MemInfoVo memInfoVo ; + public SysSysUtil.SysInfoVo sysInfoVo ; + public String toString(){ StringBuilder sb = new StringBuilder() ; sb.append("閫氫俊涓棿浠惰繍琛屼俊鎭�:\n"); @@ -45,6 +52,15 @@ sb.append(" 闀跨嚎绋嬫睜閰嶇疆鏈�澶х嚎绋嬫暟锛�" + longMaxThread + "\n"); sb.append(" 闀跨嚎绋嬫睜閰嶇疆鏈�灏忕嚎绋嬫暟锛�" + longMinThread + "\n"); sb.append(" 浠诲姟鏍戞睜浠诲姟瀹炰緥鎬绘暟锛�" + taskTreePoolTotalInstance + "\n"); + if(jvmInfoVo != null){ + sb.append(jvmInfoVo.toString()) ; + } + if(memInfoVo != null){ + sb.append(memInfoVo.toString()) ; + } + if(sysInfoVo != null){ + sb.append(sysInfoVo.toString()) ; + } sb.append("\n"); return sb.toString() ; -- Gitblit v1.8.0