From ff53a4ffd3f980fac4f098fb1c333b1d28bc25be Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Sat, 24 Dec 2022 17:49:07 +0800
Subject: [PATCH] [hertzbeat] release hertzbeat version v1.2.3 (#516)

* [hertzbeat] release hertzbeat version v1.2.3

* [hertzbeat] release hertzbeat version v1.2.3

* [web-app] fix ng build error

* [hertzbeat] release hertzbeat version v1.2.3

* [hertzbeat] release hertzbeat version v1.2.3
---
 pom.xml                                                 | 3 ++-
 script/assembly/server/assembly.xml                     | 2 +-
 script/assembly/server/bin/restart.sh                   | 8 ++++----
 script/docker/server/Dockerfile                         | 2 +-
 web-app/README.md                                       | 2 +-
 web-app/src/app/layout/basic/basic.component.ts         | 2 +-
 web-app/src/app/layout/passport/passport.component.html | 2 +-
 web-app/src/app/shared/consts.ts                        | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index c3970fdc7..67451a0a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>3.8</version>
                 <configuration>
+                    <linkXRef>false</linkXRef>
                     <rulesets>
                         <ruleset>rulesets/java/ali-comment.xml</ruleset>
                         <!--<ruleset>rulesets/java/ali-concurrent.xml</ruleset>-->
@@ -129,4 +130,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml
index 9baa53e99..3fd951e42 100644
--- a/script/assembly/server/assembly.xml
+++ b/script/assembly/server/assembly.xml
@@ -19,7 +19,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.2.2</id>
+    <id>1.2.3</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>
diff --git a/script/assembly/server/bin/restart.sh b/script/assembly/server/bin/restart.sh
index bed172314..4cf0bf7bd 100644
--- a/script/assembly/server/bin/restart.sh
+++ b/script/assembly/server/bin/restart.sh
@@ -17,13 +17,13 @@
 # limitations under the License.
 
 # 重启脚本执行的起始时间
-starttime=$(date -d now +%s)
-echo -e "\033[0;31m当前时间是：$(date "+%Y-%m-%d %H:%M:%S") 开始全部重启\033[0m"
+startTime=$(date +%s)
+echo -e "\033[0;31mCurrent Time is：$(date "+%Y-%m-%d %H:%M:%S") Restart Now!\033[0m"
 ./shutdown.sh
 echo
 sleep 2
 echo
 ./startup.sh
 # 重启脚本执行的结束时间
-endtime=$(date -d now +%s)
-echo -e  "\033[0;31m当前时间是：$(date "+%Y-%m-%d %H:%M:%S") 已经完全重启了！重启一共耗费了$(($endtime - $starttime))秒 \033[0m";
+endTime=$(date +%s)
+echo -e  "\033[0;31mCurrent Time is：$(date "+%Y-%m-%d %H:%M:%S") Restart Success！Spend $((endTime - startTime)) seconds \033[0m";
diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile
index cc7fcbc83..e308904d5 100644
--- a/script/docker/server/Dockerfile
+++ b/script/docker/server/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:11.0.16-jre-slim-buster
 
 MAINTAINER tancloud "tomsun28@outlook.com"
 
-ADD hertzbeat-1.2.2.tar /opt/
+ADD hertzbeat-1.2.3.tar /opt/
 
 ENV TZ=Asia/Shanghai
 #ENV LANG=zh_CN.UTF-8
diff --git a/web-app/README.md b/web-app/README.md
index 1d8a7fef7..c4306db6b 100644
--- a/web-app/README.md
+++ b/web-app/README.md
@@ -19,7 +19,7 @@
 
 1. Execute command in web-app  
 
-```ng build --prod```
+```ng build --configuration production```
 
 2. Execute command in manager  
 
diff --git a/web-app/src/app/layout/basic/basic.component.ts b/web-app/src/app/layout/basic/basic.component.ts
index 245aacce9..5163abc18 100644
--- a/web-app/src/app/layout/basic/basic.component.ts
+++ b/web-app/src/app/layout/basic/basic.component.ts
@@ -80,7 +80,7 @@ import { CONSTS } from 'src/app/shared/consts';
       <div style="margin-top: 30px">
         HertzBeat {{ version }}<br />
         Copyright
-        <i nz-icon nzType="copyright"></i> 2022
+        <i nz-icon nzType="copyright"></i> 2023
         <a href="https://hertzbeat.com" target="_blank">hertzbeat.com</a>
         <br />
         Licensed under the Apache License, Version 2.0
diff --git a/web-app/src/app/layout/passport/passport.component.html b/web-app/src/app/layout/passport/passport.component.html
index 47450b608..2a5a6de0f 100644
--- a/web-app/src/app/layout/passport/passport.component.html
+++ b/web-app/src/app/layout/passport/passport.component.html
@@ -13,7 +13,7 @@
         HertzBeat {{ version }}<br />
         Copyright
         <i nz-icon nzType="copyright" nzTheme="outline"></i>
-        2022
+        2023
         <a href="https://hertzbeat.com" target="_blank">hertzbeat.com</a>
         <br />
         Licensed under the Apache License, Version 2.0
diff --git a/web-app/src/app/shared/consts.ts b/web-app/src/app/shared/consts.ts
index 0ce78eaee..d792b280f 100644
--- 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.2.2'
+  VERSION: 'v1.2.3'
 };
-- 
GitLab