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

1.完善 @Serial 2.完善 javax => jakarta 3.修复 canAccess() 使用错误 4.兼容 JustAuth Spring Boot Starter 5.CI 脚本更新 JDK 8 => 17
2025-09-11 16:57:12 +08:00 · 2023-11-05 10:41:26 +08:00
parent 51e1cd9307
commit 8dbec9d1a3
63 changed files with 144 additions and 49 deletions
--- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java
@@ -16,10 +16,11 @@

 package top.charles7c.cnadmin.tool.model.entity;

+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;

-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;

 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -52,6 +53,7 @@ import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
@Schema(description = "字段配置信息")
 public class FieldConfigDO implements Serializable {

+    @Serial
    private static final long serialVersionUID = 1L;

    /**
--- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/GenConfigDO.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/GenConfigDO.java
@@ -16,12 +16,13 @@

 package top.charles7c.cnadmin.tool.model.entity;

+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;

 import lombok.AccessLevel;
 import lombok.Data;
@@ -51,6 +52,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
@Schema(description = "生成配置信息")
 public class GenConfigDO implements Serializable {

+    @Serial
    private static final long serialVersionUID = 1L;

    /**
--- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java
@@ -16,12 +16,13 @@

 package top.charles7c.cnadmin.tool.model.req;

+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

 import lombok.Data;

@@ -40,6 +41,7 @@ import top.charles7c.cnadmin.tool.model.entity.GenConfigDO;
@Schema(description = "代码生成配置信息")
 public class GenConfigReq implements Serializable {

+    @Serial
    private static final long serialVersionUID = 1L;

    /**
--- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/resp/TableResp.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/resp/TableResp.java
@@ -16,6 +16,7 @@

 package top.charles7c.cnadmin.tool.model.resp;

+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;

@@ -33,6 +34,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "表信息")
 public class TableResp implements Serializable {

+    @Serial
    private static final long serialVersionUID = 1L;

    /**
--- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
@@ -22,7 +22,6 @@ import java.sql.SQLException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import javax.sql.DataSource;

 import lombok.RequiredArgsConstructor;
--- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/MetaUtils.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/MetaUtils.java
@@ -20,7 +20,6 @@ import java.sql.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import javax.sql.DataSource;

 import lombok.AccessLevel;
--- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/Table.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/Table.java
@@ -16,6 +16,7 @@

 package top.charles7c.cnadmin.tool.util;

+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;

@@ -32,6 +33,7 @@ import lombok.Setter;
@Setter
 public class Table implements Serializable {

+    @Serial
    private static final long serialVersionUID = 1L;

    /**
--- a/continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl
+++ b/continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl
@@ -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>
--- a/continew-admin-tool/src/main/resources/templates/generator/Entity.ftl
+++ b/continew-admin-tool/src/main/resources/templates/generator/Entity.ftl
@@ -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>
--- a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl
+++ b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl
@@ -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>
--- a/continew-admin-tool/src/main/resources/templates/generator/Req.ftl
+++ b/continew-admin-tool/src/main/resources/templates/generator/Req.ftl
@@ -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>
--- a/continew-admin-tool/src/main/resources/templates/generator/Resp.ftl
+++ b/continew-admin-tool/src/main/resources/templates/generator/Resp.ftl
@@ -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>