diff --git a/pom.xml b/pom.xml index 023d380f..d9729ffe 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,6 @@ 8800 8801 - 8802 8080 @@ -37,14 +36,14 @@ 11 x86_64-alpine-jre-11.0.10_9 - 2.8.0 + 3.1.1 2020.0.3 1.0.0.M5 - 2.4.0 - 2.4.0 - 1.2.5 - 3.4.2 - 5.6.6 + 2.4.1 + 2.4.1 + 1.2.6 + 3.4.3.1 + 5.7.2 30.0-jre 2.0.8 0.11.2 @@ -52,7 +51,7 @@ 2.2.6 5.0.0 6.6 - 8.2.1 + 8.2.2 1.26 @@ -65,8 +64,8 @@ spring-boot-admin api-gateway auth-center - maf-mis static-resource-center + maf-mis @@ -159,13 +158,11 @@ - GitHub https://github.com/johnnymillergh/muscle-and-fitness-server/issues - ${project.artifactId}-${project.version} diff --git a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java index 98b97aed..64fa1e42 100644 --- a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java +++ b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java @@ -1,7 +1,6 @@ package com.jmsoftware.maf.springcloudstarter.database; import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; @@ -34,14 +33,6 @@ public BlockAttackInnerInterceptor blockAttackInnerInterceptor() { return new BlockAttackInnerInterceptor(); } - @Bean - public ConfigurationCustomizer configurationCustomizer() { - log.warn("Initial bean: '{}'", ConfigurationCustomizer.class.getSimpleName()); - // 新的分页插件，一缓和二缓遵循 MyBatis 的规则。 - // 需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题（该属性会在旧插件移除后一同移除） - return configuration -> configuration.setUseDeprecatedExecutor(false); - } - /** * Mybatis plus interceptor mybatis plus interceptor. * diff --git a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/util/TreeUtil.java b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/util/TreeUtil.java index 258a87ab..c48018b1 100644 --- a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/util/TreeUtil.java +++ b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/util/TreeUtil.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import com.google.common.collect.Maps; import com.jmsoftware.maf.springcloudstarter.annotation.TreeElement; import java.beans.BeanInfo; @@ -21,6 +22,7 @@ * * @author Johnny Miller (锺俊), email: johnnysviva@outlook.com, date: 5/28/2021 4:27 PM */ +@SuppressWarnings("unused") public class TreeUtil { /** * Convert List to Tree @@ -37,16 +39,14 @@ public static List listToTree(List list, String rootNode) throws Illeg IntrospectionException, InvocationTargetException { // Root node collection List rootList = new ArrayList<>(); - HashMap> parentIdToTree = CollUtil.newHashMap(list.size()); + HashMap> parentIdToTree = Maps.newHashMap(); for (final T t : list) { Object value = getValue(t, TreeElementType.PARENT_ID); if (ObjectUtil.isNotNull(value)) { if (ObjectUtil.isNotNull(parentIdToTree.get(value))) { parentIdToTree.get(value).add(t); } else { - parentIdToTree.put(value, new ArrayList<>() {{ - this.add(t); - }}); + parentIdToTree.put(value, CollUtil.newArrayList(t)); } if (rootNode.equals(value)) { rootList.add(t); diff --git a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/validation/validator/DateTimeRangeValidator.java b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/validation/validator/DateTimeRangeValidator.java index 4bd2eae2..90f73b91 100644 --- a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/validation/validator/DateTimeRangeValidator.java +++ b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/validation/validator/DateTimeRangeValidator.java @@ -23,6 +23,7 @@ **/ @Slf4j public class DateTimeRangeValidator implements ConstraintValidator { + private static final int DEFAULT_HASH_MAP_CAPACITY = 8; public static final int MAX_GROUP_SIZE = 2; @Override @@ -40,7 +41,7 @@ public boolean isValid(Object value, ConstraintValidatorContext context) { DateTimeRangeGroup.class.getSimpleName()); return true; } - final HashMap> dateTimeRangeGroupMap = CollUtil.newHashMap(fields.length); + final HashMap> dateTimeRangeGroupMap = new HashMap<>(DEFAULT_HASH_MAP_CAPACITY); for (val field : annotatedFieldSet) { val annotation = field.getAnnotation(DateTimeRangeGroup.class); if (!dateTimeRangeGroupMap.containsKey(annotation.groupName())) { @@ -48,7 +49,8 @@ public boolean isValid(Object value, ConstraintValidatorContext context) { } else { dateTimeRangeGroupMap.get(annotation.groupName()).add(field); if (dateTimeRangeGroupMap.get(annotation.groupName()).size() > MAX_GROUP_SIZE) { - log.error("The length of DateTimeRangeGroup({}) cannot exceed {}!", annotation.groupName(), MAX_GROUP_SIZE); + log.error("The length of DateTimeRangeGroup({}) cannot exceed {}!", annotation.groupName(), + MAX_GROUP_SIZE); return false; } }