From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java b/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java
index f99be41..9f124cd 100644
--- a/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java
+++ b/service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java
@@ -15,15 +15,17 @@
*/
package com.java110.oa;
+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;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
@@ -32,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,32 +47,24 @@
* @date 2016骞�8鏈�6鏃�
* @tag
*/
-@SpringBootApplication(scanBasePackages = {
- "com.java110.service",
- "com.java110.common",
- "com.java110.core",
- "com.java110.config.properties.code",
- "com.java110.db"},
- exclude = {LiquibaseAutoConfiguration.class,
- org.activiti.spring.boot.SecurityAutoConfiguration.class,
- org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class}
- )
+@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.oa",
+ "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
@EnableDiscoveryClient
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+ basePackages = {"com.java110.oa.cmd"})
@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.oa.listener"})
-@EnableFeignClients(basePackages = {
- "com.java110.intf.user",
- "com.java110.intf.store",
- "com.java110.intf.fee",
- "com.java110.intf.community",
- "com.java110.intf.job",
+@EnableFeignClients(basePackages = {"com.java110.intf.user",
"com.java110.intf.order",
- "com.java110.intf.report"
-})
+ "com.java110.intf.community",
+ "com.java110.intf.common",
+ "com.java110.intf.store"})
public class OaServiceApplicationStart {
private static Logger logger = LoggerFactory.getLogger(OaServiceApplicationStart.class);
+ @Resource
+ private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
@@ -81,6 +76,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;
}
@@ -97,10 +93,9 @@
}
public static void main(String[] args) throws Exception {
+ ServiceStartInit.preInitSystemConfig();
ApplicationContext context = SpringApplication.run(OaServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
- //鍒濆鍖� activity 娴佺▼
- //DeploymentActivity.deploymentProcess();
}
}
\ No newline at end of file
--
Gitblit v1.8.0