OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[script]版本1.0-beta.4修改为1.0-beta.5

Browse Source
This commit is contained in:
tomsun28
2022-03-09 15:21:00 +08:00
parent eca634bd55
commit a6038d1feb
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java
View File

@@ -409,7 +409,7 @@ public class HttpCollectImpl extends AbstractCollect {
// The default request header can be overridden if customized // The default request header can be overridden if customized
// keep-alive // keep-alive
requestBuilder.addHeader(HttpHeaders.CONNECTION, "keep-alive"); requestBuilder.addHeader(HttpHeaders.CONNECTION, "keep-alive");
requestBuilder.addHeader(HttpHeaders.USER_AGENT,"Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.76 Safari/537.36"); requestBuilder.addHeader(HttpHeaders.USER_AGENT,"Mozilla/5.0 (Windows NT 6.1; WOW64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.76 Safari/537.36");
// headers The custom request header is overwritten here // headers The custom request header is overwritten here
Map<String, String> headers = httpProtocol.getHeaders(); Map<String, String> headers = httpProtocol.getHeaders();
if (headers != null && !headers.isEmpty()) { if (headers != null && !headers.isEmpty()) {
@@ -419,8 +419,6 @@ public class HttpCollectImpl extends AbstractCollect {
} }
} }
} }
// keep-alive
requestBuilder.addHeader(HttpHeaders.CONNECTION, "keep-alive");
// add accept // add accept
if (DispatchConstants.PARSE_DEFAULT.equals(httpProtocol.getParseType()) if (DispatchConstants.PARSE_DEFAULT.equals(httpProtocol.getParseType())
|| DispatchConstants.PARSE_JSON_PATH.equals(httpProtocol.getParseType())) { || DispatchConstants.PARSE_JSON_PATH.equals(httpProtocol.getParseType())) {

2
script/assembly/server/assembly.xml
View File

@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd 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 "> http://maven.apache.org/ASSEMBLY/2.0.0 ">
<!--必填,会追加到打包文件名称的末尾--> <!--必填,会追加到打包文件名称的末尾-->
<id>1.0-beta.4</id> <id>1.0-beta.5</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来--> <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats> <formats>
<format>tar</format> <format>tar</format>

2
script/docker/server/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM openjdk:8-alpine
MAINTAINER tomsun28 "tomsun28@outlook.com" MAINTAINER tomsun28 "tomsun28@outlook.com"
ADD hertzbeat-1.0-beta.4.tar /opt/ ADD hertzbeat-1.0-beta.5.tar /opt/
EXPOSE 1157 EXPOSE 1157