From ee368ef461580332c35ae1d136149153fd0a7cdb Mon Sep 17 00:00:00 2001 From: wangkang Date: Tue, 15 Aug 2017 17:24:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4objectmapper=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../udf/amqp/rabbitmq/RabbitMqConfig.java | 6 +-- .../org/itkk/udf/core/BaseApplication.java | 24 ------------ .../udf/core/xss/XssStringJsonSerializer.java | 37 ------------------- .../scheduler/AutoInitCommandLineRunner.java | 3 +- .../itkk/udf/scheduler/meta/TriggerMeta.java | 2 +- 5 files changed, 5 insertions(+), 67 deletions(-) delete mode 100644 udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssStringJsonSerializer.java diff --git a/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java b/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java index 556f009..0e0146f 100644 --- a/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java +++ b/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java @@ -39,12 +39,12 @@ public class RabbitMqConfig { /** * 描述 : jackson2JsonMessageConverter * - * @param xssObjectMapper xssObjectMapper + * @param objectMapper objectMapper * @return jackson2JsonMessageConverter */ @Bean - public Jackson2JsonMessageConverter jackson2JsonMessageConverter(ObjectMapper xssObjectMapper) { - return new Jackson2JsonMessageConverter(xssObjectMapper); + public Jackson2JsonMessageConverter jackson2JsonMessageConverter(ObjectMapper objectMapper) { + return new Jackson2JsonMessageConverter(objectMapper); } } 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 e4ceb23..e4d4a64 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 @@ -6,18 +6,13 @@ */ package org.itkk.udf.core; -import com.fasterxml.jackson.databind.ObjectMapper; -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.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.client.ClientHttpRequestFactory; import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.retry.annotation.EnableRetry; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -42,25 +37,6 @@ public class BaseApplication { @Autowired private ApplicationConfig applicationConfig; - /** - * 描述 : xssObjectMapper - * - * @param builder builder - * @return xssObjectMapper - */ - @Bean - @Primary - public ObjectMapper xssObjectMapper(Jackson2ObjectMapperBuilder builder) { - //解析器 - ObjectMapper objectMapper = builder.createXmlMapper(false).build(); - //注册xss解析器 - SimpleModule xssModule = new SimpleModule("XssStringJsonSerializer"); - xssModule.addSerializer(new XssStringJsonSerializer()); - objectMapper.registerModule(xssModule); - //返回 - return objectMapper; - } - /** * 描述 : externalRestTemplate * diff --git a/udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssStringJsonSerializer.java b/udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssStringJsonSerializer.java deleted file mode 100644 index 45caa5b..0000000 --- a/udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssStringJsonSerializer.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * XssStringJsonSerializer.java - * Created at 2016-09-19 - * Created by wangkang - * Copyright (C) 2016 itkk.org, All rights reserved. - */ -package org.itkk.udf.core.xss; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import org.springframework.web.util.HtmlUtils; - -import java.io.IOException; - -/** - * 描述 : 基于xss的JsonSerializer - * - * @author wangkang - */ -public class XssStringJsonSerializer extends JsonSerializer { - - @Override - public Class handledType() { - return String.class; - } - - @Override - public void serialize(String value, JsonGenerator jsonGenerator, - SerializerProvider serializerProvider) throws IOException { - if (value != null) { - String encodedValue = HtmlUtils.htmlEscape(value); - jsonGenerator.writeString(encodedValue); - } - } - -} diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/AutoInitCommandLineRunner.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/AutoInitCommandLineRunner.java index 900ecf1..d41be0d 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/AutoInitCommandLineRunner.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/AutoInitCommandLineRunner.java @@ -23,7 +23,6 @@ import java.util.Map; * 描述 : AutoInitCommandLineRunner * * @author Administrator - * */ @Component public class AutoInitCommandLineRunner implements CommandLineRunner { @@ -62,7 +61,7 @@ public class AutoInitCommandLineRunner implements CommandLineRunner { } //自动实例化SimpleTrigger Map simpleTriggerMetaMap = - schedulerProperties.getSimpleTrigger(); + schedulerProperties.getSimpleTrigger(); if (MapUtils.isNotEmpty(simpleTriggerMetaMap)) { Iterator simpleTriggerMetaKeys = simpleTriggerMetaMap.keySet().iterator(); while (simpleTriggerMetaKeys.hasNext()) { diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/meta/TriggerMeta.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/meta/TriggerMeta.java index e5cd611..bd08bc1 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/meta/TriggerMeta.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/meta/TriggerMeta.java @@ -47,7 +47,7 @@ public class TriggerMeta implements Serializable { /** * 描述 : 开始时间 */ - private Date startTime = new Date(); + private Date startTime; /** * 描述 : 结束时间