From 31155ed32e2f2e2022b4b1697c8a2052a8543a48 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 25 十月 2023 21:38:04 +0800
Subject: [PATCH] 合并代码

---
 ycl-platform/src/main/java/com/ycl/config/RestTemplateConfig.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/config/RestTemplateConfig.java b/ycl-platform/src/main/java/com/ycl/config/RestTemplateConfig.java
index 9aaa3c5..c7729f2 100644
--- a/ycl-platform/src/main/java/com/ycl/config/RestTemplateConfig.java
+++ b/ycl-platform/src/main/java/com/ycl/config/RestTemplateConfig.java
@@ -2,13 +2,27 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
 @Configuration
 public class RestTemplateConfig {
 
+
     @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
+    public RestTemplate restTemplate(ClientHttpRequestFactory factory){
+        RestTemplate restTemplate = new RestTemplate(factory);
+        restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
+        return  restTemplate;
     }
-}
+
+    @Bean
+    public ClientHttpRequestFactory factory(){
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setReadTimeout(5000);
+        factory.setConnectTimeout(15000);
+        return factory;
+    }
+}
\ No newline at end of file

--
Gitblit v1.8.0