From fcf87dce50e05c0414f7f8c071aa3bf87334c9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E5=8F=8C?= Date: Sun, 7 May 2023 14:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ++++++----- .../main/java/org/dhorse/agent/JvmMetricsAgent.java | 2 +- static/page/app/detail.html | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index eb73c573..491445be 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,12 @@ DHorse是一个简单易用、以应用为中心的云原生DevOps系统，具 ## 主要特性 * 简洁的操作界面 -* 支持SpringBoot应用部署 -* 支持Node应用部署 +* 以应用为中心，屏蔽K8S的底层概念 +* 无需安装Docker即可构建镜像 * 无需安装Maven即可打包 * 无需安装Node即可打包 -* 无需安装Docker即可构建镜像 +* 支持SpringBoot应用部署 +* 支持Node应用部署 * 支持多环境部署 * 支持日志收集 * 支持链路追踪 @@ -36,8 +37,8 @@ Springboot、Mybatis、Mybatis-plus、Maven-core、Jib-core、Layuimini、Smart- | Java版本 | Linux、Mac或Cygwin | Windows | :-----: | :----: | :----: | -| 1.8 | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.0.0/dhorse-v1.0.0-jdk1.8-bin-unix.tar.gz) | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.0.0/dhorse-v1.0.0-jdk1.8-bin-windows.zip) -| >=11 | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.0.0/dhorse-v1.0.0-bin-unix.tar.gz) | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.0.0/dhorse-v1.0.0-bin-windows.zip) +| 1.8 | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.1.0/dhorse-v1.1.0-jdk1.8-bin-unix.tar.gz) | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.1.0/dhorse-v1.1.0-jdk1.8-bin-windows.zip) +| >=11 | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.1.0/dhorse-v1.1.0-bin-unix.tar.gz) | [下载](https://github.com/tiandizhiguai/dhorse/releases/download/v1.1.0/dhorse-v1.1.0-bin-windows.zip) 3. 下载文件之后，然后解压 diff --git a/dhorse-agent/src/main/java/org/dhorse/agent/JvmMetricsAgent.java b/dhorse-agent/src/main/java/org/dhorse/agent/JvmMetricsAgent.java index 0a5e41e0..5ba87196 100644 --- a/dhorse-agent/src/main/java/org/dhorse/agent/JvmMetricsAgent.java +++ b/dhorse-agent/src/main/java/org/dhorse/agent/JvmMetricsAgent.java @@ -48,7 +48,7 @@ public static void premain(String args, Instrumentation inst) { metaspace(replicaName, metricsList); thread(replicaName, metricsList); HttpUtils.sendPost(args, metricsList.toString()); - }, 0, 1, TimeUnit.SECONDS); + }, 0, 5, TimeUnit.SECONDS); } private static void heapMemory(String replicaName, List metricsList) { diff --git a/static/page/app/detail.html b/static/page/app/detail.html index 0007bcf3..284d0df1 100644 --- a/static/page/app/detail.html +++ b/static/page/app/detail.html @@ -207,11 +207,11 @@ $("#baseImageDiv").show(); } var department = res.data.firstDepartment; - if(department != ''){ + if(res.data.secondDepartment != ''){ department += ' - '; department += res.data.secondDepartment; } - if(department != ''){ + if(res.data.thirdDepartment != ''){ department += ' - '; department += res.data.thirdDepartment; }