From 46f08cafbd873e9d3ccdff11b5c39c9f4e8fbefd Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 11:18:40 +0800
Subject: [PATCH] 优化代码

---
 service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java |   61 ++++++++++++++++++++++++------
 1 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java b/service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java
old mode 100644
new mode 100755
index 484f789..dc401c4
--- a/service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java
+++ b/service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java
@@ -1,11 +1,17 @@
 package com.java110.user;
 
+import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.OutRestTemplate;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
+import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
+import com.java110.doc.annotation.Java110CmdDocDiscovery;
+import com.java110.doc.registrar.ApiDocCmdPublishing;
 import com.java110.service.init.ServiceStartInit;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -14,8 +20,10 @@
 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 javax.annotation.Resource;
 import java.nio.charset.Charset;
 
 
@@ -29,19 +37,41 @@
  * @tag
  */
 @SpringBootApplication(
-        scanBasePackages = {"com.java110.service","com.java110.core", "com.java110.user",  "com.java110.config.properties.code", "com.java110.db"},
+        scanBasePackages = {"com.java110.service","com.java110.core", "com.java110.user",  "com.java110.config.properties.code", "com.java110.db","com.java110.doc"},
         excludeName = {"com.java110.intf.user"}
 )
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.user.listener"})
-@EnableFeignClients(basePackages = {"com.java110.intf.community","com.java110.intf.common","com.java110.intf.store",
-        "com.java110.intf.fee","com.java110.intf.order"})
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+        basePackages = {"com.java110.user.cmd"})
+@EnableFeignClients(basePackages = {"com.java110.intf.community","com.java110.intf.common","com.java110.intf.store","com.java110.intf.oa",
+        "com.java110.intf.fee","com.java110.intf.order","com.java110.intf.mall","com.java110.intf.report","com.java110.intf.acct"})
+
+// 鏂囨。
+@Java110CmdDocDiscovery(basePackages = {"com.java110.user.cmd"},cmdDocClass = ApiDocCmdPublishing.class)
 public class UserServiceApplicationStart {
 
     private static Logger logger = LoggerFactory.getLogger(UserServiceApplicationStart.class);
 
     private static final String LISTENER_PATH = "java110.UserService.listeners";
+
+    @Resource
+    private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            ServiceStartInit.preInitSystemConfig();
+            ApplicationContext context = SpringApplication.run(UserServiceApplicationStart.class, args);
+            ServiceStartInit.initSystemConfig(context);
+            //鍔犺浇涓氬姟渚﹀惉
+            // SystemStartLoadBusinessConfigure.initSystemConfig(LISTENER_PATH);
+            //鏈嶅姟鍚姩瀹屾垚
+            ServiceStartInit.printStartSuccessInfo();
+        } catch (Throwable e) {
+            logger.error("绯荤粺鍚姩澶辫触", e);
+        }
+    }
 
     /**
      * 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
@@ -53,17 +83,22 @@
     public RestTemplate restTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
         RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
+        restTemplate.getInterceptors().add(java110RestTemplateInterceptor);
         return restTemplate;
     }
 
-    public static void main(String[] args) throws Exception {
-        try {
-            ApplicationContext context = SpringApplication.run(UserServiceApplicationStart.class, args);
-            ServiceStartInit.initSystemConfig(context);
-            //鍔犺浇涓氬姟渚﹀惉
-            // SystemStartLoadBusinessConfigure.initSystemConfig(LISTENER_PATH);
-        } catch (Throwable e) {
-            logger.error("绯荤粺鍚姩澶辫触", e);
-        }
+    @Bean
+    public OutRestTemplate outRestTemplate() {
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        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);
+        restTemplate.setRequestFactory(httpRequestFactory);
+        return restTemplate;
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0