bugfix webhook notice error (#1504)

Co-authored-by: Carpe-Wang <[email protected]>

manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java

@@ -84,7 +84,6 @@ protected String renderContent(NoticeTemplate noticeTemplate, Alert alert) throw
                 model.put("thresholdId", thresholdId);
             }
         }
-
         model.put("alarmId", alert.getId());
         model.put("status", alert.getStatus());
         model.put("monitorIdLabel", bundle.getString("alerter.notify.monitorId"));
@@ -127,7 +126,6 @@ public void onEvent(SystemConfigChangeEvent event) {
         log.info("{} receive system config change event: {}.", this.getClass().getName(), event.getSource());
         this.bundle = ResourceBundleUtil.getBundle("alerter");
     }
-
 }
 
 

manager/src/main/resources/templates/2-WebhookTemplate.txt

@@ -1,18 +1,17 @@
 {
-  "alarmId": ${alarmId},
   "target": "${target}",
-  <#if (thresholdId??)>"thresholdId": ${thresholdId},</#if>
-  "priority": ${priorityValue},
+  <#if alarmId??>"alarmId": ${alarmId},</#if>
+  <#if thresholdId??>"thresholdId": "${thresholdId}",</#if>
+  <#if priorityValue??>"priority": ${priorityValue},</#if>
   "content": "${content}",
-  "status": ${status},
-  "times": ${times},
+  <#if status??>"status": ${status},</#if>
+  <#if times??>"times": ${times},</#if>
   "triggerTime": "${triggerTime}",
-  <#if (restoreTime??)>"restoreTime": "${restoreTime}",</#if>
-  <#if (tags??)>
+  <#if restoreTime??>"restoreTime": "${restoreTime}",</#if>
+  <#if tags??>
   "tags": {
     <#list tags as key,value>
-    "${key}": "${value}",
+    "${key}": "${value}"<#if key_has_next>,</#if>
     </#list>
-  }
-  </#if>
+  }</#if>
 }

manager/src/test/java/org/dromara/hertzbeat/manager/service/NoticeConfigServiceTest.java

@@ -1,7 +1,6 @@
 package org.dromara.hertzbeat.manager.service;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import org.assertj.core.util.Maps;
 import org.dromara.hertzbeat.common.entity.alerter.Alert;
 import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver;
@@ -23,7 +22,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;