Browse Source

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

tomsun28 3 years ago
parent
commit
a6038d1feb

+ 2 - 4
collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java

@@ -406,10 +406,10 @@ 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
         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
         Map<String, String> headers = httpProtocol.getHeaders();
         if (headers != null && !headers.isEmpty()) {
@@ -419,8 +419,6 @@ public class HttpCollectImpl extends AbstractCollect {
                 }
             }
         }
-        // keep-alive
-        requestBuilder.addHeader(HttpHeaders.CONNECTION, "keep-alive");
         // add accept
         if (DispatchConstants.PARSE_DEFAULT.equals(httpProtocol.getParseType())
                 || DispatchConstants.PARSE_JSON_PATH.equals(httpProtocol.getParseType())) {

+ 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.4</id>
+    <id>1.0-beta.5</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

+ 1 - 1
script/docker/server/Dockerfile

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