diff --git a/README.md b/README.md index e172fc6..ed01ecb 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ ##### 安装TDengine 1. docker安装TDengine - `docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/tcp -p 6030-6049:6030-6049/udp --name tdengine tdengine/tdengine:2.4.0.12` + `docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp --name tdengine tdengine/tdengine:2.4.0.12` 2. 创建名称为hertzbeat的数据库 详细步骤参考 [依赖服务TDengine安装初始化](https://hertzbeat.com/docs/start/tdengine-init) @@ -93,6 +93,7 @@ 1. 下载您系统环境对应的安装包 [GITEE Release](https://gitee.com/dromara/hertzbeat/releases) [GITHUB Release](https://github.com/dromara/hertzbeat/releases) 2. 配置HertzBeat的配置文件 hertzbeat/config/application.yml 3. 部署启动 `$ ./startup.sh ` +4. 浏览器访问 localhost:1157 即可开始,默认账号密码 admin/admin 详细步骤参考 [通过安装包安装HertzBeat](https://hertzbeat.com/docs/start/package-deploy) diff --git a/collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java b/collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java index 4c4e92a..3b9a06a 100644 --- a/collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java +++ b/collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java @@ -4,6 +4,7 @@ import org.apache.commons.net.telnet.TelnetClient; import org.junit.jupiter.api.Test; import java.io.IOException; +import java.net.ConnectException; import static org.junit.jupiter.api.Assertions.*; @@ -20,7 +21,7 @@ class TelnetCollectImplTest { telnetClient = new TelnetClient("vt200"); telnetClient.setConnectTimeout(5000); TelnetClient finalTelnetClient = telnetClient; - assertDoesNotThrow(() -> finalTelnetClient.connect("baidu.com",80)); + assertThrows(ConnectException.class,() -> finalTelnetClient.connect("127.0.0.1",0)); telnetClient.disconnect(); } catch (IOException e) { e.printStackTrace(); diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml index 6260429..70df4d5 100644 --- a/script/assembly/server/assembly.xml +++ b/script/assembly/server/assembly.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd http://maven.apache.org/ASSEMBLY/2.0.0 "> - 1.0-beta.6 + 1.0-beta.7 tar diff --git a/script/docker-compose/docker-compose.yaml b/script/docker-compose/docker-compose.yaml index abd0f06..fe04339 100644 --- a/script/docker-compose/docker-compose.yaml +++ b/script/docker-compose/docker-compose.yaml @@ -35,7 +35,7 @@ services: - heartzbeat hertzbeat: - image: "tancloud/hertzbeat:1.0-beta.6" + image: "tancloud/hertzbeat:1.0-beta.7" container_name: hertzbeat hostname: hertzbeat restart: always diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile index 7d61df6..ede694d 100644 --- a/script/docker/server/Dockerfile +++ b/script/docker/server/Dockerfile @@ -2,7 +2,7 @@ FROM openjdk:8-alpine MAINTAINER tomsun28 "tomsun28@outlook.com" -ADD hertzbeat-1.0-beta.6.tar /opt/ +ADD hertzbeat-1.0-beta.7.tar /opt/ RUN apk add --no-cache tzdata