upgrade: 1、升级autotable、mybatisflex 到最新版本 2、移除自动生成的实体代码

src/main/java/com/cool/core/annotation/ColumnDefine.java

@@ -0,0 +1,80 @@
+package com.cool.core.annotation;
+
+import org.dromara.autotable.annotation.ColumnComment;
+import org.dromara.autotable.annotation.ColumnDefault;
+import org.dromara.autotable.annotation.ColumnNotNull;
+import org.dromara.autotable.annotation.ColumnType;
+import org.dromara.autotable.annotation.enums.DefaultValueEnum;
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@ColumnType
+@ColumnNotNull
+@ColumnDefault
+@ColumnComment("")
+public @interface ColumnDefine {
+
+    /**
+     * 字段类型：不填默认使用属性的数据类型进行转换，转换失败的字段不会添加
+     *
+     * @return 字段类型
+     */
+    @AliasFor(annotation = ColumnType.class, attribute = "value")
+    String type() default "";
+
+    /**
+     * 字段长度,默认是-1，小于0相当于null
+     *
+     * @return 默认字段长度
+     */
+    @AliasFor(annotation = ColumnType.class, attribute = "length")
+    int length() default -1;
+
+    /**
+     * 小数点长度，默认是-1，小于0相当于null
+     *
+     * @return 小数点长度
+     */
+    @AliasFor(annotation = ColumnType.class, attribute = "decimalLength")
+    int decimalLength() default -1;
+
+    /**
+     * 是否为可以为null，true是可以，false是不可以，默认为true
+     *
+     * @return 是否为可以为null，true是不可以，false是可以，默认为false
+     */
+    @AliasFor(annotation = ColumnNotNull.class, attribute = "value")
+    boolean notNull() default false;
+
+    /**
+     * 默认值，默认为null
+     *
+     * @return 默认值
+     */
+    @AliasFor(annotation = ColumnDefault.class, attribute = "type")
+    DefaultValueEnum defaultValueType() default DefaultValueEnum.UNDEFINED;
+
+    /**
+     * 默认值，默认为null
+     *
+     * @return 默认值
+     */
+    @AliasFor(annotation = ColumnDefault.class, attribute = "value")
+    String defaultValue() default "";
+
+    /**
+     * 数据表字段备注
+     *
+     * @return 默认值，默认为空
+     */
+    @AliasFor(annotation = ColumnComment.class, attribute = "value")
+    String comment() default "";
+}

src/main/java/com/cool/core/base/BaseEntity.java

@@ -6,7 +6,7 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.activerecord.Model;
 import com.mybatisflex.core.query.QueryWrapper;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;

src/main/java/com/cool/core/base/TenantEntity.java

@@ -1,7 +1,7 @@
 package com.cool.core.base;
 
 import com.mybatisflex.core.activerecord.Model;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Index;

src/main/java/com/cool/core/eps/CoolEps.java

@@ -14,7 +14,7 @@ import com.cool.core.annotation.EpsField;
 import com.cool.core.annotation.TokenIgnore;
 import com.cool.core.config.CustomOpenApiResource;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

src/main/java/com/cool/core/leaf/segment/entity/LeafAllocEntity.java

@@ -2,7 +2,7 @@ package com.cool.core.leaf.segment.entity;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/base/entity/sys/BaseSysConfEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.base.entity.sys;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Index;

src/main/java/com/cool/modules/base/entity/sys/BaseSysDepartmentEntity.java

@@ -3,7 +3,7 @@ package com.cool.modules.base.entity.sys;
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.mybatisflex.annotation.Table;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/base/entity/sys/BaseSysLogEntity.java

@@ -4,7 +4,7 @@ import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
 import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Index;

src/main/java/com/cool/modules/base/entity/sys/BaseSysMenuEntity.java

@@ -3,7 +3,7 @@ package com.cool.modules.base.entity.sys;
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/base/entity/sys/BaseSysParamEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.base.entity.sys;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Index;

src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleDepartmentEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.base.entity.sys;
 
 import com.cool.core.base.BaseEntity;
 
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.mybatisflex.annotation.Table;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleEntity.java

@@ -4,7 +4,7 @@ import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
 import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleMenuEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.base.entity.sys;
 
 import com.cool.core.base.BaseEntity;
 
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.mybatisflex.annotation.Table;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/base/entity/sys/BaseSysUserEntity.java

@@ -3,7 +3,7 @@ package com.cool.modules.base.entity.sys;
 import com.cool.core.base.TenantEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/base/entity/sys/BaseSysUserRoleEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.base.entity.sys;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Index;

src/main/java/com/cool/modules/dict/entity/DictInfoEntity.java

@@ -1,7 +1,7 @@
 package com.cool.modules.dict.entity;
 
 import com.cool.core.base.BaseEntity;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.mybatisflex.annotation.Table;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/dict/entity/DictTypeEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.dict.entity;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/plugin/entity/PluginInfoEntity.java

@@ -6,7 +6,7 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
 import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
 import com.cool.core.mybatis.handler.JacksonTypeHandler;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/recycle/entity/RecycleDataEntity.java

@@ -4,7 +4,7 @@ import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
 import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import java.util.List;
 import java.util.Map;
 import lombok.Getter;

src/main/java/com/cool/modules/space/entity/SpaceInfoEntity.java

@@ -3,7 +3,7 @@ package com.cool.modules.space.entity;
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Ignore;

src/main/java/com/cool/modules/space/entity/SpaceTypeEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.space.entity;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/cool/modules/task/entity/TaskInfoEntity.java

@@ -3,7 +3,7 @@ package com.cool.modules.task.entity;
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/task/entity/TaskLogEntity.java

@@ -3,7 +3,7 @@ package com.cool.modules.task.entity;
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Index;

src/main/java/com/cool/modules/user/entity/UserAddressEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.user.entity;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import lombok.Getter;
 import lombok.Setter;
 import org.dromara.autotable.annotation.Index;

src/main/java/com/cool/modules/user/entity/UserInfoEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.user.entity;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/cool/modules/user/entity/UserWxEntity.java

@@ -2,7 +2,7 @@ package com.cool.modules.user.entity;
 
 import com.cool.core.base.BaseEntity;
 import com.mybatisflex.annotation.Table;
-import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import com.cool.core.annotation.ColumnDefine;
 import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
 import lombok.Getter;
 import lombok.Setter;

src/main/resources/application.yml

@@ -38,14 +38,14 @@ spring:
     file: assets/cache
 
   #redis 缓存
-  #  cache:
-  #    type: redis
-  #  data:
-  #    redis:
-  #      host: 127.0.0.1
-  #      port: 6379
-  #      database: 0
-  #      password:
+#  cache:
+#    type: redis
+#  data:
+#    redis:
+#      host: 127.0.0.1
+#      port: 6379
+#      database: 0
+#      password:
   quartz:
     job-store-type: jdbc
     jdbc: