diff --git a/mybatis-enhance-actable/pom.xml b/mybatis-enhance-actable/pom.xml index 67fd95afba45408eec1d5a362b5c2256fc659124..b07d80d39ed1c6a7b18a0e43f1b5718d6c22991d 100644 --- a/mybatis-enhance-actable/pom.xml +++ b/mybatis-enhance-actable/pom.xml @@ -40,7 +40,7 @@ - 4.3.7.RELEASE + 6.0.3 @@ -63,40 +63,52 @@ org.slf4j slf4j-api - 1.7.12 + 2.0.5 provided org.mybatis.scripting mybatis-velocity - 1.2 + 2.1.2 provided + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + + + + jakarta.persistence + jakarta.persistence-api + 3.1.0 + + org.projectlombok lombok - 1.18.8 + 1.18.24 provided com.google.guava guava - 25.0-jre + 31.1-jre - javax.persistence - persistence-api - 1.0 + com.baomidou + mybatis-plus-annotation + 3.5.2.7-SNAPSHOT - com.baomidou - mybatis-plus-annotation - 3.4.1 + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M7 @@ -169,8 +181,8 @@ maven-compiler-plugin 3.0 - 1.6 - 1.6 + 17 + 17 true true UTF-8 diff --git a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/handler/StartUpHandlerImpl.java b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/handler/StartUpHandlerImpl.java index e2e4deb967081d950fa9d7b41ad3f8eb760906bf..57996da64952e8a9ad3f4cf928c035c27fc0a975 100644 --- a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/handler/StartUpHandlerImpl.java +++ b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/handler/StartUpHandlerImpl.java @@ -1,11 +1,10 @@ package com.gitee.sunchenbin.mybatis.actable.manager.handler; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.gitee.sunchenbin.mybatis.actable.constants.Constants; diff --git a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/system/SysMysqlCreateTableManagerImpl.java b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/system/SysMysqlCreateTableManagerImpl.java index 6ec85060e49746d532493328924a21ff0fbf5727..20e086c40f994cdd144bfb8125d7e958be7c66ba 100644 --- a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/system/SysMysqlCreateTableManagerImpl.java +++ b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/manager/system/SysMysqlCreateTableManagerImpl.java @@ -89,7 +89,7 @@ public class SysMysqlCreateTableManagerImpl implements SysMysqlCreateTableManage String[] packs = pack.split(",|;"); // 从包package中获取所有的Class - Set classes = ClassScaner.scan(packs, Table.class, TableName.class, javax.persistence.Table.class); + Set classes = ClassScaner.scan(packs, Table.class, TableName.class, jakarta.persistence.Table.class); // 初始化用于存储各种操作表结构的容器 Map> baseTableMap = initTableMap(); diff --git a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java index 283cce810a384261385fd5f46e4faba419bccb77..430f665b72979c808e8a3ee5459c5d12a56fd537 100644 --- a/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java +++ b/mybatis-enhance-actable/src/main/java/com/gitee/sunchenbin/mybatis/actable/utils/ColumnUtils.java @@ -11,11 +11,11 @@ import com.gitee.sunchenbin.mybatis.actable.constants.MySqlCharsetConstant; import com.gitee.sunchenbin.mybatis.actable.constants.MySqlEngineConstant; import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant; import com.google.common.base.CaseFormat; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; import org.springframework.util.StringUtils; -import javax.persistence.Id; +import jakarta.persistence.Id; import java.lang.reflect.Field; import java.util.Arrays; import java.util.Date; @@ -28,7 +28,7 @@ public class ColumnUtils { public static String getTableName(Class clasz){ Table tableName = clasz.getAnnotation(Table.class); - javax.persistence.Table tableNameCommon = clasz.getAnnotation(javax.persistence.Table.class); + jakarta.persistence.Table tableNameCommon = clasz.getAnnotation(jakarta.persistence.Table.class); TableName tableNamePlus = clasz.getAnnotation(TableName.class); EnableTimeSuffix enableTimeSuffix = clasz.getAnnotation(EnableTimeSuffix.class); if (!hasTableAnnotation(clasz)){ @@ -104,7 +104,7 @@ public class ColumnUtils { public static String getColumnName(Field field, Class clasz){ Column column = getColumn(field, clasz); - javax.persistence.Column columnCommon = field.getAnnotation(javax.persistence.Column.class); + jakarta.persistence.Column columnCommon = field.getAnnotation(jakarta.persistence.Column.class); TableField tableField = field.getAnnotation(TableField.class); TableId tableId = field.getAnnotation(TableId.class); if(!hasColumnAnnotation(field, clasz)){ @@ -169,7 +169,7 @@ public class ColumnUtils { public static Boolean isNull(Field field, Class clasz){ Column column = getColumn(field, clasz); - javax.persistence.Column columnCommon = field.getAnnotation(javax.persistence.Column.class); + jakarta.persistence.Column columnCommon = field.getAnnotation(jakarta.persistence.Column.class); if(!hasColumnAnnotation(field,clasz)){ return true; } @@ -236,7 +236,7 @@ public class ColumnUtils { public static MySqlTypeAndLength getMySqlTypeAndLength(Field field, Class clasz){ Column column = getColumn(field,clasz); - javax.persistence.Column columnCommon = field.getAnnotation(javax.persistence.Column.class); + jakarta.persistence.Column columnCommon = field.getAnnotation(jakarta.persistence.Column.class); ColumnType type = field.getAnnotation(ColumnType.class); if(!hasColumnAnnotation(field, clasz)){ throw new RuntimeException("字段名：" + field.getName() +"没有字段标识的注解，异常抛出！"); @@ -289,7 +289,7 @@ public class ColumnUtils { public static boolean hasTableAnnotation(Class clasz){ Table tableName = clasz.getAnnotation(Table.class); - javax.persistence.Table tableNameCommon = clasz.getAnnotation(javax.persistence.Table.class); + jakarta.persistence.Table tableNameCommon = clasz.getAnnotation(jakarta.persistence.Table.class); TableName tableNamePlus = clasz.getAnnotation(TableName.class); if (tableName == null && tableNameCommon == null && tableNamePlus == null){ return false; @@ -315,7 +315,7 @@ public class ColumnUtils { return false; } Column column = field.getAnnotation(Column.class); - javax.persistence.Column columnCommon = field.getAnnotation(javax.persistence.Column.class); + jakarta.persistence.Column columnCommon = field.getAnnotation(jakarta.persistence.Column.class); TableField tableField = field.getAnnotation(TableField.class); IsKey isKey = field.getAnnotation(IsKey.class); Id id = field.getAnnotation(Id.class); diff --git a/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisAdvance.java b/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisAdvance.java index ca4ddbd1b2bbbab67a0ef70f36810aa922774c9d..68ed7f600fdb39a8adac4231c9c93768c177d933 100644 --- a/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisAdvance.java +++ b/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisAdvance.java @@ -5,9 +5,9 @@ import com.gitee.sunchenbin.mybatis.actable.constants.MySqlCharsetConstant; import com.gitee.sunchenbin.mybatis.actable.constants.MySqlEngineConstant; import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.math.BigDecimal; import java.util.Date; diff --git a/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisSimple.java b/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisSimple.java index aba238aebc8e66752fcc0e16653411cf84121f89..0a2b1ed4b04e018ed797eb520b714721882bad76 100644 --- a/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisSimple.java +++ b/mybatis-enhance-actable/src/test/java/com/gitee/sunchenbin/model/TKMybatisSimple.java @@ -1,8 +1,8 @@ package com.gitee.sunchenbin.model; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.math.BigDecimal; import java.util.Date;