From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java b/service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java
index 13d976b..4623fb7 100755
--- a/service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java
+++ b/service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java
@@ -15,12 +15,15 @@
*/
package com.java110.store;
+import com.java110.core.annotation.Java110CmdDiscovery;
import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.event.cmd.ServiceCmdEventPublishing;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
import com.java110.core.client.RestTemplate;
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.web.client.RestTemplateBuilder;
@@ -31,6 +34,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.StringHttpMessageConverter;
+import javax.annotation.Resource;
import java.nio.charset.Charset;
@@ -44,16 +48,21 @@
* @tag
*/
@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.store", "com.java110.core",
- "com.java110.config.properties.code", "com.java110.db"})
+ "com.java110.config.properties.code", "com.java110.db","com.java110.doc"})
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.store.listener"})
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+ basePackages = {"com.java110.store.cmd"})
@EnableFeignClients(basePackages = {
"com.java110.intf.community",
"com.java110.intf.fee",
"com.java110.intf.user",
"com.java110.intf.common",
- "com.java110.intf.order"
+ "com.java110.intf.acct",
+ "com.java110.intf.order",
+ "com.java110.intf.oa",
+ "com.java110.intf.mall"
})
public class StoreServiceApplicationStart {
@@ -62,6 +71,8 @@
private final static String LISTENER_PATH = "java110.StoreService.listeners";
+ @Resource
+ private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
*
@@ -72,15 +83,28 @@
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;
}
+ @Bean
+ public RestTemplate outRestTemplate() {
+ StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+ RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
+ return restTemplate;
+ }
+
+
public static void main(String[] args) throws Exception {
try {
+ ServiceStartInit.preInitSystemConfig();
+
ApplicationContext context = SpringApplication.run(StoreServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
//鍔犺浇涓氬姟渚﹀惉
//SystemStartLoadBusinessConfigure.initSystemConfig(LISTENER_PATH);
+ //鏈嶅姟鍚姩瀹屾垚
+ ServiceStartInit.printStartSuccessInfo();
} catch (Throwable e) {
logger.error("绯荤粺鍚姩澶辫触", e);
}
--
Gitblit v1.8.0