From 886ea29c6d4f3a336a3731552ef906a333e856fd Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 7 Jun 2021 10:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=81=9A=E4=B8=80=E4=B8=AA=E5=88=A4=E5=AE=9A=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=A8=A1=E5=9E=8B=E8=AE=BE=E7=BD=AEid=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E5=A4=8D=E7=9B=96=E6=A8=A1=E5=9E=8B=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mybatisplus/MyMetaObjectHandler.java |  5 +++-
 .../base/mybatisplus/MybatisPlusConfig.java   | 23 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java b/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java
index fd966853..e7a2e74f 100644
--- a/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java
+++ b/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java
@@ -29,7 +29,10 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             this.setFieldValByName("deleteFlag", false, metaObject);
         }
         if (metaObject.hasGetter("id")) {
-            this.setFieldValByName("id", String.valueOf(SnowFlake.getId()), metaObject);
+            //如果已经配置id，则不再写入
+            if (metaObject.getValue("id") == null) {
+                this.setFieldValByName("id", String.valueOf(SnowFlake.getId()), metaObject);
+            }
         }
     }
 
diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java b/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java
index 106b0668..1e077800 100644
--- a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java
+++ b/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java
@@ -1,32 +1,31 @@
 package cn.lili.base.mybatisplus;
 
-import com.baomidou.mybatisplus.core.parser.ISqlParser;
-import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author Chopper
  */
 @Configuration
-@MapperScan({"cn.lili.modules.*.*.mapper","cn.lili.modules.*.mapper"})
+@MapperScan({"cn.lili.modules.*.*.mapper", "cn.lili.modules.*.mapper"})
 public class MybatisPlusConfig {
     /**
      * 分页插件，自动识别数据库类型
      */
     @Bean
     public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
 
-        List<ISqlParser> sqlParserList = new ArrayList<>();
-        // 攻击 SQL 阻断解析器、加入解析链
-        sqlParserList.add(new BlockAttackSqlParser());
-        paginationInterceptor.setSqlParserList(sqlParserList);
-        return paginationInterceptor;
+        return new PaginationInterceptor();
+
+        //阻断解析器，测试环境使用
+//        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+//
+//        List<ISqlParser> sqlParserList = new ArrayList<>();
+//        // 攻击 SQL 阻断解析器、加入解析链
+//        sqlParserList.add(new BlockAttackSqlParser());
+//        paginationInterceptor.setSqlParserList(sqlParserList);
+//        return paginationInterceptor;
     }
 }