From ded40ebbd1613490fc68190dbd92db5d7243267f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 22 八月 2023 16:25:20 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/ApiApplicationStart.java |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/ApiApplicationStart.java b/service-api/src/main/java/com/java110/api/ApiApplicationStart.java
index f7fc850..78c2464 100755
--- a/service-api/src/main/java/com/java110/api/ApiApplicationStart.java
+++ b/service-api/src/main/java/com/java110/api/ApiApplicationStart.java
@@ -16,11 +16,14 @@
 package com.java110.api;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110FeignClientAop;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.client.OutRestTemplate;
+import com.java110.core.trace.Java110FeignClientInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.service.api.ServiceDataFlowEventPublishing;
 import com.java110.core.log.LoggerFactory;
+import com.java110.doc.annotation.Java110ApiDocDiscovery;
+import com.java110.doc.registrar.ApiDocPublishing;
 import com.java110.service.init.ServiceStartInit;
 import io.swagger.annotations.ApiOperation;
 import okhttp3.ConnectionPool;
@@ -37,6 +40,7 @@
 import org.springframework.cloud.openfeign.EnableFeignClients;
 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 springfox.documentation.builders.ApiInfoBuilder;
@@ -67,15 +71,34 @@
         "com.java110.api",
         "com.java110.core",
         "com.java110.config.properties.code",
+        "com.java110.doc",
 })
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = ServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.api.listener"})
 @EnableSwagger2
 //@EnableConfigurationProperties(EventProperties.class)
-@EnableFeignClients(basePackages = {"com.java110.intf"})
+@EnableFeignClients(basePackages = {
+        "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"
+})
 @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
 @EnableAsync
+
+//鏂囨。
+@Java110ApiDocDiscovery(basePackages = {"com.java110.api.rest"},apiDocClass = ApiDocPublishing.class)
 public class ApiApplicationStart {
 
     private static Logger logger = LoggerFactory.getLogger(ApiApplicationStart.class);
@@ -94,6 +117,12 @@
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
         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;
     }
 
@@ -105,7 +134,15 @@
     @Bean
     public RestTemplate 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;
     }
 
@@ -125,9 +162,9 @@
 
 
     @Bean
-    @ConditionalOnBean(Java110FeignClientAop.class)
+    @ConditionalOnBean(Java110FeignClientInterceptor.class)
     public okhttp3.OkHttpClient okHttpClient(@Autowired
-                                                     Java110FeignClientAop okHttpLoggingInterceptor){
+                                                     Java110FeignClientInterceptor okHttpLoggingInterceptor){
         okhttp3.OkHttpClient.Builder ClientBuilder = new okhttp3.OkHttpClient.Builder()
                 .readTimeout(30, TimeUnit.SECONDS) //璇诲彇瓒呮椂
                 .connectTimeout(10, TimeUnit.SECONDS) //杩炴帴瓒呮椂
@@ -160,6 +197,8 @@
             ApplicationContext context = SpringApplication.run(ApiApplicationStart.class, args);
             //鏈嶅姟鍚姩鍔犺浇
             ServiceStartInit.initSystemConfig(context);
+            //鏈嶅姟鍚姩瀹屾垚
+            ServiceStartInit.printStartSuccessInfo();
         } catch (Throwable e) {
             logger.error("绯荤粺鍚姩澶辫触", e);
         }

--
Gitblit v1.8.0