From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java b/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
index 06b0a07..ba2e2ff 100755
--- a/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
+++ b/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
@@ -17,9 +17,9 @@
import com.java110.config.properties.code.ZookeeperProperties;
import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
import com.java110.core.client.RestTemplate;
import com.java110.core.event.center.DataFlowEventPublishing;
-import com.java110.order.smo.ICenterServiceCacheSMO;
import com.java110.service.init.ServiceInfoListener;
import com.java110.service.init.ServiceStartInit;
import com.java110.utils.cache.MappingCache;
@@ -32,7 +32,7 @@
import org.apache.zookeeper.*;
import org.apache.zookeeper.data.Stat;
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;
@@ -42,7 +42,9 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.scheduling.annotation.EnableAsync;
+import javax.annotation.Resource;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.charset.Charset;
@@ -72,9 +74,13 @@
"com.java110.intf.community",
"com.java110.intf.fee"
})
+@EnableAsync
public class OrderServiceApplicationStart {
private static Logger logger = LoggerFactory.getLogger(OrderServiceApplicationStart.class);
+
+ @Resource
+ private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
@@ -86,6 +92,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;
}
@@ -103,6 +110,8 @@
public static void main(String[] args) throws Exception {
try {
+ ServiceStartInit.preInitSystemConfig();
+
ApplicationContext context = SpringApplication.run(OrderServiceApplicationStart.class, args);
//鏈嶅姟鍚姩鍔犺浇
@@ -111,8 +120,6 @@
//鍔犺浇浜嬩欢鏁版嵁
//EventConfigInit.initSystemConfig();
- //鍒锋柊缂撳瓨
- flushMainCache(args);
//鍔犺浇workId
loadWorkId();
@@ -121,35 +128,6 @@
}
}
-
- /**
- * 鍒锋柊涓昏鐨勭紦瀛�
- *
- * @param args
- */
- private static void flushMainCache(String[] args) {
-
- logger.debug("鍒ゆ柇鏄惁闇�瑕佸埛鏂版棩蹇楋紝鍙傛暟 args 涓� {}", args);
-
- //鍥犱负濂藉鏈嬪弸鍚姩鏃� 涓嶅姞 鍙傛暟-Dcache 鎵�浠ュ惎鍔ㄦ椂妫�娴� redis 涓槸鍚﹀瓨鍦� java110_hc_version
- String mapping = MappingCache.getValue("java110_hc_version");
- if (StringUtil.isEmpty(mapping)) {
- ICenterServiceCacheSMO centerServiceCacheSMO = (ICenterServiceCacheSMO) ApplicationContextFactory.getBean("centerServiceCacheSMOImpl");
- centerServiceCacheSMO.startFlush();
- return;
- }
-
- if (args == null || args.length == 0) {
- return;
- }
- for (int i = 0; i < args.length; i++) {
- if (args[i].equalsIgnoreCase("-Dcache")) {
- logger.debug("寮�濮嬪埛鏂版棩蹇楋紝鍏ュ弬涓猴細{}", args[i]);
- ICenterServiceCacheSMO centerServiceCacheSMO = (ICenterServiceCacheSMO) ApplicationContextFactory.getBean("centerServiceCacheSMOImpl");
- centerServiceCacheSMO.startFlush();
- }
- }
- }
/**
* 鍔犺浇 workId
--
Gitblit v1.8.0