fuhouyin/mybatis-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步代码.

Browse Source
This commit is contained in:
nieqiurong 2023-09-17 14:55:44 +08:00
parent d1c7b8dfdc
commit 24d436e48f
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -15,8 +15,8 @@ ext {
mybatisSpringVersion = '2.1.1',
mybatisSpring3Version = '3.0.2',
mybatisSpringBootStarterVersion = '2.3.1',
springVersion = '5.3.15',
springBootVersion = '2.5.3',
springVersion = '5.3.27',
springBootVersion = '2.5.15',
springBoot3Version = '3.1.3',
springCloudVersion = '3.1.1',
jsqlparserVersion = '4.6',

3
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/toolkit/LambdaUtilsTest.java
View File

@ -21,8 +21,6 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
import lombok.Getter;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandleProxies;
@ -41,7 +39,6 @@ class LambdaUtilsTest {
* 测试解析
*/
@Test
@EnabledOnJre(JRE.JAVA_8)
@SuppressWarnings("unchecked")
void testExtract() throws IllegalAccessException, NoSuchMethodException {
SFunction<TestModel, Object> function = TestModel::getName;

2
spring-boot-starter/mybatis-plus-spring-boot-autoconfigure/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.java
View File

@ -384,7 +384,7 @@ public class MybatisPlusAutoConfiguration implements InitializingBean {
* If mapper registering configuration or mapper scanning configuration not present, this configuration allow to scan
* mappers based on the same component-scanning path as Spring Boot itself.
*/
@org.springframework.context.annotation.Configuration
@org.springframework.context.annotation.Configuration(proxyBeanMethods = false)
@Import(AutoConfiguredMapperScannerRegistrar.class)
@ConditionalOnMissingBean({MapperFactoryBean.class, MapperScannerConfigurer.class})
public static class MapperScannerRegistrarNotFoundConfiguration implements InitializingBean {

10
spring-boot-starter/mybatis-plus-spring-boot-autoconfigure/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusLanguageDriverAutoConfiguration.java
View File

@ -56,7 +56,7 @@ public class MybatisPlusLanguageDriverAutoConfiguration {
/**
* Configuration class for mybatis-freemarker 1.1.x or under.
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(FreeMarkerLanguageDriver.class)
@ConditionalOnMissingClass("org.mybatis.scripting.freemarker.FreeMarkerLanguageDriverConfig")
public static class LegacyFreeMarkerConfiguration {
@ -70,7 +70,7 @@ public class MybatisPlusLanguageDriverAutoConfiguration {
/**
* Configuration class for mybatis-freemarker 1.2.x or above.
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({FreeMarkerLanguageDriver.class, FreeMarkerLanguageDriverConfig.class})
public static class FreeMarkerConfiguration {
@Bean
@ -90,7 +90,7 @@ public class MybatisPlusLanguageDriverAutoConfiguration {
/**
* Configuration class for mybatis-velocity 2.0 or under.
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(org.mybatis.scripting.velocity.Driver.class)
@ConditionalOnMissingClass("org.mybatis.scripting.velocity.VelocityLanguageDriverConfig")
@SuppressWarnings("deprecation")
@ -112,7 +112,7 @@ public class MybatisPlusLanguageDriverAutoConfiguration {
/**
* Configuration class for mybatis-velocity 2.1.x or above.
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({VelocityLanguageDriver.class, VelocityLanguageDriverConfig.class})
public static class VelocityConfiguration {
@Bean
@ -129,7 +129,7 @@ public class MybatisPlusLanguageDriverAutoConfiguration {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ThymeleafLanguageDriver.class)
public static class ThymeleafConfiguration {
@Bean