From ef27ee0a28dd02f0d1aeefa5d5ae29c52ff0fec8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 16 四月 2021 11:36:47 +0800
Subject: [PATCH] !15 同步 ruoyi Merge pull request !15 from 疯狂的狮子li/dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java | 40 +++++++++-------------------------------
1 files changed, 9 insertions(+), 31 deletions(-)
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 9efbb96..ea5e05b 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
@@ -2,16 +2,10 @@
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
-import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
-import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
-import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.IllegalSQLInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.ruoyi.framework.mybatisplus.CreateAndUpdateMetaObjectHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -28,7 +22,7 @@
// 涔愯閿佹彃浠�
interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
// 闃绘柇鎻掍欢
- interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+// interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
return interceptor;
}
@@ -57,9 +51,9 @@
* 濡傛灉鏄鍏ㄨ〃鐨勫垹闄ゆ垨鏇存柊鎿嶄綔锛屽氨浼氱粓姝㈣鎿嶄綔
* https://baomidou.com/guide/interceptor-block-attack.html
*/
- public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
- return new BlockAttackInnerInterceptor();
- }
+// public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
+// return new BlockAttackInnerInterceptor();
+// }
/**
* sql鎬ц兘瑙勮寖鎻掍欢(鍨冨溇SQL鎷︽埅)
@@ -67,22 +61,6 @@
*/
// public IllegalSQLInnerInterceptor illegalSQLInnerInterceptor() {
// return new IllegalSQLInnerInterceptor();
-// }
-
- /**
- * Sequence涓婚敭绛栫暐 IdType.INPUT 鏃朵娇鐢�
- * 鍐呯疆鏀寔锛�
- *
- * DB2KeyGenerator
- * H2KeyGenerator
- * KingbaseKeyGenerator
- * OracleKeyGenerator
- * PostgreKeyGenerator
- * https://baomidou.com/guide/sequence.html
- */
-// @Bean
-// public IKeyGenerator keyGenerator() {
-// return new H2KeyGenerator();
// }
@@ -99,10 +77,10 @@
* 鍏冨璞″瓧娈靛~鍏呮帶鍒跺櫒
* https://baomidou.com/guide/auto-fill-metainfo.html
*/
-// @Bean
-// public MetaObjectHandler metaObjectHandler() {
-// return new MyMetaObjectHandler();
-// }
+ @Bean
+ public MetaObjectHandler metaObjectHandler() {
+ return new CreateAndUpdateMetaObjectHandler();
+ }
/**
* sql娉ㄥ叆鍣ㄩ厤缃�
--
Gitblit v1.9.3