From 8dbec9d1a3bcb0f6d7ef4bbfb9715effd61b2025 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 5 Nov 2023 10:41:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E5=90=8E=E7=9A=84=E8=8B=A5=E5=B9=B2=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.完善 @Serial 2.完善 javax => jakarta 3.修复 canAccess() 使用错误 4.兼容 JustAuth Spring Boot Starter 5.CI 脚本更新 JDK 8 => 17 --- .github/workflows/deploy.yml | 2 +- continew-admin-common/pom.xml | 4 ---- .../top/charles7c/cnadmin/common/base/BaseReq.java | 2 -- .../cnadmin/common/base/BaseServiceImpl.java | 1 - .../cnadmin/common/base/ValidateGroup.java | 2 +- .../handler/CrudRequestMappingHandlerMapping.java | 14 ++++++++------ .../cnadmin/common/handler/GlobalErrorHandler.java | 6 +++--- .../cnadmin/common/model/query/SortQuery.java | 2 ++ .../cnadmin/common/util/helper/QueryHelper.java | 4 +--- .../monitor/interceptor/LogInterceptor.java | 2 +- .../model/resp/DashboardAccessTrendResp.java | 2 ++ .../model/resp/DashboardGeoDistributionResp.java | 2 ++ .../model/resp/DashboardPopularModuleResp.java | 2 ++ .../monitor/model/resp/DashboardTotalResp.java | 2 ++ .../cnadmin/auth/model/req/EmailLoginReq.java | 6 ++++-- .../cnadmin/auth/model/req/PhoneLoginReq.java | 6 ++++-- .../cnadmin/auth/model/resp/LoginResp.java | 2 ++ .../system/model/entity/AnnouncementDO.java | 2 ++ .../cnadmin/system/model/entity/DictDO.java | 3 +++ .../cnadmin/system/model/entity/DictItemDO.java | 3 +++ .../cnadmin/system/model/entity/MessageDO.java | 2 ++ .../cnadmin/system/model/entity/OptionDO.java | 2 ++ .../cnadmin/system/model/entity/UserSocialDO.java | 2 ++ .../system/model/query/AnnouncementQuery.java | 2 ++ .../cnadmin/system/model/query/DictItemQuery.java | 2 ++ .../cnadmin/system/model/query/DictQuery.java | 2 ++ .../cnadmin/system/model/query/OptionQuery.java | 4 +++- .../cnadmin/system/model/req/AnnouncementReq.java | 4 +++- .../cnadmin/system/model/req/DictItemReq.java | 5 ++++- .../cnadmin/system/model/req/DictReq.java | 5 ++++- .../cnadmin/system/model/req/MessageReq.java | 7 +++++-- .../cnadmin/system/model/req/OptionReq.java | 5 ++++- .../system/model/req/OptionResetValueReq.java | 4 +++- .../system/model/req/UserPhoneUpdateReq.java | 6 ++++-- .../system/model/resp/AnnouncementDetailResp.java | 2 ++ .../system/model/resp/AnnouncementResp.java | 2 ++ .../model/resp/DashboardAnnouncementResp.java | 2 ++ .../cnadmin/system/model/resp/DictDetailResp.java | 3 +++ .../system/model/resp/DictItemDetailResp.java | 3 +++ .../cnadmin/system/model/resp/DictItemResp.java | 3 +++ .../cnadmin/system/model/resp/DictResp.java | 3 +++ .../cnadmin/system/model/resp/MessageResp.java | 2 ++ .../system/model/resp/MessageTypeUnreadResp.java | 2 ++ .../system/model/resp/MessageUnreadResp.java | 2 ++ .../cnadmin/system/model/resp/OptionResp.java | 2 ++ .../system/model/resp/UserSocialBindResp.java | 2 ++ .../system/service/impl/DictServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 1 - .../cnadmin/tool/model/entity/FieldConfigDO.java | 4 +++- .../cnadmin/tool/model/entity/GenConfigDO.java | 8 +++++--- .../cnadmin/tool/model/req/GenConfigReq.java | 6 ++++-- .../cnadmin/tool/model/resp/TableResp.java | 2 ++ .../tool/service/impl/GeneratorServiceImpl.java | 1 - .../top/charles7c/cnadmin/tool/util/MetaUtils.java | 1 - .../top/charles7c/cnadmin/tool/util/Table.java | 2 ++ .../resources/templates/generator/DetailResp.ftl | 2 ++ .../main/resources/templates/generator/Entity.ftl | 2 ++ .../main/resources/templates/generator/Query.ftl | 2 ++ .../src/main/resources/templates/generator/Req.ftl | 4 +++- .../main/resources/templates/generator/Resp.ftl | 2 ++ .../webapi/controller/common/CommonController.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 1 + docker/continew-admin/Dockerfile | 2 +- 63 files changed, 144 insertions(+), 49 deletions(-) create mode 100644 continew-admin-webapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index df1ba42f..cd4f7912 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@master with: distribution: 'adopt' - java-version: '8' + java-version: '17' cache: 'maven' # 3、打包 - name: Build diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index 1b2b9617..dfeacfb3 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -154,10 +154,6 @@ limitations under the License. org.redisson redisson-spring-boot-starter - - org.redisson - redisson-spring-data-27 - diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java index 203546e8..95e706b2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java @@ -19,8 +19,6 @@ package top.charles7c.cnadmin.common.base; import java.io.Serial; import java.io.Serializable; -import jakarta.validation.groups.Default; - import lombok.Data; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index 83a62dc4..7c4ea5c3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -250,7 +250,6 @@ public abstract class BaseServiceImpl, T extends BaseDO, public void fillDetail(Object detailObj) { if (detailObj instanceof BaseDetailResp detail) { this.fill(detail); - Long updateUser = detail.getUpdateUser(); if (null == updateUser) { return; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/ValidateGroup.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/ValidateGroup.java index f77d1e7e..81820538 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/ValidateGroup.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/ValidateGroup.java @@ -16,7 +16,7 @@ package top.charles7c.cnadmin.common.base; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; /** * 分组校验 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java index 5c0e19e2..b472c7af 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java @@ -16,19 +16,21 @@ package top.charles7c.cnadmin.common.handler; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; +import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; + +import java.lang.reflect.Method; + import org.springframework.lang.NonNull; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.util.pattern.PathPatternParser; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; + import top.charles7c.cnadmin.common.annotation.CrudRequestMapping; import top.charles7c.cnadmin.common.util.ExceptionUtils; -import java.lang.reflect.Method; - -import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; - /** * CRUD 请求映射器处理器映射器 * diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalErrorHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalErrorHandler.java index da85ed12..9438acef 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalErrorHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalErrorHandler.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java index c2ae0ea6..5f96fbad 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts; @Schema(description = "排序查询条件") public class SortQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java index 3175c817..f63b2604 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java @@ -20,7 +20,6 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import cn.hutool.core.collection.CollUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -65,7 +64,6 @@ public class QueryHelper { if (null == query) { return queryWrapper; } - // 获取查询条件中所有的字段 List fieldList = ReflectUtils.getNonStaticFields(query.getClass()); fieldList.forEach(field -> buildQuery(query, field, queryWrapper)); @@ -87,7 +85,7 @@ public class QueryHelper { * 查询数据类型 */ private static void buildQuery(Q query, Field field, QueryWrapper queryWrapper) { - boolean accessible = field.canAccess(null); + boolean accessible = field.canAccess(query); try { field.setAccessible(true); // 没有 @Query，直接返回 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java index f65a70ac..2dd49398 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java @@ -247,7 +247,7 @@ public class LogInterceptor implements HandlerInterceptor { } logDO.setClientIp(JakartaServletUtil.getClientIP(request)); logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp())); - logDO.setBrowser(JakartaServletUtil.getBrowser(request)); + logDO.setBrowser(ServletUtils.getBrowser(request)); } /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java index 1862840b..212182c4 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "仪表盘-访问趋势信息") public class DashboardAccessTrendResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java index 4d6cf95a..e1b2e63f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "仪表盘-访客地域分布信息") public class DashboardGeoDistributionResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java index 850c01bb..af98e12b 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; @@ -35,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @Schema(description = "仪表盘-热门模块信息") public class DashboardPopularModuleResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java index 0deb7d74..92ca1271 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; @@ -35,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @Schema(description = "仪表盘-总计信息") public class DashboardTotalResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java index e81cfaa4..c2f9854b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java @@ -16,10 +16,11 @@ package top.charles7c.cnadmin.auth.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts; @Schema(description = "邮箱登录信息") public class EmailLoginReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java index 8d1645c0..a2828a45 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java @@ -16,10 +16,11 @@ package top.charles7c.cnadmin.auth.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts; @Schema(description = "手机号登录信息") public class PhoneLoginReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java index eb94bacf..7903a622 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Builder; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "令牌信息") public class LoginResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/AnnouncementDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/AnnouncementDO.java index 24b61611..869a52a2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/AnnouncementDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/AnnouncementDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.time.LocalDateTime; import lombok.Data; @@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.base.BaseDO; @TableName("sys_announcement") public class AnnouncementDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictDO.java index ded98c7c..34d29214 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseDO; @TableName("sys_dict") public class DictDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictItemDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictItemDO.java index ff7d5850..553c8007 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictItemDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictItemDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseDO; @TableName("sys_dict_item") public class DictItemDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MessageDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MessageDO.java index 21284bc4..91be1241 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MessageDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MessageDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum; @TableName("sys_message") public class MessageDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java index c84855cd..1d957598 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -36,6 +37,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_option") public class OptionDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserSocialDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserSocialDO.java index be80832a..4aa785d0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserSocialDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserSocialDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -35,6 +36,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_user_social") public class UserSocialDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java index 43ffc1ec..703e83b0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -35,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "公告查询条件") public class AnnouncementQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictItemQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictItemQuery.java index b5fc6fee..d6461a33 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictItemQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictItemQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "字典项查询条件") public class DictItemQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictQuery.java index 20837fbc..cdeb9dfe 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "字典查询条件") public class DictQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/OptionQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/OptionQuery.java index 6c4c059b..daa131b5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/OptionQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/OptionQuery.java @@ -16,10 +16,11 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "参数查询条件") public class OptionQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/AnnouncementReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/AnnouncementReq.java index 78ecda81..49e92275 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/AnnouncementReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/AnnouncementReq.java @@ -16,9 +16,10 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.time.LocalDateTime; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import lombok.Data; @@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.base.BaseReq; @Schema(description = "创建或修改公告信息") public class AnnouncementReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictItemReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictItemReq.java index 83a6a215..2ef8f794 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictItemReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictItemReq.java @@ -16,7 +16,9 @@ package top.charles7c.cnadmin.system.model.req; -import javax.validation.constraints.*; +import java.io.Serial; + +import jakarta.validation.constraints.*; import lombok.Data; @@ -36,6 +38,7 @@ import top.charles7c.cnadmin.common.base.BaseReq; @Schema(description = "创建或修改字典项信息") public class DictItemReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictReq.java index a121933d..513b7338 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictReq.java @@ -16,7 +16,9 @@ package top.charles7c.cnadmin.system.model.req; -import javax.validation.constraints.*; +import java.io.Serial; + +import jakarta.validation.constraints.*; import lombok.Data; @@ -37,6 +39,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts; @Schema(description = "创建或修改字典信息") public class DictReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MessageReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MessageReq.java index 998fc53f..f4cdb5c3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MessageReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MessageReq.java @@ -16,8 +16,10 @@ package top.charles7c.cnadmin.system.model.req; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import java.io.Serial; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -38,6 +40,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum; @Schema(description = "创建消息信息") public class MessageReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionReq.java index bd6c1d8a..259c52f9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionReq.java @@ -16,7 +16,9 @@ package top.charles7c.cnadmin.system.model.req; -import javax.validation.constraints.NotBlank; +import java.io.Serial; + +import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -36,6 +38,7 @@ import top.charles7c.cnadmin.common.base.BaseReq; @Schema(description = "修改参数信息") public class OptionReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionResetValueReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionResetValueReq.java index 7a3a0ab8..cde3adc0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionResetValueReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionResetValueReq.java @@ -16,10 +16,11 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.io.Serializable; import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -35,6 +36,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "参数重置信息") public class OptionResetValueReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPhoneUpdateReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPhoneUpdateReq.java index d19eb3f1..cf5d5ac8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPhoneUpdateReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPhoneUpdateReq.java @@ -16,10 +16,11 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts; @Schema(description = "用户手机号修改信息") public class UserPhoneUpdateReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementDetailResp.java index d64d0527..96e0917e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementDetailResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.time.LocalDateTime; import lombok.Data; @@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp; @Schema(description = "公告详情信息") public class AnnouncementDetailResp extends BaseDetailResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementResp.java index a46ebdee..4f5be7ad 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.time.LocalDateTime; import lombok.Data; @@ -35,6 +36,7 @@ import top.charles7c.cnadmin.system.enums.AnnouncementStatusEnum; @Schema(description = "公告信息") public class AnnouncementResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DashboardAnnouncementResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DashboardAnnouncementResp.java index f90ccab4..9fa5ec73 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DashboardAnnouncementResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DashboardAnnouncementResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "仪表盘-公告信息") public class DashboardAnnouncementResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictDetailResp.java index 5d9fd80a..b375ffd1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictDetailResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp; @Schema(description = "字典详情信息") public class DictDetailResp extends BaseDetailResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemDetailResp.java index 50dd9776..578c9fcd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemDetailResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -36,6 +38,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp; @Schema(description = "字典项详情信息") public class DictItemDetailResp extends BaseDetailResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemResp.java index e14377dd..8ee8328b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseResp; @Schema(description = "字典项信息") public class DictItemResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictResp.java index 5e6f1346..0fa9480d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseResp; @Schema(description = "字典信息") public class DictResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageResp.java index 033cbbe4..69b2d317 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -37,6 +38,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum; @Schema(description = "消息信息") public class MessageResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageTypeUnreadResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageTypeUnreadResp.java index c655f6b8..713c091b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageTypeUnreadResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageTypeUnreadResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum; @Schema(description = "各类型未读消息信息") public class MessageTypeUnreadResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageUnreadResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageUnreadResp.java index 03b1e2c1..0638fdc1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageUnreadResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageUnreadResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -36,6 +37,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class MessageUnreadResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/OptionResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/OptionResp.java index 2fca62f1..1500c983 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/OptionResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/OptionResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -36,6 +37,7 @@ import cn.hutool.core.util.StrUtil; @Schema(description = "参数信息") public class OptionResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserSocialBindResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserSocialBindResp.java index 842adcce..2fa29858 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserSocialBindResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserSocialBindResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "第三方账号绑定信息") public class UserSocialBindResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java index 316d3d33..3690065a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index 8fb400ba..1530106b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -153,7 +153,6 @@ public class UserServiceImpl extends BaseServiceImpl deptService.get(detail.getDeptId()).getName())); List roleIdList = userRoleService.listRoleIdByUserId(detail.getId()); detail.setRoleIds(roleIdList); diff --git 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 index 335106af..5ad6f016 100644 --- 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; /** diff --git 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 index c6440d81..d01d5815 100644 --- 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; /** diff --git 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 index 38ca207a..5b3e2bba 100644 --- 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; /** diff --git 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 index 548309e0..94737886 100644 --- 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; /** diff --git 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 index 2d5d322e..4517969f 100644 --- 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; diff --git 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 index 518912dd..c262254a 100644 --- 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; diff --git 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 index bce38447..f51c9f50 100644 --- 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; /** diff --git a/continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl b/continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl index 07ec614c..b0b758bf 100644 --- 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; @@ -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> diff --git a/continew-admin-tool/src/main/resources/templates/generator/Entity.ftl b/continew-admin-tool/src/main/resources/templates/generator/Entity.ftl index 1d93e0fa..21c99e90 100644 --- 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; @@ -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> diff --git a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl index b7effafe..1eed16b0 100644 --- 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> diff --git a/continew-admin-tool/src/main/resources/templates/generator/Req.ftl b/continew-admin-tool/src/main/resources/templates/generator/Req.ftl index 36a0dd1e..533b5ac5 100644 --- 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; @@ -24,7 +25,7 @@ import java.math.BigDecimal; <#if hasRequiredField> -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; 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> diff --git a/continew-admin-tool/src/main/resources/templates/generator/Resp.ftl b/continew-admin-tool/src/main/resources/templates/generator/Resp.ftl index 8c6b9a3e..17e6633b 100644 --- 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; @@ -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> diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java index 1ad9a749..aac8c49c 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-webapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-admin-webapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..92f580aa --- /dev/null +++ b/continew-admin-webapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration \ No newline at end of file diff --git a/docker/continew-admin/Dockerfile b/docker/continew-admin/Dockerfile index 792c6b84..51617a86 100644 --- a/docker/continew-admin/Dockerfile +++ b/docker/continew-admin/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8 +FROM openjdk:17 MAINTAINER Charles7c charles7c@126.com