bugfix restTemplate change default content type application json (#932)

apache · May 6, 2023 · dab1114 · dab1114
1 parent 70ee7a2
commit dab1114
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 25 deletions.
diff --git a/...rg/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java b/...rg/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java
@@ -11,6 +11,7 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -33,10 +34,10 @@ public void send(NoticeReceiver receiver, Alert alert) throws AlertNoticeExcepti
                             .description(renderContent(alert))
                             .build()))
                     .build();
-
             var url = String.format(alerterProperties.getDiscordNotifyUrl(), receiver.getDiscordChannelId());
             var headers = new HttpHeaders();
             headers.add("Authorization", "Bot " + receiver.getDiscordBotToken());
+            headers.setContentType(MediaType.APPLICATION_JSON);
             var request = new HttpEntity<>(notifyBody, headers);
             var entity = restTemplate.postForEntity(url, request, DiscordResponseDTO.class);
             if (entity.getStatusCode() == HttpStatus.OK && entity.getBody() != null) {

diff --git a/...a/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java b/...a/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java
@@ -24,8 +24,7 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -69,8 +68,11 @@ public void send(NoticeReceiver receiver, Alert alert) {
             zhCn.setContent(contents);
             flyBookWebHookDto.setContent(content);
             String webHookUrl = alerterProperties.getFlyBookWebHookUrl() + receiver.getWechatId();
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            HttpEntity<FlyBookWebHookDto> flyEntity = new HttpEntity<>(flyBookWebHookDto, headers); 
             ResponseEntity<CommonRobotNotifyResp> entity = restTemplate.postForEntity(webHookUrl,
-                    flyBookWebHookDto, CommonRobotNotifyResp.class);
+                    flyEntity, CommonRobotNotifyResp.class);
             if (entity.getStatusCode() == HttpStatus.OK) {
                 assert entity.getBody() != null;
                 if (entity.getBody().getCode() == null || entity.getBody().getCode() == 0) {

diff --git a/...l/HuaweiyunSmnAlertNotifyHandlerImpl.java → ...HuaweiCloudSmnAlertNotifyHandlerImpl.java b/...l/HuaweiyunSmnAlertNotifyHandlerImpl.java → ...HuaweiCloudSmnAlertNotifyHandlerImpl.java
@@ -41,7 +41,7 @@
 @Component
 @RequiredArgsConstructor
 @Slf4j
-final class HuaweiyunSmnAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
+final class HuaweiCloudSmnAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
     private final ResourceBundle bundle = ResourceBundleUtil.getBundle("alerter");
 
     private final Map<String, SmnClient> smnClientMap = new ConcurrentHashMap<>();
@@ -57,7 +57,7 @@ public void send(NoticeReceiver receiver, Alert alert) {
                     .withMessage(renderContent(alert));
             request.withBody(body);
             var response = smnClient.publishMessage(request);
-            log.debug("huaweiyun smn alert response: {}", response);
+            log.debug("huaweiCloud smn alert response: {}", response);
         } catch (Exception e) {
             throw new AlertNoticeException("[WebHook Notify Error] " + e.getMessage());
         }

diff --git a/...ava/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java b/...ava/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java
@@ -24,7 +24,10 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
@@ -51,8 +54,10 @@ public void send(NoticeReceiver receiver, Alert alert) throws AlertNoticeExcepti
             var slackNotify = SlackNotifyDTO.builder()
                     .text(renderContent(alert))
                     .build();
-
-            var entity = restTemplate.postForEntity(receiver.getSlackWebHookUrl(), slackNotify, String.class);
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            HttpEntity<SlackNotifyDTO> slackNotifyEntity = new HttpEntity<>(slackNotify, headers);
+            var entity = restTemplate.postForEntity(receiver.getSlackWebHookUrl(), slackNotifyEntity, String.class);
             if (entity.getStatusCode() == HttpStatus.OK && entity.getBody() != null) {
                 var body = entity.getBody();
                 if (Objects.equals(SUCCESS, body)) {

diff --git a/...g/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java b/...g/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java
@@ -27,8 +27,7 @@
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
@@ -55,7 +54,10 @@ public void send(NoticeReceiver receiver, Alert alert) throws AlertNoticeExcepti
                     .text(renderContent(alert))
                     .disableWebPagePreview(true)
                     .build();
-            ResponseEntity<TelegramBotNotifyResponse> entity = restTemplate.postForEntity(url, notifyBody, TelegramBotNotifyResponse.class);
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            HttpEntity<TelegramBotNotifyDTO> telegramEntity = new HttpEntity<>(notifyBody, headers);
+            ResponseEntity<TelegramBotNotifyResponse> entity = restTemplate.postForEntity(url, telegramEntity, TelegramBotNotifyResponse.class);
             if (entity.getStatusCode() == HttpStatus.OK && entity.getBody() != null) {
                 TelegramBotNotifyResponse body = entity.getBody();
                 if (body.ok) {

diff --git a/...org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImpl.java b/...org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImpl.java
@@ -9,6 +9,9 @@
 import org.dromara.hertzbeat.manager.pojo.dto.WeChatAppDTO;
 import org.dromara.hertzbeat.manager.pojo.dto.WeChatAppReq;
 import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -65,7 +68,10 @@ public void send(NoticeReceiver receiver, Alert alert) throws AlertNoticeExcepti
                         .agentId(agentId)
                         .text(textDTO)
                         .build();
-                ResponseEntity<WeChatAppReq> response = restTemplate.postForEntity(String.format(APP_MESSAGE_URL, accessToken), weChatAppDTO, WeChatAppReq.class);
+                HttpHeaders headers = new HttpHeaders();
+                headers.setContentType(MediaType.APPLICATION_JSON);
+                HttpEntity<WeChatAppDTO> weChatAppEntity = new HttpEntity<>(weChatAppDTO, headers);
+                ResponseEntity<WeChatAppReq> response = restTemplate.postForEntity(String.format(APP_MESSAGE_URL, accessToken), weChatAppEntity, WeChatAppReq.class);
                 if (Objects.nonNull(response.getBody()) && !Objects.equals(response.getBody().getErrCode(), 0)) {
                     log.warn("Send Enterprise WeChat App Error: {} Failed: {}", receiver.getHookUrl(), response.getBody().getErrMsg());
                     throw new AlertNoticeException("Http StatusCode " + response.getStatusCode());

diff --git a/...g/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java b/...g/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java
@@ -23,8 +23,7 @@
 import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 
 /**
@@ -46,8 +45,11 @@ public void send(NoticeReceiver receiver, Alert alert) {
             WeWorkWebHookDto.MarkdownDTO markdownDTO = new WeWorkWebHookDto.MarkdownDTO();
             markdownDTO.setContent(renderContent(alert));
             weWorkWebHookDTO.setMarkdown(markdownDTO);
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            HttpEntity<WeWorkWebHookDto> httpEntity = new HttpEntity<>(weWorkWebHookDTO, headers);
             String webHookUrl = alerterProperties.getWeWorkWebHookUrl() + receiver.getWechatId();
-            ResponseEntity<CommonRobotNotifyResp> entity = restTemplate.postForEntity(webHookUrl, weWorkWebHookDTO, CommonRobotNotifyResp.class);
+            ResponseEntity<CommonRobotNotifyResp> entity = restTemplate.postForEntity(webHookUrl, httpEntity, CommonRobotNotifyResp.class);
             if (entity.getStatusCode() == HttpStatus.OK) {
                 assert entity.getBody() != null;
                 if (entity.getBody().getErrCode() == 0) {

diff --git a/...a/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java b/...a/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java
@@ -23,8 +23,7 @@
 import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
@@ -41,7 +40,10 @@ final class WebHookAlertNotifyHandlerImpl implements AlertNotifyHandler {
     @Override
     public void send(NoticeReceiver receiver, Alert alert) {
         try {
-            ResponseEntity<String> entity = restTemplate.postForEntity(receiver.getHookUrl(), alert, String.class);
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            HttpEntity<Alert> alertHttpEntity = new HttpEntity<>(alert, headers);
+            ResponseEntity<String> entity = restTemplate.postForEntity(receiver.getHookUrl(), alertHttpEntity, String.class);
             if (entity.getStatusCode().value() < HttpStatus.BAD_REQUEST.value()) {
                 log.debug("Send WebHook: {} Success", receiver.getHookUrl());
             } else {

diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java
@@ -26,16 +26,14 @@
 
 import java.io.IOException;
 
-import static java.net.Proxy.Type.HTTP;
-
 /**
  * Rest Template interceptor adds request header information
  * restTemplate拦截器添加请求头信息
  *
  * @author tom
  */
 public class HeaderRequestInterceptor implements ClientHttpRequestInterceptor {
-
+    
     @Override
     public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
             throws IOException {
@@ -48,4 +46,4 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttp
         request.getHeaders().add(HttpHeaders.CONNECTION, "close");
         return execution.execute(request, body);
     }
-}
+}
diff --git a/...aweiyunSmnAlertNotifyHandlerImplTest.java → ...eiCloudSmnAlertNotifyHandlerImplTest.java b/...aweiyunSmnAlertNotifyHandlerImplTest.java → ...eiCloudSmnAlertNotifyHandlerImplTest.java
@@ -31,10 +31,10 @@
  * Created by gcdd1993 on 2023/4/22
  */
 @Slf4j
-class HuaweiyunSmnAlertNotifyHandlerImplTest extends AbstractSpringIntegrationTest {
+class HuaweiCloudSmnAlertNotifyHandlerImplTest extends AbstractSpringIntegrationTest {
 
     @Resource
-    private HuaweiyunSmnAlertNotifyHandlerImpl huaweiyunSmnAlertNotifyHandler;
+    private HuaweiCloudSmnAlertNotifyHandlerImpl huaweiyunSmnAlertNotifyHandler;
 
     @Test
     void send() throws InterruptedException {
@@ -85,4 +85,4 @@ void send() throws InterruptedException {
 
         huaweiyunSmnAlertNotifyHandler.send(receiver, alert);
     }
-}
+}