From 08d8b029b10706b135713424e9b2a1b6e3839372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 22:40:01 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java b/service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java
index 3bbab9b..3e60f0b 100644
--- a/service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java
+++ b/service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java
@@ -1,6 +1,7 @@
package com.java110.fee;
import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
import com.java110.service.init.ServiceStartInit;
import org.slf4j.Logger;
@@ -14,7 +15,6 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
import java.nio.charset.Charset;
@@ -29,11 +29,11 @@
* @tag
*/
@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.fee",
- "com.java110.core", "com.java110.config.properties.code","com.java110.db"})
+ "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.fee.listener"})
-@EnableFeignClients(basePackages = {"com.java110.core.smo.user","com.java110.core.smo.order"})
+@EnableFeignClients(basePackages = {"com.java110.intf.user", "com.java110.intf.order", "com.java110.intf.community"})
public class FeeServiceApplicationStart {
private static Logger logger = LoggerFactory.getLogger(FeeServiceApplicationStart.class);
@@ -48,16 +48,16 @@
@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 {
- try{
+ try {
ApplicationContext context = SpringApplication.run(FeeServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
- }catch (Throwable e){
- logger.error("绯荤粺鍚姩澶辫触",e);
+ } catch (Throwable e) {
+ logger.error("绯荤粺鍚姩澶辫触", e);
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0