Pārlūkot izejas kodu

[script,docs]change version 1.0-beta.6 to 1.0-beta.7

tomsun28 3 gadi atpakaļ
vecāks
revīzija
7994d7ef15

+ 2 - 1
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)   
 

+ 2 - 1
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();

+ 1 - 1
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 ">
     <!--必填,会追加到打包文件名称的末尾-->
-    <id>1.0-beta.6</id>
+    <id>1.0-beta.7</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

+ 1 - 1
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

+ 1 - 1
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