From 8ffa53b0cab522ef1f0d18634dbafdcd5b51314a Mon Sep 17 00:00:00 2001
From: wangkang <wangkangit@163.com>
Date: Mon, 7 Aug 2017 14:03:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99bean?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/itkk/udf/core/BaseApplication.java     | 13 -------------
 .../src/main/java/org/itkk/udf/rms/RmsConfig.java   |  2 ++
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/udf-starter-core/src/main/java/org/itkk/udf/core/BaseApplication.java b/udf-starter-core/src/main/java/org/itkk/udf/core/BaseApplication.java
index 0fb84bd..e4ceb23 100644
--- a/udf-starter-core/src/main/java/org/itkk/udf/core/BaseApplication.java
+++ b/udf-starter-core/src/main/java/org/itkk/udf/core/BaseApplication.java
@@ -11,7 +11,6 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.itkk.udf.core.xss.XssStringJsonSerializer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -62,18 +61,6 @@ public class BaseApplication {
         return objectMapper;
     }
 
-    /**
-     * 描述 : restTemplate
-     *
-     * @param requestFactory requestFactory
-     * @return RestTemplate
-     */
-    @Bean
-    @LoadBalanced
-    public RestTemplate restTemplate(ClientHttpRequestFactory requestFactory) {
-        return new RestTemplate(requestFactory);
-    }
-
     /**
      * 描述 : externalRestTemplate
      *
diff --git a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java b/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java
index 56c1d32..b0e90b1 100644
--- a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java
+++ b/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java
@@ -10,6 +10,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.client.RestTemplate;
@@ -43,6 +44,7 @@ public class RmsConfig {
      */
     @Bean
     @LoadBalanced
+    @Primary
     RestTemplate restTemplate(ClientHttpRequestFactory requestFactory) {
         return new RestTemplate(requestFactory);
     }