From a3a537611830475bdb69254915f7d8cef25ba892 Mon Sep 17 00:00:00 2001
From: wangkang <wangkangit@163.com>
Date: Wed, 26 Apr 2017 16:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BB=E8=A6=81=E7=9A=84js?=
 =?UTF-8?q?on=E8=A7=A3=E6=9E=90=E5=99=A8,=E4=BB=A5=E5=8F=8A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=91=E6=8E=A7=E5=99=A8=E7=9A=84=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 udf-starter-core/pom.xml                                     | 5 +++++
 .../main/java/com/egridcloud/udf/core/BaseApplication.java   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/udf-starter-core/pom.xml b/udf-starter-core/pom.xml
index 9ef61e0..b0c5e7a 100644
--- a/udf-starter-core/pom.xml
+++ b/udf-starter-core/pom.xml
@@ -33,6 +33,11 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
+    <!-- spring-boot-actuator-docs -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-actuator-docs</artifactId>
+    </dependency>
     <!-- springboot configuration-processor -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/udf-starter-core/src/main/java/com/egridcloud/udf/core/BaseApplication.java b/udf-starter-core/src/main/java/com/egridcloud/udf/core/BaseApplication.java
index 6c3cb71..d29518f 100644
--- a/udf-starter-core/src/main/java/com/egridcloud/udf/core/BaseApplication.java
+++ b/udf-starter-core/src/main/java/com/egridcloud/udf/core/BaseApplication.java
@@ -10,6 +10,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Primary;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.client.RestTemplate;
@@ -37,6 +38,7 @@ public class BaseApplication {
    * @return xssObjectMapper
    */
   @Bean
+  @Primary
   public ObjectMapper xssObjectMapper(Jackson2ObjectMapperBuilder builder) {
     //解析器
     ObjectMapper objectMapper = builder.createXmlMapper(false).build();