From ebf6117ccea680eae81a91f2fa355ce3a76eb621 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期一, 15 九月 2025 18:00:37 +0800
Subject: [PATCH] 第二张报表导出0915

---
 springboot/src/main/java/com/java110/boot/BootApplicationStart.java |   37 +++++++++++++++++--------------------
 1 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/springboot/src/main/java/com/java110/boot/BootApplicationStart.java b/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
index 9b7996c..9f97eac 100644
--- a/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
+++ b/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
@@ -47,6 +47,7 @@
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 import javax.annotation.Resource;
 import java.nio.charset.Charset;
@@ -57,22 +58,6 @@
  * 杩欎釜鏈嶅姟鏄皢 绯荤粺閮ㄧ讲涓簊pring boot鐗�
  * 濡傛灉鏄痵pring cloud 寰湇鍔¢儴缃� 涓嶇敤鍚姩杩欎釜绫�
  * <p>
- * excludeName = {
- * "com.java110.intf.acct",
- * "com.java110.intf.code",
- * "com.java110.intf.common",
- * "com.java110.intf.community",
- * "com.java110.intf.demo",
- * "com.java110.intf.dev",
- * "com.java110.intf.fee",
- * "com.java110.intf.goods",
- * "com.java110.intf.job",
- * "com.java110.intf.oa",
- * "com.java110.intf.order",
- * "com.java110.intf.report",
- * "com.java110.intf.store",
- * "com.java110.intf.user"
- * }
  *
  * @version v0.1
  * @auther com.java110.wuxw
@@ -98,11 +83,14 @@
         "com.java110.user",
         "com.java110.doc",
         "com.java110.scm",
+        "com.java110.api",
         "com.java110.boot"
 },
         exclude = {LiquibaseAutoConfiguration.class,
                 org.activiti.spring.boot.SecurityAutoConfiguration.class,
-                org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class}
+                org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
+                com.github.pagehelper.autoconfigure.MapperAutoConfiguration.class
+        }
 
 )
 @Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
@@ -120,6 +108,7 @@
                 "com.java110.scm.cmd",
                 "com.java110.user.cmd"
         })
+@EnableScheduling
 @EnableAsync
 //鏂囨。
 @Java110ApiDocDiscovery(basePackages = {"com.java110.boot.rest"}, apiDocClass = ApiDocPublishing.class)
@@ -154,14 +143,15 @@
     @Bean
     public OutRestTemplate outRestTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        m.setWriteAcceptCharset(false);
         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);
+        httpRequestFactory.setConnectionRequestTimeout(10000);
+        httpRequestFactory.setConnectTimeout(10000);
+        httpRequestFactory.setReadTimeout(10000);
         restTemplate.setRequestFactory(httpRequestFactory);
         return restTemplate;
     }
@@ -183,8 +173,15 @@
     @LoadBalanced
     public RestTemplate restTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        m.setWriteAcceptCharset(false);
         RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         restTemplate.getInterceptors().add(java110RestTemplateInterceptor);
+        //璁剧疆瓒呮椂鏃堕棿
+        HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
+        httpRequestFactory.setConnectionRequestTimeout(10000);
+        httpRequestFactory.setConnectTimeout(10000);
+        httpRequestFactory.setReadTimeout(10000);
+        restTemplate.setRequestFactory(httpRequestFactory);
         return restTemplate;
     }
 

--
Gitblit v1.8.0