diff --git a/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java b/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java index 1e75d4a4..9e6802bb 100644 --- a/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java +++ b/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java @@ -96,6 +96,7 @@ public class hostJob { serverInfo.setHostname(info.getHostname()); serverInfo.setIpAddress(info.getIpAddress()); serverInfo.setCpuModel(info.getCpuModel()); + serverInfo.setMemoryTotal(info.getMemoryTotal()); serverInfo.setCpuUsage(cpuInfo.getCpuUsage()); serverInfo.setMemoryUsage(cpuInfo.getMemoryUsage()); serverInfo.setLastOnlineTime(new Date()); diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index bc131f64..da1ccdeb 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -57,7 +57,7 @@ jdbc: # Mysql 数据库配置 type: mysql driver: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.31.189:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + url: jdbc:mysql://crontab.club:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true username: dream password: info_dream testSql: SELECT 1