From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize

---
 service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java b/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
index ffd72b3..a6e713f 100755
--- a/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
+++ b/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
@@ -17,12 +17,13 @@
 
 import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
+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.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.autoconfigure.liquibase.LiquibaseAutoConfiguration;
@@ -35,6 +36,7 @@
 import org.springframework.http.converter.StringHttpMessageConverter;
 
 
+import javax.annotation.Resource;
 import java.nio.charset.Charset;
 
 
@@ -52,7 +54,8 @@
         "com.java110.common",
         "com.java110.core",
         "com.java110.config.properties.code",
-        "com.java110.db"},
+        "com.java110.db",
+        "com.java110.doc"},
         exclude = {LiquibaseAutoConfiguration.class,
                 org.activiti.spring.boot.SecurityAutoConfiguration.class,
                 org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class}
@@ -70,13 +73,16 @@
         "com.java110.intf.job",
         "com.java110.intf.order",
         "com.java110.intf.oa",
-        "com.java110.intf.report"
+        "com.java110.intf.report",
+        "com.java110.intf.acct",
+        "com.java110.intf.api"
 })
 public class CommonServiceApplicationStart {
 
     private static Logger logger = LoggerFactory.getLogger(CommonServiceApplicationStart.class);
 
-
+    @Resource
+    private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
     /**
      * 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
      *
@@ -87,6 +93,7 @@
     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;
     }
 
@@ -103,10 +110,13 @@
     }
 
     public static void main(String[] args) throws Exception {
+        ServiceStartInit.preInitSystemConfig();
         ApplicationContext context = SpringApplication.run(CommonServiceApplicationStart.class, args);
         ServiceStartInit.initSystemConfig(context);
 
         //鍒濆鍖� activity 娴佺▼
         //DeploymentActivity.deploymentProcess();
+        //鏈嶅姟鍚姩瀹屾垚
+        ServiceStartInit.printStartSuccessInfo();
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0