From af9372cee0fd72e5c70cc223f81efd6c32117535 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 18 八月 2023 09:51:48 +0800
Subject: [PATCH] 优化平团bug
---
springboot/src/main/java/com/java110/boot/BootApplicationStart.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/BootApplicationStart.java b/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
index 5f8ef4b..8af753a 100644
--- a/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
+++ b/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
@@ -29,6 +29,8 @@
import com.java110.doc.registrar.ApiDocPublishing;
import com.java110.intf.dev.ICacheV1InnerServiceSMO;
import com.java110.service.init.ServiceStartInit;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.StringUtil;
import okhttp3.ConnectionPool;
@@ -42,8 +44,10 @@
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;
+import org.springframework.scheduling.annotation.EnableScheduling;
import javax.annotation.Resource;
import java.nio.charset.Charset;
@@ -99,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,
@@ -117,6 +123,7 @@
"com.java110.scm.cmd",
"com.java110.user.cmd"
})
+@EnableScheduling
@EnableAsync
//鏂囨。
@Java110ApiDocDiscovery(basePackages = {"com.java110.boot.rest"}, apiDocClass = ApiDocPublishing.class)
@@ -151,7 +158,24 @@
@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(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;
}
@@ -164,8 +188,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;
}
@@ -191,13 +222,19 @@
Environment.setSystemStartWay(Environment.SPRING_BOOT);
-
//鍒锋柊缂撳瓨
flushMainCache(args);
+
+ //鏈嶅姟鍚姩瀹屾垚
+ ServiceStartInit.printStartSuccessInfo();
+
+
} catch (Throwable e) {
logger.error("绯荤粺鍚姩澶辫触", e);
}
}
+
+
/**
* 鍒锋柊涓昏鐨勭紦瀛�
@@ -209,7 +246,7 @@
logger.debug("鍒ゆ柇鏄惁闇�瑕佸埛鏂版棩蹇楋紝鍙傛暟 args 涓� {}", args);
//鍥犱负濂藉鏈嬪弸鍚姩鏃� 涓嶅姞 鍙傛暟-Dcache 鎵�浠ュ惎鍔ㄦ椂妫�娴� redis 涓槸鍚﹀瓨鍦� java110_hc_version
- //String mapping = MappingCache.getValue("java110_hc_version");
+ //String mapping = MappingCache.getValue(MappingConstant.ENV_DOMAIN,"java110_hc_version");
String mapping = "";
if (StringUtil.isEmpty(mapping)) {
ICacheV1InnerServiceSMO devServiceCacheSMOImpl = (ICacheV1InnerServiceSMO) ApplicationContextFactory.getBean(ICacheV1InnerServiceSMO.class);
--
Gitblit v1.8.0