From 8f8ebf2d666d36580a1f3efb3a238c274b06ca05 Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Mon, 6 Nov 2023 12:31:33 +0800
Subject: [PATCH] [hertzbeat] release hertzbeat version v1.4.2 (#1317)

---
 .../org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java   | 2 +-
 .../hertzbeat/common/entity/manager/NoticeTemplate.java       | 3 +--
 script/assembly/collector/assembly.xml                        | 2 +-
 script/assembly/server/assembly.xml                           | 2 +-
 script/helm/hertzbeat/Chart.yaml                              | 4 ++--
 script/sureness.yml                                           | 1 +
 web-app/src/app/shared/constants.ts                           | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java
index a24fe5db91d..88a0d26677c 100644
--- a/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java
+++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java
@@ -45,7 +45,7 @@ public static String render(String template, Map<String, Object> replaceData) {
         }
         try {
             Matcher matcher = PATTERN.matcher(template);
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             while (matcher.find()) {
                 Object objectValue = replaceData.getOrDefault(matcher.group(1), "NullValue");
                 String value = objectValue.toString();
diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java
index 730ccc8efa2..d7f97ac35f9 100644
--- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java
+++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java
@@ -90,9 +90,8 @@ public class NoticeTemplate {
                     "${priorityLabel} : ${priority}\n" +
                     "${triggerTimeLabel} : ${triggerTime}\n" +
                     "${contentLabel} : ${content}", accessMode = READ_WRITE)
-    @Length(max = 100000)
+    @Length(max = 60000)
     @NotBlank
-    @Column(name = "content", columnDefinition = "MEDIUMTEXT")
     private String content;
 
     @Schema(title = "The creator of this record", description = "此条记录创建者", example = "tom", accessMode = READ_ONLY)
diff --git a/script/assembly/collector/assembly.xml b/script/assembly/collector/assembly.xml
index 1dd50f5af61..5af13b6ed44 100644
--- a/script/assembly/collector/assembly.xml
+++ b/script/assembly/collector/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.4.1</id>
+    <id>1.4.2</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>
diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml
index 5a2d2e27385..50805a9d640 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.4.1</id>
+    <id>1.4.2</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>
diff --git a/script/helm/hertzbeat/Chart.yaml b/script/helm/hertzbeat/Chart.yaml
index 5db886f1df5..2213ae66c91 100644
--- a/script/helm/hertzbeat/Chart.yaml
+++ b/script/helm/hertzbeat/Chart.yaml
@@ -13,9 +13,9 @@ icon: https://raw.githubusercontent.com/dromara/hertzbeat/master/home/static/img
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.1
+version: 1.4.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.4.1"
+appVersion: "v1.4.2"
diff --git a/script/sureness.yml b/script/sureness.yml
index 4ab0ff2df7e..14e237aae2a 100644
--- a/script/sureness.yml
+++ b/script/sureness.yml
@@ -59,6 +59,7 @@ excludedResource:
   - /api/metrics===get
   - /api/apps/hierarchy===get
   - /actuator/**===get
+  - /api/push/**===*
   # web ui 前端静态资源
   - /===get
   - /dashboard/**===get
diff --git a/web-app/src/app/shared/constants.ts b/web-app/src/app/shared/constants.ts
index 2b5c6b66a23..7e3ab2db987 100644
--- a/web-app/src/app/shared/constants.ts
+++ b/web-app/src/app/shared/constants.ts
@@ -1,3 +1,3 @@
 export const CONSTANTS = {
-  VERSION: 'v1.4.1'
+  VERSION: 'v1.4.2'
 };