[monitor]release hertzbeat version v1.1.1 (#222)

apache · Jul 10, 2022 · 4b1cf01 · 4b1cf01
1 parent 269ccbf
commit 4b1cf01
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/common/src/test/java/com/usthe/common/util/CommonUtilTest.java b/common/src/test/java/com/usthe/common/util/CommonUtilTest.java
@@ -14,8 +14,8 @@ class CommonUtilTest {
     void testParseDoubleStr() {
         assertEquals("9.3454",CommonUtil.parseDoubleStr("9.345435345", null));
         assertEquals("9.3454",CommonUtil.parseDoubleStr("9.345435345%", "%"));
-        assertEquals("10.0",CommonUtil.parseDoubleStr("10%", "%"));
-        assertEquals("588.0",CommonUtil.parseDoubleStr("588Mb", "Mb"));
+        assertEquals("10",CommonUtil.parseDoubleStr("10%", "%"));
+        assertEquals("588",CommonUtil.parseDoubleStr("588Mb", "Mb"));
     }
 
     @Test

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

diff --git a/script/docker-compose/docker-compose.yaml b/script/docker-compose/docker-compose.yaml
@@ -43,6 +43,7 @@ services:
     restart: always
     environment:
       TZ: Asia/Shanghai
+      LANG: zh_CN.UTF-8
     volumes:
       - ./conf/application.yml:/opt/hertzbeat/config/application.yml
       - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml

diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:11.0.15-jre-slim-buster
 
 MAINTAINER tomsun28 "[email protected]"
 
-ADD hertzbeat-1.1.tar /opt/
+ADD hertzbeat-1.1.1.tar /opt/
 
 ENV TZ=Asia/Shanghai
 

diff --git a/web-app/package.json b/web-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hertzbeat-web-app",
-  "version": "0.0.0",
+  "version": "1.0",
   "scripts": {
     "ng": "ng",
     "start": "ng s -o",

diff --git a/web-app/src/app/shared/consts.ts b/web-app/src/app/shared/consts.ts
@@ -1,3 +1,3 @@
 export const CONSTS = {
-  VERSION: 'v1.0'
+  VERSION: 'v1.1.1'
 };