From 7007db947ea409a973aee8a681ee86cf9d2708bf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 六月 2023 18:54:52 +0800
Subject: [PATCH] 优化1.5 的bug
---
service-job/src/main/java/com/java110/job/JobServiceApplication.java | 74 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/JobServiceApplication.java b/service-job/src/main/java/com/java110/job/JobServiceApplication.java
old mode 100644
new mode 100755
index b2375b4..84f08ba
--- a/service-job/src/main/java/com/java110/job/JobServiceApplication.java
+++ b/service-job/src/main/java/com/java110/job/JobServiceApplication.java
@@ -1,11 +1,15 @@
package com.java110.job;
+import com.java110.core.annotation.Java110CmdDiscovery;
import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.event.center.DataFlowEventPublishing;
+import com.java110.core.client.OutRestTemplate;
+import com.java110.core.client.RestTemplate;
+import com.java110.core.event.cmd.ServiceCmdEventPublishing;
import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
+import com.java110.core.log.LoggerFactory;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
import com.java110.service.init.ServiceStartInit;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -14,10 +18,12 @@
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.client.RestTemplate;
+import javax.annotation.Resource;
import java.nio.charset.Charset;
@SpringBootApplication(
@@ -25,26 +31,60 @@
"com.java110.job",
"com.java110.core",
"com.java110.config.properties.code",
- "com.java110.db"},
- excludeName = {"com.java110.core.smo.jobservice"}
+ "com.java110.db",
+ "com.java110.doc"},
+ excludeName = {"com.java110.intf.jobservice"}
)
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.job.listener"})
-@EnableFeignClients(basePackages = {"com.java110.core.smo.community",
- "com.java110.core.smo.fee",
- "com.java110.core.smo.floor",
- "com.java110.core.smo.owner",
- "com.java110.core.smo.parkingSpace",
- "com.java110.core.smo.room",
- "com.java110.core.smo.unit",
- "com.java110.core.smo.user",
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+ basePackages = {"com.java110.job.cmd"})
+@EnableFeignClients(basePackages = {
+ "com.java110.intf.community",
+ "com.java110.intf.common",
+ "com.java110.intf.fee",
+ "com.java110.intf.user",
+ "com.java110.intf.order",
+ "com.java110.intf.store",
+ "com.java110.intf.report",
+ "com.java110.intf.acct",
+ "com.java110.intf.oa",
+ "com.java110.intf.dev",
+ "com.java110.intf.goods"
})
@EnableScheduling
+@EnableAsync
public class JobServiceApplication {
private static Logger logger = LoggerFactory.getLogger(JobServiceApplication.class);
private static final String LISTENER_PATH = "java110.job.listeners";
+
+ @Resource
+ private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
+
+ @Bean
+ public OutRestTemplate outRestTemplate() {
+ StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+ OutRestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(OutRestTemplate.class);
+ restTemplate.getInterceptors().add(java110RestTemplateInterceptor);
+
+ //璁剧疆瓒呮椂鏃堕棿
+ HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
+ httpRequestFactory.setConnectionRequestTimeout(5000);
+ httpRequestFactory.setConnectTimeout(5000);
+ httpRequestFactory.setReadTimeout(5000);
+ restTemplate.setRequestFactory(httpRequestFactory);
+ return restTemplate;
+ }
+
+ @Bean
+ //@LoadBalanced
+ public RestTemplate formRestTemplate() {
+ RestTemplate restTemplate = new RestTemplate();
+ restTemplate.getMessageConverters().add(new StringHttpMessageConverter(Charset.forName("UTF-8")));
+ return restTemplate;
+ }
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
@@ -55,14 +95,20 @@
@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);
return restTemplate;
}
public static void main(String[] args) throws Exception {
+ ServiceStartInit.preInitSystemConfig();
ApplicationContext context = SpringApplication.run(JobServiceApplication.class, args);
ServiceStartInit.initSystemConfig(context);
//鍔犺浇涓氬姟渚﹀惉
// SystemStartLoadBusinessConfigure.initSystemConfig(LISTENER_PATH);
+
+ //鏈嶅姟鍚姩瀹屾垚
+ ServiceStartInit.printStartSuccessInfo();
+
+
}
}
--
Gitblit v1.8.0