From 195af63ae984ba0766b56d31d309b0da0381b19b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 28 六月 2023 01:48:20 +0800
Subject: [PATCH] 优化商户
---
springboot/src/main/java/com/java110/boot/BootApplicationStart.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/BootApplicationStart.java b/springboot/src/main/java/com/java110/boot/BootApplicationStart.java
index 9de0cf8..a7f3824 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;
@@ -28,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;
@@ -41,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;
@@ -93,11 +98,14 @@
"com.java110.store",
"com.java110.user",
"com.java110.doc",
+ "com.java110.scm",
"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,
@@ -112,13 +120,16 @@
"com.java110.order.cmd",
"com.java110.report.cmd",
"com.java110.store.cmd",
+ "com.java110.scm.cmd",
"com.java110.user.cmd"
})
+@EnableScheduling
@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",
"com.java110.common.cmd",
"com.java110.community.cmd",
"com.java110.dev.cmd",
@@ -128,6 +139,7 @@
"com.java110.order.cmd",
"com.java110.report.cmd",
"com.java110.store.cmd",
+ "com.java110.scm.cmd",
"com.java110.user.cmd"
},
cmdDocClass = ApiDocCmdPublishing.class)
@@ -144,9 +156,25 @@
* @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(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;
}
@@ -167,7 +195,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) //杩炴帴瓒呮椂
@@ -188,10 +216,17 @@
//鍒锋柊缂撳瓨
flushMainCache(args);
+
+ //鏈嶅姟鍚姩瀹屾垚
+ ServiceStartInit.printStartSuccessInfo();
+
+
} catch (Throwable e) {
logger.error("绯荤粺鍚姩澶辫触", e);
}
}
+
+
/**
* 鍒锋柊涓昏鐨勭紦瀛�
@@ -203,7 +238,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