diff --git a/common/core/src/main/java/org/funcode/portal/server/common/core/config/JacksonConfig.java b/common/core/src/main/java/org/funcode/portal/server/common/core/config/JacksonConfig.java index 7314743..c583613 100644 --- a/common/core/src/main/java/org/funcode/portal/server/common/core/config/JacksonConfig.java +++ b/common/core/src/main/java/org/funcode/portal/server/common/core/config/JacksonConfig.java @@ -13,9 +13,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; +import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; @@ -31,6 +33,13 @@ @Configuration public class JacksonConfig { + @Bean + public StringHttpMessageConverter stringHttpMessageConverter() { + StringHttpMessageConverter converter = new StringHttpMessageConverter(); + converter.setDefaultCharset(StandardCharsets.UTF_8); + return converter; + } + @Bean public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() { Jackson2ObjectMapperBuilder builder = diff --git a/common/core/src/main/java/org/funcode/portal/server/common/core/security/service/impl/JwtServiceImpl.java b/common/core/src/main/java/org/funcode/portal/server/common/core/security/service/impl/JwtServiceImpl.java index ff37e0d..27ff0e9 100644 --- a/common/core/src/main/java/org/funcode/portal/server/common/core/security/service/impl/JwtServiceImpl.java +++ b/common/core/src/main/java/org/funcode/portal/server/common/core/security/service/impl/JwtServiceImpl.java @@ -161,7 +161,7 @@ public void successLoginHandler(@NonNull HttpServletRequest request, User currentUser = (User) authentication.getPrincipal(); String accessToken = this.generateToken(currentUser); response.addHeader(SecurityConstant.TOKEN_HEADER_KEY, accessToken); - response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); Cookie cookie = new Cookie(SecurityConstant.TOKEN_COOKIE_KEY, accessToken); cookie.setHttpOnly(true); response.addCookie(cookie);