更名.

车门焊死.

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisDefaultParameterHandler.java

@@ -167,12 +167,12 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
                     if (IdType.ASSIGN_ID.getKey() == tableInfo.getIdType().getKey()) {
                         // 应该只有数值型和字符串的区别了.
                         if (Number.class.isAssignableFrom(tableInfo.getKeyType())) {
-                            metaObject.setValue(tableInfo.getKeyProperty(), idGenerator.generateId(parameterObject));
+                            metaObject.setValue(tableInfo.getKeyProperty(), idGenerator.nextId(parameterObject));
                         } else {
-                            metaObject.setValue(tableInfo.getKeyProperty(), idGenerator.generateId(parameterObject).toString());
+                            metaObject.setValue(tableInfo.getKeyProperty(), idGenerator.nextId(parameterObject).toString());
                         }
                     } else if (IdType.UUID.getKey() == tableInfo.getIdType().getKey()) {
-                        metaObject.setValue(tableInfo.getKeyProperty(), idGenerator.generateUUID(parameterObject));
+                        metaObject.setValue(tableInfo.getKeyProperty(), idGenerator.nextUUID(parameterObject));
                     }
                 }
             });

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/incrementer/DefaultGenerator.java

@@ -41,7 +41,7 @@ public class DefaultGenerator implements IdGenerator {
     }
 
     @Override
-    public Long generateId(Object entity) {
+    public Long nextId(Object entity) {
         return sequence.nextId();
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/incrementer/IdGenerator.java

@@ -18,7 +18,6 @@ package com.baomidou.mybatisplus.core.incrementer;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 
-import java.io.Serializable;
 
 /**
  * Id生成器接口
@@ -35,7 +34,7 @@ public interface IdGenerator {
      * @param entity 实体
      * @return id
      */
-    Serializable generateId(Object entity);
+    Number nextId(Object entity);
 
     /**
      * 生成uuid
@@ -43,7 +42,7 @@ public interface IdGenerator {
      * @param entity 实体
      * @return uuid
      */
-    default String generateUUID(Object entity) {
+    default String nextUUID(Object entity) {
         return IdWorker.get32UUID();
     }
 

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/IdWorker.java

@@ -54,7 +54,7 @@ public class IdWorker {
      */
     @Deprecated
     public static long getId() {
-        return Long.parseLong(ID_GENERATOR.generateId(new Object()).toString());
+        return (long) ID_GENERATOR.nextId(new Object());
     }
 
     /**
@@ -65,7 +65,7 @@ public class IdWorker {
      */
     @Deprecated
     public static String getIdStr() {
-        return String.valueOf(ID_GENERATOR.generateId(new Object()));
+        return String.valueOf(ID_GENERATOR.nextId(new Object()));
     }
 
     /**

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/idgenerator/CustomIdGenerator.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.reflection.SystemMetaObject;
 public class CustomIdGenerator implements IdGenerator {
 
     @Override
-    public Number generateId(Object entity) {
+    public Number nextId(Object entity) {
         //可以将当前传入的class全类名来作为bizKey,或者提取参数来生成bizKey进行分布式Id调用生成.
         String bizKey = entity.getClass().getName();
         TableInfo tableInfo = TableInfoHelper.getTableInfo(entity.getClass());
@@ -34,7 +34,7 @@ public class CustomIdGenerator implements IdGenerator {
     }
 
     @Override
-    public String generateUUID(Object entity) {
+    public String nextUUID(Object entity) {
         String name = (String) SystemMetaObject.forObject(entity).getValue("name");
         if ("旺仔".equals(name)) {
             return "66666666666";