From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante

---
 service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java b/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java
index 3bb049f..90e8196 100644
--- a/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java
+++ b/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java
@@ -15,15 +15,17 @@
  */
 package com.java110.oa;
 
+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;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
@@ -32,6 +34,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.StringHttpMessageConverter;
 
+import javax.annotation.Resource;
 import java.nio.charset.Charset;
 
 
@@ -45,8 +48,10 @@
  * @tag
  */
 @SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.oa",
-        "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
+        "com.java110.core", "com.java110.config.properties.code", "com.java110.db","com.java110.doc"})
 @EnableDiscoveryClient
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+        basePackages = {"com.java110.oa.cmd"})
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.oa.listener"})
 @EnableFeignClients(basePackages = {"com.java110.intf.user",
@@ -58,6 +63,8 @@
 
     private static Logger logger = LoggerFactory.getLogger(OaServiceApplicationStart.class);
 
+    @Resource
+    private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
 
     /**
      * 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
@@ -69,6 +76,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;
     }
 
@@ -85,8 +93,12 @@
     }
 
     public static void main(String[] args) throws Exception {
+        ServiceStartInit.preInitSystemConfig();
         ApplicationContext context = SpringApplication.run(OaServiceApplicationStart.class, args);
         ServiceStartInit.initSystemConfig(context);
 
+        //鏈嶅姟鍚姩瀹屾垚
+        ServiceStartInit.printStartSuccessInfo();
+
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0