From 8a524787c88a9128cc69af890d4181a01aad0e8c Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期六, 06 七月 2019 23:09:33 +0800
Subject: [PATCH] 修改代码生成器生成的app 加入user_id 的问题

---
 Api/src/main/java/com/java110/api/ApiApplicationStart.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 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..905d735 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.aop",
+        "com.java110.service.configuration",
+        "com.java110.service.controller",
+        "com.java110.service.filter",
+        "com.java110.service.init",
+        "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"})
+@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,6 +101,7 @@
     /**
      * 鍒涘缓璇PI鐨勫熀鏈俊鎭紙杩欎簺鍩烘湰淇℃伅浼氬睍鐜板湪鏂囨。椤甸潰涓級
      * 璁块棶鍦板潃锛歨ttp://椤圭洰瀹為檯鍦板潃/swagger-ui.html
+     *
      * @return
      */
     private ApiInfo apiInfo() {
@@ -93,7 +115,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