From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/BootApplicationStart.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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 c0efb6a..a7f3824 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;
@@ -102,7 +103,9 @@
},
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 +123,7 @@
"com.java110.scm.cmd",
"com.java110.user.cmd"
})
+@EnableScheduling
@EnableAsync
//鏂囨。
@Java110ApiDocDiscovery(basePackages = {"com.java110.boot.rest"}, apiDocClass = ApiDocPublishing.class)
@@ -159,12 +163,21 @@
//璁剧疆瓒呮椂鏃堕棿
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;
}
+
+ @Bean
+ //@LoadBalanced
+ public RestTemplate formRestTemplate() {
+ RestTemplate restTemplate = new RestTemplate();
+ restTemplate.getMessageConverters().add(new StringHttpMessageConverter(Charset.forName("UTF-8")));
+ return restTemplate;
+ }
+
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
*
@@ -201,14 +214,20 @@
Environment.setSystemStartWay(Environment.SPRING_BOOT);
-
//鍒锋柊缂撳瓨
flushMainCache(args);
+
+ //鏈嶅姟鍚姩瀹屾垚
+ ServiceStartInit.printStartSuccessInfo();
+
+
} catch (Throwable e) {
logger.error("绯荤粺鍚姩澶辫触", e);
}
}
+
+
/**
* 鍒锋柊涓昏鐨勭紦瀛�
*
--
Gitblit v1.8.0