From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java b/service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java
old mode 100644
new mode 100755
index 91090a1..107c530
--- a/service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java
+++ b/service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java
@@ -1,10 +1,12 @@
package com.java110.report;
-import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
+import com.java110.core.annotation.Java110CmdDiscovery;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
+import com.java110.core.client.RestTemplate;
+import com.java110.core.event.cmd.ServiceCmdEventPublishing;
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;
@@ -15,8 +17,9 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
import java.nio.charset.Charset;
@@ -30,18 +33,26 @@
* @tag
*/
@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.report",
- "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"},
exclude = {LiquibaseAutoConfiguration.class,
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
@EnableDiscoveryClient
-@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
- basePackages = {"com.java110.report.listener"})
-@EnableFeignClients(basePackages = {"com.java110.intf.user"})
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+ basePackages = {"com.java110.report.cmd"})
+@EnableFeignClients(basePackages = {"com.java110.intf.user",
+ "com.java110.intf.order",
+ "com.java110.intf.common",
+ "com.java110.intf.store",
+ "com.java110.intf.user",
+ "com.java110.intf.fee",
+ "com.java110.intf.dev",
+ "com.java110.intf.community"})
public class ReportServiceApplicationStart {
private static Logger logger = LoggerFactory.getLogger(ReportServiceApplicationStart.class);
-
+ @Resource
+ private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
*
@@ -51,7 +62,8 @@
@LoadBalanced
public RestTemplate restTemplate() {
StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
- RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+ RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
+ restTemplate.getInterceptors().add(java110RestTemplateInterceptor);
return restTemplate;
}
@@ -61,17 +73,22 @@
* @return restTemplate
*/
@Bean
- public com.java110.core.client.RestTemplate outRestTemplate() {
+ public RestTemplate outRestTemplate() {
StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
- com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
+ RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
return restTemplate;
}
public static void main(String[] args) throws Exception {
+ ServiceStartInit.preInitSystemConfig();
+
ApplicationContext context = SpringApplication.run(ReportServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
//鍒濆鍖� activity 娴佺▼
//DeploymentActivity.deploymentProcess();
+
+ //鏈嶅姟鍚姩瀹屾垚
+ ServiceStartInit.printStartSuccessInfo();
}
}
\ No newline at end of file
--
Gitblit v1.8.0