From 2cdc12055d597c7c25e2e83b24ebf32053f18757 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 六月 2021 13:15:18 +0800
Subject: [PATCH] fix 修复 JsonUtils 参数为空报错
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java | 57 +++++++++++++++++----------------------------------------
1 files changed, 17 insertions(+), 40 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 7f46a75..bce2150 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,24 +1,25 @@
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;
-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.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
+/**
+ * mybatis-plus閰嶇疆绫�
+ *
+ * @author Lion Li
+ */
@EnableTransactionManagement(proxyTargetClass = true)
@Configuration
+// 鎸囧畾瑕佹壂鎻忕殑Mapper绫荤殑鍖呯殑璺緞
+@MapperScan("${mybatis-plus.mapperPackage}")
public class MybatisPlusConfig {
@Bean
@@ -29,7 +30,7 @@
// 涔愯閿佹彃浠�
interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
// 闃绘柇鎻掍欢
- interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+// interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
return interceptor;
}
@@ -47,14 +48,6 @@
}
/**
- * 鏂扮殑鍒嗛〉鎻掍欢,涓�缂撳拰浜岀紦閬靛惊mybatis鐨勮鍒�,闇�瑕佽缃� MybatisConfiguration#useDeprecatedExecutor = false 閬垮厤缂撳瓨鍑虹幇闂(璇ュ睘鎬т細鍦ㄦ棫鎻掍欢绉婚櫎鍚庝竴鍚岀Щ闄�)
- */
- @Bean
- public ConfigurationCustomizer configurationCustomizer() {
- return configuration -> configuration.setUseDeprecatedExecutor(false);
- }
-
- /**
* 涔愯閿佹彃浠�
* https://baomidou.com/guide/interceptor-optimistic-locker.html
*/
@@ -66,9 +59,9 @@
* 濡傛灉鏄鍏ㄨ〃鐨勫垹闄ゆ垨鏇存柊鎿嶄綔锛屽氨浼氱粓姝㈣鎿嶄綔
* https://baomidou.com/guide/interceptor-block-attack.html
*/
- public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
- return new BlockAttackInnerInterceptor();
- }
+// public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
+// return new BlockAttackInnerInterceptor();
+// }
/**
* sql鎬ц兘瑙勮寖鎻掍欢(鍨冨溇SQL鎷︽埅)
@@ -76,22 +69,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();
// }
@@ -108,10 +85,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