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

bug修复+代码调整+日志优化

Browse Source
This commit is contained in:
MaxKey
2024-09-29 07:10:13 +08:00
parent 65bc8c01b9
commit 8fe411648d
55 changed files with 724 additions and 5990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java
View File

@@ -123,7 +123,7 @@ public class MvcAutoConfiguration implements WebMvcConfigurer {
@Bean(name = "jaxb2Marshaller")
Jaxb2Marshaller jaxb2Marshaller() {
Jaxb2Marshaller jaxb2Marshaller = new Jaxb2Marshaller();
jaxb2Marshaller.setClassesToBeBound(org.dromara.maxkey.entity.xml.UserInfoXML.class);;
jaxb2Marshaller.setClassesToBeBound(org.dromara.maxkey.entity.xml.UserInfoXML.class);
return jaxb2Marshaller;
}

4
maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java
View File

@@ -17,6 +17,8 @@
package org.dromara.maxkey.autoconfigure;
import java.time.Duration;
import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +72,7 @@ public class RedisAutoConfiguration {
poolConfig.setMaxIdle(maxIdle);
poolConfig.setMinIdle(minIdle);
poolConfig.setMaxTotal(maxActive);
poolConfig.setMaxWaitMillis(maxWait);
poolConfig.setMaxWait(Duration.ofMillis(maxWait));
factory.setPoolConfig(poolConfig);