Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-api-boot into 3.x

basic-auth/src/main/java/com/yiring/auth/domain/permission/Permission.java

@@ -87,7 +87,7 @@ public class Permission extends BasicEntity implements Serializable {
     Boolean hidden;
 
     @Comment("是否禁用")
-    @Column(columnDefinition = "bool default false")
+    @Column(columnDefinition = "bool default false", nullable = false)
     Boolean disabled;
 
     @Comment("权限父级ID")

basic-auth/src/main/java/com/yiring/auth/domain/role/Role.java

@@ -61,7 +61,7 @@ public class Role extends BasicEntity implements Serializable {
     String name;
 
     @Comment("是否禁用")
-    @Column(columnDefinition = "bool default false")
+    @Column(columnDefinition = "bool default false", nullable = false)
     Boolean disabled;
 
     @JsonIgnore

basic-auth/src/main/java/com/yiring/auth/util/Permissions.java

@@ -81,7 +81,7 @@ public class Permissions {
      * @param menus 菜单集合
      * @return 排序后的菜单集合
      */
-    public static List<MenuVo> sortMenuTreeVo(@Nullable List<MenuVo> menus) {
+    public static List<MenuVo> sortMenuTreeVo(List<MenuVo> menus) {
         return menus
             .stream()
             .sorted(

basic-common/core/src/main/java/com/yiring/common/domain/BasicEntity.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.common.domain;
 
+import com.yiring.common.snowflake.GenerateStringId;
 import com.yiring.common.snowflake.SnowflakeId;
 import jakarta.persistence.*;
 import java.time.LocalDateTime;
@@ -40,7 +41,7 @@ public class BasicEntity {
     @Comment("主键")
     @Id
     @GeneratedValue(generator = SnowflakeId.GENERATOR)
-    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.STRING)
+    @GenericGenerator(name = SnowflakeId.GENERATOR, type = GenerateStringId.class)
     String id;
 
     @Comment("创建人")
@@ -61,7 +62,7 @@ public class BasicEntity {
 
     @Builder.Default
     @Comment("删除时间")
-    @Column(columnDefinition = "bool default false")
+    @Column(columnDefinition = "bool default false", nullable = false)
     Boolean deleted = Boolean.FALSE;
 
     public interface Where {

basic-dict/src/main/java/com/yiring/dict/domain/Category.java

@@ -69,6 +69,6 @@ public class Category extends BasicEntity implements Serializable {
     String pid;
 
     @Comment("是否禁用")
-    @Column(nullable = false, columnDefinition = "bool default false")
+    @Column(columnDefinition = "bool default false", nullable = false)
     Boolean disabled;
 }

basic-dict/src/main/java/com/yiring/dict/domain/Dict.java

@@ -65,7 +65,7 @@ public class Dict extends BasicEntity implements Serializable {
     String description;
 
     @Comment("是否禁用")
-    @Column(columnDefinition = "bool default false")
+    @Column(columnDefinition = "bool default false", nullable = false)
     Boolean disabled;
 
     @JsonIgnore

basic-dict/src/main/java/com/yiring/dict/domain/DictItem.java

@@ -70,6 +70,6 @@ public class DictItem extends BasicEntity implements Serializable {
     Integer serial;
 
     @Comment("是否禁用")
-    @Column(columnDefinition = "bool default false")
+    @Column(columnDefinition = "bool default false", nullable = false)
     Boolean disabled;
 }