From 3b975ec627f158458b417ced456165d8c54588e4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 07 五月 2019 23:02:20 +0800
Subject: [PATCH] 修复 businessRoom 节点下没有包含 roomId 节点 问题
---
Api/src/main/java/com/java110/api/ApiApplicationStart.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/ApiApplicationStart.java b/Api/src/main/java/com/java110/api/ApiApplicationStart.java
index 43a3fd3..97eb9d1 100644
--- a/Api/src/main/java/com/java110/api/ApiApplicationStart.java
+++ b/Api/src/main/java/com/java110/api/ApiApplicationStart.java
@@ -1,6 +1,7 @@
package com.java110.api;
import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
import com.java110.event.service.api.ServiceDataFlowEventPublishing;
import com.java110.service.init.ServiceStartInit;
import io.swagger.annotations.ApiOperation;
@@ -11,10 +12,11 @@
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
+
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
@@ -35,36 +37,39 @@
* @date 2016骞�8鏈�6鏃�
* @tag
*/
-@SpringBootApplication(scanBasePackages={"com.java110.service","com.java110.api","com.java110.core","com.java110.event.service.api","com.java110.cache"})
+@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.api", "com.java110.core", "com.java110.event.service.api", "com.java110.cache"})
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = ServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.api.listener"})
@EnableSwagger2
//@EnableConfigurationProperties(EventProperties.class)
+@EnableFeignClients(basePackages = {"com.java110.core.smo"})
public class ApiApplicationStart {
- private final static Logger logger = LoggerFactory.getLogger(ApiApplicationStart.class);
+ private static Logger logger = LoggerFactory.getLogger(ApiApplicationStart.class);
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
+ *
* @return restTemplate
*/
@Bean
@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;
}
/**
* 瀹炰緥鍖朢estTemplate
+ *
* @return restTemplate
*/
@Bean
public RestTemplate restTemplateNoLoadBalanced() {
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;
}
@@ -80,6 +85,7 @@
/**
* 鍒涘缓璇PI鐨勫熀鏈俊鎭紙杩欎簺鍩烘湰淇℃伅浼氬睍鐜板湪鏂囨。椤甸潰涓級
* 璁块棶鍦板潃锛歨ttp://椤圭洰瀹為檯鍦板潃/swagger-ui.html
+ *
* @return
*/
private ApiInfo apiInfo() {
@@ -93,7 +99,7 @@
}
- public static void main(String[] args) throws Exception{
+ public static void main(String[] args) throws Exception {
ApplicationContext context = SpringApplication.run(ApiApplicationStart.class, args);
//鏈嶅姟鍚姩鍔犺浇
--
Gitblit v1.8.0