fix: 修复合并冲突后的若干错误

1.完善 @Serial
2.完善 javax => jakarta
3.修复 canAccess() 使用错误
4.兼容 JustAuth Spring Boot Starter
5.CI 脚本更新 JDK 8 => 17
This commit is contained in:
2023-11-05 10:41:26 +08:00
parent 51e1cd9307
commit 8dbec9d1a3
63 changed files with 144 additions and 49 deletions

View File

@@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@@ -43,6 +44,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp;
@Schema(description = "${businessName}详情信息")
public class ${className} extends BaseDetailResp {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

View File

@@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.base.BaseDO;
@TableName("${tableName}")
public class ${className} extends BaseDO {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

View File

@@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
import java.io.Serializable;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
@@ -44,6 +45,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
@Schema(description = "${businessName}查询条件")
public class ${className} implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

View File

@@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@@ -24,7 +25,7 @@ import java.math.BigDecimal;
</#if>
<#if hasRequiredField>
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
</#if>
import lombok.Data;
@@ -43,6 +44,7 @@ import top.charles7c.cnadmin.common.base.BaseReq;
@Schema(description = "创建或修改${businessName}信息")
public class ${className} extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

View File

@@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.base.BaseResp;
@Schema(description = "${businessName}信息")
public class ${className} extends BaseResp {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>