public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-15 04:52:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

4.0.2

Browse Source
This commit is contained in:
MaxKey
2023-10-09 08:59:49 +08:00
parent b8838cbae8
commit ce87d209c1
23 changed files with 74 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java
View File

@@ -89,7 +89,7 @@ public class ApplicationAutoConfiguration implements InitializingBean {
@Bean
public PasswordEncoder passwordEncoder(
@Value("${maxkey.crypto.password.encoder:bcrypt}") String idForEncode) {
Map<String ,PasswordEncoder > encoders = new HashMap<String ,PasswordEncoder>();
Map<String ,PasswordEncoder > encoders = new HashMap<>();
encoders.put("bcrypt", new BCryptPasswordEncoder());
encoders.put("plain", NoOpPasswordEncoder.getInstance());
encoders.put("pbkdf2", Pbkdf2PasswordEncoder.defaultsForSpringSecurity_v5_8());
@@ -174,8 +174,8 @@ public class ApplicationAutoConfiguration implements InitializingBean {
@Value("${maxkey.id.datacenterId:0}") int datacenterId,
@Value("${maxkey.id.machineId:0}") int machineId) {
IdGenerator idGenerator = new IdGenerator(strategy);
SnowFlakeId SnowFlakeId = new SnowFlakeId(datacenterId,machineId);
idGenerator.setSnowFlakeId(SnowFlakeId);
SnowFlakeId snowFlakeId = new SnowFlakeId(datacenterId,machineId);
idGenerator.setSnowFlakeId(snowFlakeId);
WebContext.idGenerator = idGenerator;
return idGenerator;
}
@@ -184,14 +184,13 @@ public class ApplicationAutoConfiguration implements InitializingBean {
@Bean
public MomentaryService momentaryService(
RedisConnectionFactory redisConnFactory,
@Value("${maxkey.server.persistence}") int persistence) throws JOSEException {
@Value("${maxkey.server.persistence}") int persistence) {
MomentaryService momentaryService;
if (persistence == ConstsPersistence.REDIS) {
momentaryService = new RedisMomentaryService(redisConnFactory);
}else {
momentaryService = new InMemoryMomentaryService();
}
return momentaryService;
}

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

@@ -75,11 +75,10 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
public ReloadableResourceBundleMessageSource reloadableResourceBundleMessageSource(
@Value("${spring.messages.basename:classpath:messages/message}")
String messagesBasename) {
_logger.debug("Basename " + messagesBasename);
_logger.debug("Basename {}" , messagesBasename);
String passwordPolicyMessagesBasename="classpath:messages/passwordpolicy_message";
ReloadableResourceBundleMessageSource messageSource =
new ReloadableResourceBundleMessageSource();
ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
messageSource.setBasenames(messagesBasename,passwordPolicyMessagesBasename);
messageSource.setUseCodeAsDefaultMessage(false);
return messageSource;
@@ -92,27 +91,11 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
//@Primary
@Bean (name = "localeChangeInterceptor")
public LocaleChangeInterceptor localeChangeInterceptor() {
LocaleChangeInterceptor localeChangeInterceptor =
new LocaleChangeInterceptor();
LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor();
localeChangeInterceptor.setParamName("language");
return localeChangeInterceptor;
}
/**
* upload file support .
* @return multipartResolver
*/
/*
@Bean (name = "multipartResolver")
public CommonsMultipartResolver commonsMultipartResolver(
@Value("${spring.servlet.multipart.max-file-size:0}") int maxUploadSize) {
_logger.debug("maxUploadSize " + maxUploadSize);
CommonsMultipartResolver multipartResolver =
new CommonsMultipartResolver();
multipartResolver.setMaxUploadSize(maxUploadSize);
return multipartResolver;
}*/
/**
* handlerMapping .
* @return handlerMapping
@@ -120,8 +103,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
@Bean (name = "handlerMapping")
public RequestMappingHandlerMapping requestMappingHandlerMapping(
LocaleChangeInterceptor localeChangeInterceptor) {
RequestMappingHandlerMapping requestMappingHandlerMapping =
new RequestMappingHandlerMapping();
RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
requestMappingHandlerMapping.setInterceptors(localeChangeInterceptor);
return requestMappingHandlerMapping;
}
@@ -144,15 +126,14 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
@Bean (name = "marshallingHttpMessageConverter")
public MarshallingHttpMessageConverter marshallingHttpMessageConverter(
Jaxb2Marshaller jaxb2Marshaller) {
MarshallingHttpMessageConverter marshallingHttpMessageConverter =
new MarshallingHttpMessageConverter();
MarshallingHttpMessageConverter marshallingHttpMessageConverter = new MarshallingHttpMessageConverter();
marshallingHttpMessageConverter.setMarshaller(jaxb2Marshaller);
marshallingHttpMessageConverter.setUnmarshaller(jaxb2Marshaller);
ArrayList<MediaType> mediaTypesList = new ArrayList<MediaType>();
ArrayList<MediaType> mediaTypesList = new ArrayList<>();
mediaTypesList.add(MediaType.APPLICATION_XML);
mediaTypesList.add(MediaType.TEXT_XML);
mediaTypesList.add(MediaType.TEXT_PLAIN);
_logger.debug("marshallingHttpMessageConverter MediaTypes " + mediaTypesList);
_logger.debug("marshallingHttpMessageConverter MediaTypes {}" , mediaTypesList);
marshallingHttpMessageConverter.setSupportedMediaTypes(mediaTypesList);
return marshallingHttpMessageConverter;
}
@@ -163,14 +144,13 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
*/
@Bean (name = "mappingJacksonHttpMessageConverter")
public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter =
new MappingJackson2HttpMessageConverter();
ArrayList<MediaType> mediaTypesList = new ArrayList<MediaType>();
MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter = new MappingJackson2HttpMessageConverter();
ArrayList<MediaType> mediaTypesList = new ArrayList<>();
mediaTypesList.add(MediaType.APPLICATION_JSON);
mediaTypesList.add(MediaType.valueOf(ApiVersion.V2.getProducedMimeType().toString()));
mediaTypesList.add(MediaType.valueOf(ApiVersion.V3.getProducedMimeType().toString()));
//mediaTypesList.add(MediaType.TEXT_PLAIN);
_logger.debug("mappingJacksonHttpMessageConverter MediaTypes " + mediaTypesList);
_logger.debug("mappingJacksonHttpMessageConverter MediaTypes {}" , mediaTypesList);
mappingJacksonHttpMessageConverter.setSupportedMediaTypes(mediaTypesList);
return mappingJacksonHttpMessageConverter;
}
@@ -185,7 +165,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
@Value("${maxkey.server.domain:maxkey.top}")
String domainName
) {
_logger.debug("DomainName " + domainName);
_logger.debug("DomainName {}" , domainName);
CookieLocaleResolver cookieLocaleResolver = new CookieLocaleResolver();
cookieLocaleResolver.setCookieName("mxk_locale");
cookieLocaleResolver.setCookieDomain(domainName);
@@ -204,8 +184,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
MarshallingHttpMessageConverter marshallingHttpMessageConverter,
StringHttpMessageConverter stringHttpMessageConverter,
RequestMappingHandlerAdapter requestMappingHandlerAdapter) {
List<HttpMessageConverter<?>> httpMessageConverterList =
new ArrayList<HttpMessageConverter<?>>();
List<HttpMessageConverter<?>> httpMessageConverterList = new ArrayList<>();
httpMessageConverterList.add(mappingJacksonHttpMessageConverter);
httpMessageConverterList.add(marshallingHttpMessageConverter);
httpMessageConverterList.add(stringHttpMessageConverter);
@@ -224,8 +203,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter,
MarshallingHttpMessageConverter marshallingHttpMessageConverter) {
RestTemplate restTemplate = new RestTemplate();
List<HttpMessageConverter<?>> httpMessageConverterList =
new ArrayList<HttpMessageConverter<?>>();
List<HttpMessageConverter<?>> httpMessageConverterList = new ArrayList<>();
httpMessageConverterList.add(mappingJacksonHttpMessageConverter);
httpMessageConverterList.add(marshallingHttpMessageConverter);
restTemplate.setMessageConverters(httpMessageConverterList);
@@ -279,7 +257,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
@Bean
public FilterRegistrationBean<Filter> delegatingFilterProxy() {
_logger.debug("delegatingFilterProxy init for /* ");
FilterRegistrationBean<Filter> registrationBean = new FilterRegistrationBean<Filter>();
FilterRegistrationBean<Filter> registrationBean = new FilterRegistrationBean<>();
registrationBean.setFilter(new DelegatingFilterProxy("securityContextHolderAwareRequestFilter"));
registrationBean.addUrlPatterns("/*");
//registrationBean.
@@ -292,7 +270,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
@Bean
public FilterRegistrationBean<Filter> webXssRequestFilter() {
_logger.debug("webXssRequestFilter init for /* ");
FilterRegistrationBean<Filter> registrationBean = new FilterRegistrationBean<Filter>(new WebXssRequestFilter());
FilterRegistrationBean<Filter> registrationBean = new FilterRegistrationBean<>(new WebXssRequestFilter());
registrationBean.addUrlPatterns("/*");
registrationBean.setName("webXssRequestFilter");
registrationBean.setOrder(3);
@@ -300,12 +278,12 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
}
@Bean
public FilterRegistrationBean<Filter> WebInstRequestFilter(
public FilterRegistrationBean<Filter> webInstRequestFilter(
InstitutionsRepository institutionsRepository,
ApplicationConfig applicationConfig) {
_logger.debug("WebInstRequestFilter init for /* ");
FilterRegistrationBean<Filter> registrationBean =
new FilterRegistrationBean<Filter>(new WebInstRequestFilter(institutionsRepository,applicationConfig));
new FilterRegistrationBean<>(new WebInstRequestFilter(institutionsRepository,applicationConfig));
registrationBean.addUrlPatterns("/*");
registrationBean.setName("webInstRequestFilter");
registrationBean.setOrder(4);

5
maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java
View File

@@ -201,10 +201,7 @@ public class ApplicationConfig {
}
public boolean isProvisionSupport() {
if(provision) {
return true;
}
return false;
return provision;
}
public String getMgtUri() {

22
maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java
View File

@@ -92,17 +92,14 @@ public class InitializeContext extends HttpServlet {
public void listDataBaseVariables() {
if (!applicationContext.containsBean("dataSource")) {return;}
try {
logger.debug(WebConstants.DELIMITER);
logger.debug("List DatabaseMetaData Variables ");
Connection connection =
((javax.sql.DataSource) applicationContext.getBean("dataSource"))
.getConnection();
logger.info(WebConstants.DELIMITER);
logger.info("List DatabaseMetaData Variables ");
Connection connection = ((javax.sql.DataSource) applicationContext.getBean("dataSource")).getConnection();
DatabaseMetaData databaseMetaData = connection.getMetaData();
ApplicationConfig.databaseProduct = databaseMetaData.getDatabaseProductName();
logger.debug("DatabaseProductName : {}", databaseMetaData.getDatabaseProductName());
logger.debug("DatabaseProductVersion: {}" ,databaseMetaData.getDatabaseProductVersion());
logger.info("DatabaseProductName : {}", databaseMetaData.getDatabaseProductName());
logger.info("DatabaseProductVersion: {}" ,databaseMetaData.getDatabaseProductVersion());
logger.trace("DatabaseMajorVersion : {}" , databaseMetaData.getDatabaseMajorVersion());
logger.trace("DatabaseMinorVersion : {}" ,databaseMetaData.getDatabaseMinorVersion());
logger.trace("supportsTransactions : {}" , databaseMetaData.supportsTransactions());
@@ -113,13 +110,12 @@ public class InitializeContext extends HttpServlet {
logger.trace("JDBCMinorVersion : {}" ,databaseMetaData.getJDBCMinorVersion());
logger.trace("DriverName : {}" ,databaseMetaData.getDriverName());
logger.trace("DriverVersion : {}" ,databaseMetaData.getDriverVersion());
logger.debug("");
logger.debug("DBMS URL : {}" ,databaseMetaData.getURL());
logger.debug("UserName : {}" ,databaseMetaData.getUserName());
logger.debug(WebConstants.DELIMITER);
logger.info("");
logger.info("DBMS URL : {}" ,databaseMetaData.getURL());
logger.info("UserName : {}" ,databaseMetaData.getUserName());
logger.info(WebConstants.DELIMITER);
} catch (SQLException e) {
e.printStackTrace();
logger.error("DatabaseMetaData Variables Error .",e);
}
}

32
maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java
View File

@@ -60,14 +60,13 @@ import jakarta.servlet.http.HttpSession;
*
*/
public final class WebContext {
final static Logger _logger = LoggerFactory.getLogger(WebContext.class);
static final Logger _logger = LoggerFactory.getLogger(WebContext.class);
public static StandardEnvironment properties;
public static ApplicationContext applicationContext;
public final static String ipAddressRegex = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}";
public static final String ipAddressRegex = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}";
public static ArrayList<String> sessionAttributeNameList = new ArrayList<String>();
@@ -146,7 +145,11 @@ public final class WebContext {
}else {
return applicationContext.getBean(name,requiredType);
}
};
}
public static String getProperty(String key) {
return properties.getProperty(key);
}
// below method is common HttpServlet method
/**
@@ -155,13 +158,11 @@ public final class WebContext {
* @return HttpServletRequest
*/
public static HttpServletRequest getRequest() {
return ((ServletRequestAttributes)
RequestContextHolder.getRequestAttributes()).getRequest();
return ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
}
public static HttpServletResponse getResponse() {
return ((ServletRequestAttributes)
RequestContextHolder.getRequestAttributes()).getResponse();
return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
}
/**
@@ -205,14 +206,14 @@ public final class WebContext {
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement();
String key = headerNames.nextElement();
String value = request.getHeader(key);
_logger.info("Header key {} , value {}" , key, value);
}
Enumeration<String> parameterNames = request.getParameterNames();
while (parameterNames.hasMoreElements()) {
String key = (String) parameterNames.nextElement();
String key = parameterNames.nextElement();
String value = request.getParameter(key);
_logger.info("Parameter {} , value {}",key , value);
}
@@ -233,7 +234,7 @@ public final class WebContext {
* @return HttpSession
*/
public static HttpSession getSession(boolean create) {
System.out.println("new Session created");
_logger.info("new Session created");
return getRequest().getSession(create);
}
@@ -314,7 +315,7 @@ public final class WebContext {
}
public static Map<String, String> getRequestParameterMap(HttpServletRequest request) {
Map<String, String> map = new HashMap<String, String>();
Map<String, String> map = new HashMap<>();
Map<String, String[]> parameters = request.getParameterMap();
for (String key : parameters.keySet()) {
String[] values = parameters.get(key);
@@ -333,8 +334,7 @@ public final class WebContext {
public static Cookie getCookie(HttpServletRequest request, String name) {
Map<String, Cookie> cookieMap = getCookieAll(request);
if (cookieMap.containsKey(name)) {
Cookie cookie = (Cookie) cookieMap.get(name);
return cookie;
return cookieMap.get(name);
} else {
return null;
}
@@ -347,7 +347,7 @@ public final class WebContext {
* @return Map
*/
private static Map<String, Cookie> getCookieAll(HttpServletRequest request) {
Map<String, Cookie> cookieMap = new HashMap<String, Cookie>();
Map<String, Cookie> cookieMap = new HashMap<>();
Cookie[] cookies = request.getCookies();
if (null != cookies) {
for (Cookie cookie : cookies) {
@@ -536,7 +536,7 @@ public final class WebContext {
version.append("-----------------------------------------------------------");
version.append("+ MaxKey Community Edition ");
version.append("+ Single Sign On ( SSO ) ");
version.append("+ Version {}".formatted(
version.append("+ Version %s".formatted(
WebContext.properties.getProperty("application.formatted-version")));
version.append("+");
version.append("+ {}Copyright 2018 - {} https://www.maxkey.top/",