ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-15 10:57:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

4
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java
View File

@@ -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;
/**

8
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/GenConfigDO.java
View File

@@ -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;
/**

6
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java
View File

@@ -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;
/**

2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/resp/TableResp.java
View File

@@ -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;
/**

1
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
View File

@@ -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;

1
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/MetaUtils.java
View File

@@ -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;

2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/Table.java
View File

@@ -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;
/**