Resolves ZSTAC-10964

Signed-off-by: Qun Li <[email protected]>
vonzzx · May 3, 2018 · b6867fb · b6867fb
1 parent da93fd9
commit b6867fb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/conf/zstack-servlet-context.xml b/conf/zstack-servlet-context.xml
@@ -22,10 +22,11 @@
 			<bean class="org.springframework.http.converter.StringHttpMessageConverter">
 				<property name="supportedMediaTypes">
 					<list>
+						<value>application/json;charset=UTF-8</value>
 						<value>text/plain;charset=UTF-8</value>
 					</list>
 				</property>
 			</bean>
 		</mvc:message-converters>
 	</mvc:annotation-driven>
-</beans>
+</beans>
diff --git a/core/src/main/java/org/zstack/core/webhook/WebhookCaller.java b/core/src/main/java/org/zstack/core/webhook/WebhookCaller.java
@@ -8,6 +8,7 @@
 import org.zstack.core.retry.Retry;
 import org.zstack.core.retry.RetryCondition;
 import org.zstack.header.core.webhooks.WebhookInventory;
+import org.zstack.header.rest.RESTConstant;
 import org.zstack.header.rest.RESTFacade;
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
@@ -28,11 +29,10 @@ public abstract class WebhookCaller {
             (int)TimeUnit.SECONDS.toMillis(30)
     );
 
-
     protected void postToWebhooks(List<WebhookInventory> hooks, String body) {
         for (WebhookInventory hook : hooks) {
             HttpHeaders requestHeaders = new HttpHeaders();
-            requestHeaders.setContentType(MediaType.APPLICATION_JSON);
+            requestHeaders.setContentType(MediaType.valueOf(RESTConstant.APP_JSON_UTF8));
             requestHeaders.setContentLength(body.length());
             HttpEntity<String> req = new HttpEntity<String>(body, requestHeaders);
 

diff --git a/header/src/main/java/org/zstack/header/rest/RESTConstant.java b/header/src/main/java/org/zstack/header/rest/RESTConstant.java
@@ -9,4 +9,6 @@ public interface RESTConstant {
     public static final String REST_API_CALL = "/api";
     static final String COMMAND_PATH = "commandpath";
     public static final String DEFAULT_PARAMETER_NAME = "";
+
+    public static final String APP_JSON_UTF8 = "application/json; charset=utf-8";
 }
diff --git a/header/src/main/java/org/zstack/header/rest/RESTFacade.java b/header/src/main/java/org/zstack/header/rest/RESTFacade.java
@@ -2,10 +2,12 @@
 
 import org.springframework.http.HttpEntity;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 import org.zstack.header.core.Completion;
 
 import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -75,6 +77,18 @@ static TimeoutRestTemplate createRestTemplate(int readTimeout, int connectTimeou
         HttpComponentsClientHttpRequestFactory factory = new TimeoutHttpComponentsClientHttpRequestFactory();
         factory.setReadTimeout(readTimeout);
         factory.setConnectTimeout(connectTimeout);
-        return new TimeoutRestTemplate(factory);
+        TimeoutRestTemplate template = new TimeoutRestTemplate(factory);
+
+        StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
+        stringHttpMessageConverter.setWriteAcceptCharset(true);
+        for (int i = 0; i < template.getMessageConverters().size(); i++) {
+            if (template.getMessageConverters().get(i) instanceof StringHttpMessageConverter) {
+                template.getMessageConverters().remove(i);
+                template.getMessageConverters().add(i, stringHttpMessageConverter);
+                break;
+            }
+        }
+
+        return template;
     }
 }