miemie 5 years ago
parent
commit
9cffb30fe1

+ 2 - 9
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/IdType.java

@@ -47,21 +47,14 @@ public enum IdType {
      */
     ASSIGN_ID(3),
     /**
-     * 分配UUID (主键类型为 string)
-     *
-     * @since 3.3.0
+     * UUID (主键类型为 string)
      */
-    ASSIGN_UUID(4),
+    UUID(4),
     /**
      * @deprecated 3.3.0 please use {@link #ASSIGN_ID}
      */
     @Deprecated
     ID_WORKER(3),
-    /**
-     * @deprecated 3.3.0 please use {@link #ASSIGN_UUID}
-     */
-    @Deprecated
-    UUID(4),
     /**
      * 字符串全局唯一ID (idWorker 的字符串表示)
      *

+ 3 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/GlobalConfig.java

@@ -57,8 +57,8 @@ public class GlobalConfig implements Serializable {
     private static Map<String, IdGenerator> defaultIdGeneratorMap = new ConcurrentHashMap<>();
 
     static {
-        defaultIdGeneratorMap.put(String.valueOf(IdType.ASSIGN_UUID.getKey()),new UUIDGenerator());
-        defaultIdGeneratorMap.put(String.valueOf(IdType.ASSIGN_ID.getKey()),new SnowflakeGenerator());
+        defaultIdGeneratorMap.put(String.valueOf(IdType.UUID.getKey()), new UUIDGenerator());
+        defaultIdGeneratorMap.put(String.valueOf(IdType.ASSIGN_ID.getKey()), new SnowflakeGenerator());
     }
 
     /**
@@ -144,7 +144,7 @@ public class GlobalConfig implements Serializable {
         /**
          * 主键类型(默认 ID_WORKER)
          */
-        private IdType idType = IdType.ID_WORKER;
+        private IdType idType = IdType.ASSIGN_ID;
         /**
          * 表名前缀
          */