diff --git a/src/api/actuator.js b/src/api/actuator.js index 4c42bfee..e3498d38 100644 --- a/src/api/actuator.js +++ b/src/api/actuator.js @@ -18,4 +18,67 @@ actuatorApi.env = () => { }) } +actuatorApi.getSystemCpuCount = () => { + return service({ + url: `${baseUrl}/metrics/system.cpu.count`, + method: 'get' + }) +} + +actuatorApi.getSystemCpuUsage = () => { + return service({ + url: `${baseUrl}/metrics/system.cpu.usage`, + method: 'get' + }) +} + +actuatorApi.getProcessUptime = () => { + return service({ + url: `${baseUrl}/metrics/process.uptime`, + method: 'get' + }) +} + +actuatorApi.getProcessStartTime = () => { + return service({ + url: `${baseUrl}/metrics/process.start.time`, + method: 'get' + }) +} + +actuatorApi.getProcessCpuUsage = () => { + return service({ + url: `${baseUrl}/metrics/process.cpu.usage`, + method: 'get' + }) +} + +actuatorApi.getJvmMemoryMax = () => { + return service({ + url: `${baseUrl}/metrics/jvm.memory.max`, + method: 'get' + }) +} + +actuatorApi.getJvmMemoryCommitted = () => { + return service({ + url: `${baseUrl}/metrics/jvm.memory.committed`, + method: 'get' + }) +} + +actuatorApi.getJvmMemoryUsed = () => { + return service({ + url: `${baseUrl}/metrics/jvm.memory.used`, + method: 'get' + }) +} + +actuatorApi.getJvmGcPause = () => { + return service({ + url: `${baseUrl}/metrics/jvm.gc.pause`, + method: 'get' + }) +} + export default actuatorApi diff --git a/src/api/admin.js b/src/api/admin.js index 9eaf7e41..c423ef09 100644 --- a/src/api/admin.js +++ b/src/api/admin.js @@ -106,4 +106,14 @@ adminApi.restartApplication = () => { }) } +adminApi.getLogFiles = lines => { + return service({ + url: `${baseUrl}/halo/logfile`, + params: { + lines: lines + }, + method: 'get' + }) +} + export default adminApi diff --git a/src/views/sheet/internal/LinkList.vue b/src/views/sheet/internal/LinkList.vue index d3c807c3..646b1433 100644 --- a/src/views/sheet/internal/LinkList.vue +++ b/src/views/sheet/internal/LinkList.vue @@ -21,7 +21,15 @@ label="网站地址:" help="* 需要加上 http://" > - + + + + + @@ -276,6 +284,11 @@ export default { this.loadTeams() }) }, + handleParseUrl() { + linkApi.getByParse(this.link.url).then(response => { + this.link = response.data.data + }) + }, createOrUpdateLink() { if (!this.link.name) { this.$notification['error']({ diff --git a/src/views/system/developer/tabs/Environment.vue b/src/views/system/developer/tabs/Environment.vue index 209b5e6e..f452a602 100644 --- a/src/views/system/developer/tabs/Environment.vue +++ b/src/views/system/developer/tabs/Environment.vue @@ -19,27 +19,27 @@ 系统 - {{ systemProperties.properties['os.name'].value }} {{ systemProperties.properties['os.version'].value }} + {{ systemProperties['os.name'].value }} {{ systemProperties['os.version'].value }} 平台 - {{ systemProperties.properties['os.arch'].value }} + {{ systemProperties['os.arch'].value }} 语言 - {{ systemProperties.properties['user.language'].value }} + {{ systemProperties['user.language'].value }} 时区 - {{ systemProperties.properties['user.timezone'].value }} + {{ systemProperties['user.timezone'].value }} 当前用户 - {{ systemProperties.properties['user.name'].value }} + {{ systemProperties['user.name'].value }} 用户目录 - {{ systemProperties.properties['user.home'].value }} + {{ systemProperties['user.home'].value }} @@ -109,11 +109,11 @@ Java 名称 - {{ systemProperties.properties['java.vm.name'].value }} + {{ systemProperties['java.vm.name'].value }} Java 版本 - {{ systemProperties.properties['java.version'].value }} + {{ systemProperties['java.version'].value }} Java Home @@ -122,7 +122,7 @@ :length="isMobile() ? 50 : 256" tooltip > - {{ systemProperties.properties['java.home'].value }} + {{ systemProperties['java.home'].value }} @@ -149,15 +149,11 @@ 端口 - {{ propertiesSourcesMap['server.ports'].properties['local.server.port'].value }} + {{ propertiesSourcesMap['server.ports']['local.server.port'].value }} PID - {{ systemProperties.properties['PID'].value }} - - - 启动模式 - {{ systemProperties.properties['spring.profiles.active'].value }} + {{ systemProperties['PID'].value }} 启动时间 @@ -174,7 +170,7 @@ :length="isMobile() ? 50 : 256" tooltip > - {{ systemProperties.properties['user.dir'].value }} + {{ systemProperties['user.dir'].value }} @@ -185,7 +181,7 @@ :length="isMobile() ? 50 : 256" tooltip > - {{ systemProperties.properties['LOG_FILE'].value }} + {{ systemProperties['LOG_FILE'].value }} @@ -207,8 +203,6 @@