From 3362ce5f33bcf15c1e86b940745e8482ab4d1666 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 一月 2021 15:55:24 +0800
Subject: [PATCH] 升级 MybatisPlus 3.4.2
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java | 9 ---------
pom.xml | 2 +-
ruoyi-admin/src/main/resources/application.yml | 2 +-
README.md | 2 +-
4 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 1d499b1..a51e881 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
* 瀹瑰櫒鏀瑰姩 Tomcat 鏀逛负 骞跺彂鎬ц兘鏇村ソ鐨� undertow
* 浠ｇ爜鐢熸垚妯℃澘 鏀逛负閫傞厤 Mybatis-Plus 鐨勪唬鐮�
* 椤圭洰淇敼涓� maven澶氱幆澧冮厤缃�
-* 閲嶇鏇存柊 鍗囩骇MybatisPlus 3.4.1 閲嶅啓閰嶇疆鏂囦欢璇︾粏娉ㄩ噴 鏇存柊鎵�鏈夋彃浠�
+* 鍗囩骇MybatisPlus 3.4.2
* 澧炲姞demo妯″潡绀轰緥(缁欎笉浼氬鍔犳ā鍧楃殑灏忎紮浼村仛鍙傝��)
* 鍚屾鍗囩骇 3.3
diff --git a/pom.xml b/pom.xml
index 5e01366..2b8a33f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.1</mybatis-plus.version>
+ <mybatis-plus.version>3.4.2</mybatis-plus.version>
<hutool.version>5.4.0</hutool.version>
</properties>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4e0d2b7..57a9344 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -84,7 +84,7 @@
# https://baomidou.com/config/
mybatis-plus:
# 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
- mapper-locations: classpath*:mapper/**/*Mapper.xml
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
# 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
typeAliasesPackage: com.ruoyi.**.domain
# 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
index 7f46a75..9efbb96 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
@@ -1,7 +1,6 @@
package com.ruoyi.framework.config;
import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
@@ -44,14 +43,6 @@
// 璁剧疆鏈�澶у崟椤甸檺鍒舵暟閲忥紝榛樿 500 鏉★紝-1 涓嶅彈闄愬埗
paginationInnerInterceptor.setMaxLimit(-1L);
return paginationInnerInterceptor;
- }
-
- /**
- * 鏂扮殑鍒嗛〉鎻掍欢,涓�缂撳拰浜岀紦閬靛惊mybatis鐨勮鍒�,闇�瑕佽缃� MybatisConfiguration#useDeprecatedExecutor = false 閬垮厤缂撳瓨鍑虹幇闂(璇ュ睘鎬т細鍦ㄦ棫鎻掍欢绉婚櫎鍚庝竴鍚岀Щ闄�)
- */
- @Bean
- public ConfigurationCustomizer configurationCustomizer() {
- return configuration -> configuration.setUseDeprecatedExecutor(false);
}
/**
--
Gitblit v1.9.3