public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-22 21:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

maxkey.auth.session.timeout && 增加 date格式化支持

Browse Source 
maxkey.session.timeout 修改为maxkey.auth.session.timeout
增加 date格式化支持
This commit is contained in:
MaxKey
2024-05-04 07:28:04 +08:00
parent bfa468c749
commit 9ff95bf74a
5 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java
View File

@@ -17,13 +17,14 @@
package org.dromara.maxkey.autoconfigure;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.constants.ConstsTimeInterval;
import org.dromara.maxkey.persistence.repository.InstitutionsRepository;
import org.dromara.maxkey.web.WebInstRequestFilter;
import org.dromara.maxkey.web.WebXssRequestFilter;
@@ -58,6 +59,9 @@ import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.Filter;
@@ -65,6 +69,9 @@ import jakarta.servlet.Filter;
public class MvcAutoConfiguration implements WebMvcConfigurer {
static final Logger _logger = LoggerFactory.getLogger(MvcAutoConfiguration.class);
@Value("${spring.jackson.date-format:yyyy-MM-dd HH:mm:ss}")
private String pattern;
/**
* 消息处理，可以直接使用properties的key值，返回的是对应的value值
* messageSource .
@@ -151,6 +158,13 @@ public class MvcAutoConfiguration implements WebMvcConfigurer {
//mediaTypesList.add(MediaType.TEXT_PLAIN);
_logger.debug("mappingJacksonHttpMessageConverter MediaTypes {}" , mediaTypesList);
mappingJacksonHttpMessageConverter.setSupportedMediaTypes(mediaTypesList);
ObjectMapper objectMapper = mappingJacksonHttpMessageConverter.getObjectMapper();
// 时间格式化
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
_logger.debug("DateFormat {}" , pattern);
objectMapper.setDateFormat(new SimpleDateFormat(pattern));
// 设置格式化内容
mappingJacksonHttpMessageConverter.setObjectMapper(objectMapper);
return mappingJacksonHttpMessageConverter;
}
@@ -165,10 +179,9 @@ public class MvcAutoConfiguration implements WebMvcConfigurer {
String domainName
) {
_logger.debug("DomainName {}" , domainName);
CookieLocaleResolver cookieLocaleResolver = new CookieLocaleResolver();
cookieLocaleResolver.setCookieName("mxk_locale");
CookieLocaleResolver cookieLocaleResolver = new CookieLocaleResolver("mxk_locale");
cookieLocaleResolver.setCookieDomain(domainName);
cookieLocaleResolver.setCookieMaxAge(ConstsTimeInterval.TWO_WEEK);
cookieLocaleResolver.setCookieMaxAge(Duration.ofDays(14));
return cookieLocaleResolver;
}