From 36d1ac289430cac1160733666d59c424841483c5 Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Mon, 22 Apr 2024 18:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81-springboot=20jackson?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E5=BF=BD=E7=95=A5null=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/accompany/admin/config/WebMvcConfig.java | 7 ++----- .../accompany/core/config/I18nMessageNacosAutoConfig.java | 1 - .../java/com/accompany/core/config/WebLocaleConfig.java | 3 +-- .../activities/luckySea/impl/LuckySeaPushMsgService.java | 1 + .../accompany/business/config/WebInterceptorConfig.java | 2 +- .../business/config/WebMessageConverterConfig.java | 6 +++--- accompany-dependencies/pom.xml | 8 -------- 7 files changed, 8 insertions(+), 20 deletions(-) diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java index 85d415610..95bd30e95 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java @@ -6,17 +6,14 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.multipart.MultipartResolver; import org.springframework.web.multipart.commons.CommonsMultipartResolver; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; +import org.springframework.web.servlet.config.annotation.*; /** * Created by PaperCut on 2018/9/17. * spring mvc配置 */ @Configuration -public class WebMvcConfig extends WebMvcConfigurationSupport { +public class WebMvcConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/I18nMessageNacosAutoConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/I18nMessageNacosAutoConfig.java index ed1969fc6..f77b2a9ab 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/I18nMessageNacosAutoConfig.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/I18nMessageNacosAutoConfig.java @@ -35,7 +35,6 @@ public class I18nMessageNacosAutoConfig { dNamespace = DEFAULT_NAMESPACE; } log.info("开始初始化国际化配置!应用名称:{},Nacos地址:{},提示语命名空间:{}", applicationName, serverAddr, dNamespace); - initTip(null, true); WebLocaleConfig.locales.forEach(item -> { initTip(item, true); }); diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java index f29b9d854..ec2bc71c7 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java @@ -3,14 +3,13 @@ package com.accompany.core.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver; import java.util.*; @Configuration -public class WebLocaleConfig extends WebMvcConfigurationSupport { +public class WebLocaleConfig implements WebMvcConfigurer { public static Locale Chinese = Locale.CHINESE; public static Locale English = Locale.ENGLISH; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java index 39ce7df9e..4750d4c4e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java @@ -86,6 +86,7 @@ public class LuckySeaPushMsgService { FloatingMessageTemplate message = new FloatingMessageTemplate(); message.setResourceType(needSpecialFloating ? ResourceTypeEnum.SVGA.name() : ResourceTypeEnum.IMAGE.name()); message.setResourceContent(needSpecialFloating ? roomTipConfig.getSpecialFloatUrl() : roomTipConfig.getNormalFloatUrl()); + message.setResourceTop(21); message.setResourceWidth(375); message.setResourceHeight(60); message.setTemplate(I18NMessageSourceUtil.getMessageMap(I18nAlertEnum.LUCKY_SEA_FLOATING_MSG.getI18nId(), new Object[]{"nick", "rate", "goldNum"})); diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebInterceptorConfig.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebInterceptorConfig.java index 6de96b0b3..3c7dc3425 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebInterceptorConfig.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebInterceptorConfig.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.*; @Configuration -public class WebInterceptorConfig extends WebMvcConfigurationSupport { +public class WebInterceptorConfig implements WebMvcConfigurer { /** * 自己定义的拦截器类 diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMessageConverterConfig.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMessageConverterConfig.java index a3eb21b95..961d50cdc 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMessageConverterConfig.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMessageConverterConfig.java @@ -18,9 +18,9 @@ public class WebMessageConverterConfig extends WebMvcConfigurationSupport { @Bean public MappingJackson2HttpMessageConverter customJackson2HttpMessageConverter() { MappingJackson2HttpMessageConverter jsonConverter = new MappingJackson2HttpMessageConverter(); - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + ObjectMapper objectMapper = new ObjectMapper() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .setSerializationInclusion(JsonInclude.Include.NON_EMPTY); jsonConverter.setObjectMapper(objectMapper); return jsonConverter; diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index bf3567e20..6c805e533 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -54,7 +54,6 @@ 3.10.3 1.2.1 2.4.2 - 1.9.13 5.1.8 1.10.2 2.0.1.Final @@ -66,7 +65,6 @@ 1.5.4 2.0.1.RELEASE 1.2.0 - 2.1.1 3.1.2 1.0.4 3.16.8 @@ -377,12 +375,6 @@ compile - - org.codehaus.jackson - jackson-mapper-asl - ${jackson-mapper-asl.version} - - com.aliyun aliyun-java-sdk-dysmsapi