From e1c8bed1b24df8a6c80ffa582bb966acacc8a5d7 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期四, 06 二月 2020 11:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Api/src/main/java/com/java110/api/ApiApplicationStart.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 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..054e69c 100644
--- a/Api/src/main/java/com/java110/api/ApiApplicationStart.java
+++ b/Api/src/main/java/com/java110/api/ApiApplicationStart.java
@@ -1,20 +1,25 @@
+
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
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.openfeign.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,39 +40,55 @@
* @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.configuration",
+ "com.java110.service.init",
+ "com.java110.api",
+ "com.java110.core",
+ "com.java110.event.service.api",
+ "com.java110.config.properties.code",
+ "com.java110.cache"})
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = ServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.api.listener"})
@EnableSwagger2
//@EnableConfigurationProperties(EventProperties.class)
+@EnableFeignClients(basePackages = {"com.java110.core.smo"})
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
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;
}
+ /**
+ * swagger 鎻掍欢
+ *
+ * @return Docket 瀵硅薄
+ */
@Bean
public Docket swaggerSpringMvcPlugin() {
return new Docket(DocumentationType.SWAGGER_2)
@@ -80,24 +101,29 @@
/**
* 鍒涘缓璇PI鐨勫熀鏈俊鎭紙杩欎簺鍩烘湰淇℃伅浼氬睍鐜板湪鏂囨。椤甸潰涓級
* 璁块棶鍦板潃锛歨ttp://椤圭洰瀹為檯鍦板潃/swagger-ui.html
+ *
* @return
*/
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
- .title("Swagger2鏋勫缓RESTful APIs")
- .description("api淇℃伅")
+ .title("HC灏忓尯绠＄悊绯荤粺 APIs")
+ .description("HC灏忓尯绠＄悊绯荤粺鎻愪緵鐨勬墍鏈夎兘鍔�")
.termsOfServiceUrl("https://github.com/java110/MicroCommunity")
- .contact("sunf")
+ .contact("鍚村鏂�")
.version("1.0")
.build();
}
- public static void main(String[] args) throws Exception{
- ApplicationContext context = SpringApplication.run(ApiApplicationStart.class, args);
+ public static void main(String[] args) throws Exception {
+ try{
+ ApplicationContext context = SpringApplication.run(ApiApplicationStart.class, args);
- //鏈嶅姟鍚姩鍔犺浇
- ServiceStartInit.initSystemConfig(context);
+ //鏈嶅姟鍚姩鍔犺浇
+ ServiceStartInit.initSystemConfig(context);
+ }catch (Throwable e){
+ logger.error("绯荤粺鍚姩澶辫触",e);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0