From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 8d20764..9ab1782
--- 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;
@@ -58,6 +62,8 @@
@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",
@@ -65,13 +71,15 @@
"com.java110.intf.community",
"com.java110.intf.job",
"com.java110.intf.order",
+ "com.java110.intf.oa",
"com.java110.intf.report"
})
public class CommonServiceApplicationStart {
private static Logger logger = LoggerFactory.getLogger(CommonServiceApplicationStart.class);
-
+ @Resource
+ private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
*
@@ -82,6 +90,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;
}
@@ -98,6 +107,7 @@
}
public static void main(String[] args) throws Exception {
+ ServiceStartInit.preInitSystemConfig();
ApplicationContext context = SpringApplication.run(CommonServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
--
Gitblit v1.8.0