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-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java | 25 +++++++++++++++++++++----
1 files changed, 21 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
old mode 100644
new mode 100755
index a985efe..a6e713f
--- a/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
+++ b/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
@@ -15,12 +15,15 @@
*/
package com.java110.common;
+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;
@@ -33,6 +36,7 @@
import org.springframework.http.converter.StringHttpMessageConverter;
+import javax.annotation.Resource;
import java.nio.charset.Charset;
@@ -50,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}
@@ -58,18 +63,26 @@
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.common.listener"})
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+ basePackages = {"com.java110.common.cmd"})
@EnableFeignClients(basePackages = {
"com.java110.intf.user",
"com.java110.intf.store",
"com.java110.intf.fee",
"com.java110.intf.community",
- "com.java110.intf.order"
+ "com.java110.intf.job",
+ "com.java110.intf.order",
+ "com.java110.intf.oa",
+ "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娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
*
@@ -80,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;
}
@@ -96,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