From cd6c8efb2f0d5cb65e808544e7687f2128680fa6 Mon Sep 17 00:00:00 2001 From: bruce Date: Fri, 19 Jun 2020 19:36:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=AE=A2=E6=B5=81]=E4=BF=AE=E5=A4=8Dtoken?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/DataTowerServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 9e2e58090..08260ee22 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -758,14 +758,14 @@ public class DataTowerServiceImpl implements DataTowerService { Date expiredTime = wiWideInfo.getExpiredTime(); String token = wiWideInfo.getToken(); logger.info("wiwideinfo:"+JSONObject.toJSONString(wiWideInfo)); - if (StringUtils.isEmpty(token) || expiredTime == null || expiredTime.before(new Date())) { +// if (StringUtils.isEmpty(token) || expiredTime == null || expiredTime.before(new Date())) { String data = WiwideUtil.queryToken(wiWideInfo); logger.info("bid:"+wiWideInfo.getWiwideId()+",newdata:"+data); if (data == null) return null; token = (String) JSONObject.parseObject(data).get("data"); updateToken(wiWideInfo, token); - } +// } logger.info("返回的token:"+token); return token; } From c85def599b38882d33ff666f75f37521cda69ea2 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 6 Jul 2020 10:49:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89Long,Bigint,BigDecimal?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BA=E5=AD=97=E7=AC=A6=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/config/WebMvcConfig.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java index c4064057a..e0c9c01d3 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -76,7 +76,7 @@ public class WebMvcConfig implements WebMvcConfigurer { MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); //ObjectMapper 是Jackson库的主要类。它提供一些功能将转换成Java对象匹配JSON结构,反之亦然 ObjectMapper objectMapper = new ObjectMapper(); - SimpleModule simpleModule = new SimpleModule(); +// SimpleModule simpleModule = new SimpleModule(); //不显示为null的字段 objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -88,17 +88,17 @@ public class WebMvcConfig implements WebMvcConfigurer { .without(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) ); //序列化将Long转String类型 - simpleModule.addSerializer(Long.class, ToStringSerializer.instance); - simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); - SimpleModule bigIntegerModule = new SimpleModule(); +// simpleModule.addSerializer(Long.class, ToStringSerializer.instance); +// simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); +// SimpleModule bigIntegerModule = new SimpleModule(); //序列化将BigInteger转String类型 - bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); - SimpleModule bigDecimalModule = new SimpleModule(); +// bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); +// SimpleModule bigDecimalModule = new SimpleModule(); //序列化将BigDecimal转String类型 - bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); - objectMapper.registerModule(simpleModule); - objectMapper.registerModule(bigDecimalModule); - objectMapper.registerModule(bigIntegerModule); +// bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); +// objectMapper.registerModule(simpleModule); +// objectMapper.registerModule(bigDecimalModule); +// objectMapper.registerModule(bigIntegerModule); jackson2HttpMessageConverter.setObjectMapper(objectMapper); converters.add(jackson2HttpMessageConverter); } From 3238780df7e2f7118d42adb6e7d939f8c3fa381d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 6 Jul 2020 16:34:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/config/WebMvcConfig.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java index e0c9c01d3..c4064057a 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -76,7 +76,7 @@ public class WebMvcConfig implements WebMvcConfigurer { MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); //ObjectMapper 是Jackson库的主要类。它提供一些功能将转换成Java对象匹配JSON结构,反之亦然 ObjectMapper objectMapper = new ObjectMapper(); -// SimpleModule simpleModule = new SimpleModule(); + SimpleModule simpleModule = new SimpleModule(); //不显示为null的字段 objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -88,17 +88,17 @@ public class WebMvcConfig implements WebMvcConfigurer { .without(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) ); //序列化将Long转String类型 -// simpleModule.addSerializer(Long.class, ToStringSerializer.instance); -// simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); -// SimpleModule bigIntegerModule = new SimpleModule(); + simpleModule.addSerializer(Long.class, ToStringSerializer.instance); + simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); + SimpleModule bigIntegerModule = new SimpleModule(); //序列化将BigInteger转String类型 -// bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); -// SimpleModule bigDecimalModule = new SimpleModule(); + bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); + SimpleModule bigDecimalModule = new SimpleModule(); //序列化将BigDecimal转String类型 -// bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); -// objectMapper.registerModule(simpleModule); -// objectMapper.registerModule(bigDecimalModule); -// objectMapper.registerModule(bigIntegerModule); + bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); + objectMapper.registerModule(simpleModule); + objectMapper.registerModule(bigDecimalModule); + objectMapper.registerModule(bigIntegerModule); jackson2HttpMessageConverter.setObjectMapper(objectMapper); converters.add(jackson2HttpMessageConverter); }