diff --git a/pom.xml b/pom.xml index 1ea9112..06ff9d9 100644 --- a/pom.xml +++ b/pom.xml @@ -184,17 +184,7 @@ - - com.baomidou - mybatis-plus-boot-starter - 3.5.2 - - - org.projectlombok - lombok - 1.18.24 - diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index a11f82d..703c66c 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -100,6 +100,13 @@ provided + + com.baomidou + mybatis-plus-boot-starter + 3.4.1 + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 15bf66b..35d0548 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +21,7 @@ public class BaseEntity implements Serializable /** 搜索值 */ @JsonIgnore + @TableField(exist=false) private String searchValue; /** 创建者 */ @@ -40,6 +43,7 @@ public class BaseEntity implements Serializable /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist=false) private Map params; public String getSearchValue() diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index 057c941..5cd1b7f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -6,6 +6,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import javax.sql.DataSource; + +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import org.apache.ibatis.io.VFS; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; @@ -122,7 +124,7 @@ public class MyBatisConfig typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); VFS.addImplClass(SpringBootVFS.class); - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); + final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean(); sessionFactory.setDataSource(dataSource); sessionFactory.setTypeAliasesPackage(typeAliasesPackage); sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 9ea09b9..50fb986 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -22,13 +22,6 @@ com.ruoyi ruoyi-common - - - - com.baomidou - mybatis-plus-boot-starter - 3.5.2 - org.projectlombok lombok diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml index 7d3d95f..8cd7964 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml @@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + +