From a31e79f8a020cdcfa7105a11d907abe7e4e3cfff Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 30 一月 2023 13:35:43 +0800
Subject: [PATCH] wechat store config

---
 springboot/src/main/java/com/java110/boot/BootApplicationStart.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/springboot/src/main/java/com/java110/boot/BootApplicationStart.java b/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
index 3b112f8..2c2eb17 100644
--- a/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
+++ b/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
@@ -16,6 +16,7 @@
 package com.java110.boot;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
+import com.java110.core.client.OutRestTemplate;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.context.Environment;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
@@ -41,6 +42,7 @@
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.scheduling.annotation.EnableAsync;
 
@@ -93,6 +95,7 @@
         "com.java110.store",
         "com.java110.user",
         "com.java110.doc",
+        "com.java110.scm",
         "com.java110.boot"
 },
         exclude = {LiquibaseAutoConfiguration.class,
@@ -112,11 +115,12 @@
                 "com.java110.order.cmd",
                 "com.java110.report.cmd",
                 "com.java110.store.cmd",
+                "com.java110.scm.cmd",
                 "com.java110.user.cmd"
         })
 @EnableAsync
 //鏂囨。
-@Java110ApiDocDiscovery(basePackages = {"com.java110.boot.rest"},apiDocClass = ApiDocPublishing.class)
+@Java110ApiDocDiscovery(basePackages = {"com.java110.boot.rest"}, apiDocClass = ApiDocPublishing.class)
 @Java110CmdDocDiscovery(basePackages = {
         "com.java110.acct.cmd",
         "com.java110.acct.payment.business",
@@ -129,6 +133,7 @@
         "com.java110.order.cmd",
         "com.java110.report.cmd",
         "com.java110.store.cmd",
+        "com.java110.scm.cmd",
         "com.java110.user.cmd"
 },
         cmdDocClass = ApiDocCmdPublishing.class)
@@ -145,12 +150,19 @@
      * @return restTemplate
      */
     @Bean
-    public RestTemplate outRestTemplate() {
+    public OutRestTemplate outRestTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
+        OutRestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(OutRestTemplate.class);
+        restTemplate.getInterceptors().add(java110RestTemplateInterceptor);
+
+        //璁剧疆瓒呮椂鏃堕棿
+        HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
+        httpRequestFactory.setConnectionRequestTimeout(5000);
+        httpRequestFactory.setConnectTimeout(5000);
+        httpRequestFactory.setReadTimeout(5000);
+        restTemplate.setRequestFactory(httpRequestFactory);
         return restTemplate;
     }
-
     /**
      * 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
      *
@@ -168,7 +180,7 @@
     @Bean
     @ConditionalOnBean(Java110FeignClientInterceptor.class)
     public okhttp3.OkHttpClient okHttpClient(@Autowired
-                                                     Java110FeignClientInterceptor okHttpLoggingInterceptor) {
+                                             Java110FeignClientInterceptor okHttpLoggingInterceptor) {
         okhttp3.OkHttpClient.Builder ClientBuilder = new okhttp3.OkHttpClient.Builder()
                 .readTimeout(30, TimeUnit.SECONDS) //璇诲彇瓒呮椂
                 .connectTimeout(10, TimeUnit.SECONDS) //杩炴帴瓒呮椂
@@ -187,6 +199,7 @@
 
             Environment.setSystemStartWay(Environment.SPRING_BOOT);
 
+
             //鍒锋柊缂撳瓨
             flushMainCache(args);
         } catch (Throwable e) {

--
Gitblit v1.8.0