diff --git a/pom.xml b/pom.xml index baab7e98..a25ddbdb 100644 --- a/pom.xml +++ b/pom.xml @@ -92,12 +92,7 @@ org.springframework.boot spring-boot-starter-data-redis - - - xerces - xercesImpl - 2.11.0 - + diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/MSG.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/MSG.java index 9a14c250..e69144fa 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/MSG.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/MSG.java @@ -18,6 +18,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** *

anonymous complex type的 Java 类。 diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java index b8801dc1..33d5ea26 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java @@ -1,6 +1,7 @@ package com.gzzn.omms.msgexchangeapi.runner; import java.util.Date; +import java.util.concurrent.Executors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,10 +40,6 @@ public class AppRunner implements CommandLineRunner { logger.info("发送获取动态航班日计划的消息完成"); - - //启动线程等待日航班计划消息返回 - Thread t = new Thread(new SchdWaitRunner()); - t.run(); - + Executors.newFixedThreadPool(1).execute(new SchdWaitRunner()); }//end function run } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/exchange/ExchangeServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/exchange/ExchangeServiceImpl.java index 8e430561..8aad0adf 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/exchange/ExchangeServiceImpl.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/exchange/ExchangeServiceImpl.java @@ -7,9 +7,12 @@ import org.springframework.stereotype.Service; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; import com.gzzn.omms.msgexchangeapi.exception.ExchangeServiceException; @Service("exchangeService") @@ -35,6 +38,8 @@ public class ExchangeServiceImpl implements IExchangeService { public T xmlstrToObject(String xml,Class valueType) throws ExchangeServiceException { try { ObjectMapper xmlMapper = new XmlMapper(); + xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + xmlMapper.setAnnotationIntrospector(new JaxbAnnotationIntrospector(TypeFactory.defaultInstance())); return xmlMapper.readValue(xml,valueType); } catch (JsonParseException e) { throw new ExchangeServiceException(e.getMessage(),e);