From 6035a7b40be1ff4a18e6667d056e9abbd0d5f9e2 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 5 Dec 2023 21:18:01 +0800 Subject: [PATCH] build: continew-starter 1.0.0 => 1.0.1-SNAPSHOT --- .../config/easyexcel/ExcelBaseEnumConverter.java | 2 +- .../common/config/jackson/BaseEnumDeserializer.java | 2 +- .../common/config/jackson/BaseEnumSerializer.java | 2 +- .../common/config/jackson/JacksonConfiguration.java | 2 +- .../config/mybatis/MyBatisPlusMetaObjectHandler.java | 2 +- .../continew/admin/common/enums/DataScopeEnum.java | 2 +- .../admin/common/enums/DisEnableStatusEnum.java | 2 +- .../continew/admin/common/enums/GenderEnum.java | 2 +- .../continew/admin/common/enums/MenuTypeEnum.java | 2 +- .../continew/admin/common/enums/MessageTypeEnum.java | 2 +- .../admin/common/enums/SuccessFailureStatusEnum.java | 2 +- .../admin/common/handler/GlobalExceptionHandler.java | 4 ++-- .../continew/admin/common/util/SecureUtils.java | 2 +- .../continew/admin/monitor/enums/LogStatusEnum.java | 2 +- .../admin/monitor/model/query/LoginLogQuery.java | 4 ++-- .../admin/monitor/model/query/OperationLogQuery.java | 4 ++-- .../admin/monitor/model/query/SystemLogQuery.java | 4 ++-- .../admin/monitor/service/impl/LogServiceImpl.java | 6 +++--- .../admin/auth/service/impl/LoginServiceImpl.java | 2 +- .../admin/system/enums/AnnouncementStatusEnum.java | 2 +- .../admin/system/model/query/AnnouncementQuery.java | 4 ++-- .../continew/admin/system/model/query/DeptQuery.java | 4 ++-- .../admin/system/model/query/DictItemQuery.java | 2 +- .../continew/admin/system/model/query/DictQuery.java | 2 +- .../continew/admin/system/model/query/MenuQuery.java | 4 ++-- .../admin/system/model/query/MessageQuery.java | 4 ++-- .../admin/system/model/query/OptionQuery.java | 4 ++-- .../continew/admin/system/model/query/RoleQuery.java | 2 +- .../continew/admin/system/model/query/UserQuery.java | 4 ++-- .../admin/system/service/impl/DeptServiceImpl.java | 2 +- .../system/service/impl/DictItemServiceImpl.java | 2 +- .../admin/system/service/impl/DictServiceImpl.java | 2 +- .../admin/system/service/impl/MenuServiceImpl.java | 2 +- .../admin/system/service/impl/MessageServiceImpl.java | 4 ++-- .../system/service/impl/MessageUserServiceImpl.java | 2 +- .../admin/system/service/impl/OptionServiceImpl.java | 2 +- .../admin/system/service/impl/RoleServiceImpl.java | 2 +- .../admin/system/service/impl/UserServiceImpl.java | 2 +- .../system/service/impl/UserSocialServiceImpl.java | 2 +- .../continew/admin/tool/enums/FormTypeEnum.java | 2 +- .../admin/tool/model/entity/FieldConfigDO.java | 2 +- .../admin/tool/service/impl/GeneratorServiceImpl.java | 6 +++--- .../src/main/resources/templates/generator/Query.ftl | 4 ++-- .../continew/admin/webapi/auth/AuthController.java | 2 +- .../admin/webapi/auth/SocialAuthController.java | 4 ++-- .../admin/webapi/common/CaptchaController.java | 2 +- .../admin/webapi/common/CommonController.java | 6 +++--- .../admin/webapi/common/DashboardController.java | 2 +- .../admin/webapi/monitor/OnlineUserController.java | 2 +- .../admin/webapi/system/AnnouncementController.java | 2 +- .../continew/admin/webapi/system/MenuController.java | 2 +- .../admin/webapi/system/UserCenterController.java | 2 +- .../admin/webapi/tool/GeneratorController.java | 2 +- pom.xml | 11 ++++++++++- 54 files changed, 82 insertions(+), 73 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java index 01f76607..ea62314a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java @@ -27,7 +27,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ClassUtil; import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * Easy Excel 枚举基类转换器 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java index 048fe641..111c1481 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 通用枚举基类 BaseEnum 反序列化器 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java index 17471857..21f37f0f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 通用枚举接口 BaseEnum 序列化器 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java index cf3e8278..8ed8c7f9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * Jackson 配置 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 6075d32e..1109ab91 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -25,8 +25,8 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import cn.hutool.core.util.ObjectUtil; import top.charles7c.continew.admin.common.util.helper.LoginHelper; +import top.charles7c.continew.starter.core.exception.BusinessException; import top.charles7c.continew.starter.extension.crud.base.BaseDO; -import top.charles7c.continew.starter.extension.crud.exception.BusinessException; /** * MyBatis Plus 元对象处理器配置（插入或修改时自动填充） diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java index 15d5a297..c9081d37 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 数据权限枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java index 87ad7480..6946f5e3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UIConstants; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 启用/禁用状态枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java index db6068a4..345e2a2e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 性别枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java index 2d5fe3e3..19655d57 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 菜单类型枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java index ca21ba03..46ff50de 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UIConstants; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 消息类型枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java index 6b2e0adb..1ddeed6e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UIConstants; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 成功/失败状态枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java index 7fbfce75..1ba2b4ad 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java @@ -43,9 +43,9 @@ import cn.hutool.core.util.StrUtil; import top.charles7c.continew.admin.common.util.holder.LogContextHolder; import top.charles7c.continew.starter.core.constant.StringConstants; +import top.charles7c.continew.starter.core.exception.BadRequestException; +import top.charles7c.continew.starter.core.exception.BusinessException; import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.extension.crud.exception.BadRequestException; -import top.charles7c.continew.starter.extension.crud.exception.BusinessException; import top.charles7c.continew.starter.extension.crud.model.resp.R; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java index 4279b83a..121e3d79 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java @@ -24,7 +24,7 @@ import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.asymmetric.KeyType; import top.charles7c.continew.admin.common.config.properties.RsaProperties; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; /** * 加密/解密工具类 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java index 090d68ad..d64aac00 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.monitor.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 操作状态枚举 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java index 62d0d100..8df9eafd 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java @@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat; import cn.hutool.core.date.DatePattern; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 登录日志查询条件 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java index 53cb330f..df57dd10 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java @@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat; import cn.hutool.core.date.DatePattern; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 操作日志查询条件 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java index 0240ca4e..c3fcbef0 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java @@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat; import cn.hutool.core.date.DatePattern; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 系统日志查询条件 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java index fe7cef22..e0b96b59 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java @@ -42,12 +42,12 @@ import top.charles7c.continew.admin.monitor.model.query.SystemLogQuery; import top.charles7c.continew.admin.monitor.model.resp.*; import top.charles7c.continew.admin.monitor.service.LogService; import top.charles7c.continew.starter.core.util.ExceptionUtils; +import top.charles7c.continew.starter.core.util.ReflectUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.charles7c.continew.starter.data.mybatis.plus.util.QueryHelper; import top.charles7c.continew.starter.extension.crud.base.CommonUserService; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; -import top.charles7c.continew.starter.extension.crud.util.QueryHelper; -import top.charles7c.continew.starter.extension.crud.util.ReflectUtils; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 系统日志业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java index 344766e9..7b1189c1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -56,9 +56,9 @@ import top.charles7c.continew.admin.system.model.resp.DeptDetailResp; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.service.*; import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.annotation.TreeField; import top.charles7c.continew.starter.extension.crud.util.TreeUtils; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; import me.zhyd.oauth.model.AuthUser; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java index 5e31fa18..3fb4e3f0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UIConstants; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 公告状态枚举 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java index 5f08cbb1..f44eeefc 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java @@ -23,8 +23,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 公告查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java index 75d184ed..21d8e3bb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java @@ -23,8 +23,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 部门查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java index 525bae84..1b9a5ce9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java @@ -23,7 +23,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; /** * 字典项查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java index 0808f7e4..4a335f35 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java @@ -23,7 +23,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; /** * 字典查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java index bdb1ef47..5009a436 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java @@ -23,8 +23,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 菜单查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java index 91a4c7ce..02313673 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java @@ -22,8 +22,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 消息查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java index 699a5dc0..c13f0dba 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java @@ -26,8 +26,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 参数查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java index 006d86e0..8ce3b9fb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java @@ -23,7 +23,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; /** * 角色查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java index db28d625..ca71c1c8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java @@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat; import cn.hutool.core.date.DatePattern; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 用户查询条件 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java index d939cbfc..60c87cca 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java @@ -43,8 +43,8 @@ import top.charles7c.continew.admin.system.service.DeptService; import top.charles7c.continew.admin.system.service.RoleDeptService; import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.core.util.ExceptionUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 部门业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java index 0201a2e0..e9e940fe 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java @@ -34,9 +34,9 @@ import top.charles7c.continew.admin.system.model.req.DictItemReq; import top.charles7c.continew.admin.system.model.resp.DictItemDetailResp; import top.charles7c.continew.admin.system.model.resp.DictItemResp; import top.charles7c.continew.admin.system.service.DictItemService; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 字典项业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java index f4e646f3..d26c418f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java @@ -36,9 +36,9 @@ import top.charles7c.continew.admin.system.model.resp.DictItemDetailResp; import top.charles7c.continew.admin.system.model.resp.DictResp; import top.charles7c.continew.admin.system.service.DictItemService; import top.charles7c.continew.admin.system.service.DictService; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; import top.charles7c.continew.starter.file.excel.util.ExcelUtils; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java index ad5e72ce..c3e81b5e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java @@ -36,8 +36,8 @@ import top.charles7c.continew.admin.system.model.query.MenuQuery; import top.charles7c.continew.admin.system.model.req.MenuReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.service.MenuService; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 菜单业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java index 633eb655..3ba6dbbd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java @@ -38,11 +38,11 @@ import top.charles7c.continew.admin.system.model.resp.MessageResp; import top.charles7c.continew.admin.system.service.MessageService; import top.charles7c.continew.admin.system.service.MessageUserService; import top.charles7c.continew.starter.core.util.ExceptionUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.charles7c.continew.starter.data.mybatis.plus.util.QueryHelper; import top.charles7c.continew.starter.extension.crud.base.CommonUserService; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; -import top.charles7c.continew.starter.extension.crud.util.QueryHelper; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 消息业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java index 95ffe966..847d3935 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java @@ -33,7 +33,7 @@ import top.charles7c.continew.admin.system.model.entity.MessageUserDO; import top.charles7c.continew.admin.system.model.resp.MessageTypeUnreadResp; import top.charles7c.continew.admin.system.model.resp.MessageUnreadResp; import top.charles7c.continew.admin.system.service.MessageUserService; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; /** * 消息和用户关联业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java index dffa8dc6..30cd9b6c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java @@ -34,7 +34,7 @@ import top.charles7c.continew.admin.system.model.req.OptionReq; import top.charles7c.continew.admin.system.model.req.OptionResetValueReq; import top.charles7c.continew.admin.system.model.resp.OptionResp; import top.charles7c.continew.admin.system.service.OptionService; -import top.charles7c.continew.starter.extension.crud.util.QueryHelper; +import top.charles7c.continew.starter.data.mybatis.plus.util.QueryHelper; /** * 参数业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java index 8dc45ec1..bbc56148 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java @@ -44,8 +44,8 @@ import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.model.resp.RoleDetailResp; import top.charles7c.continew.admin.system.model.resp.RoleResp; import top.charles7c.continew.admin.system.service.*; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 角色业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java index c2cf4800..11186ac0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java @@ -58,9 +58,9 @@ import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.core.constant.StringConstants; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.core.util.FileUploadUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl; import top.charles7c.continew.starter.extension.crud.base.CommonUserService; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 用户业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java index 8330e8da..98370197 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java @@ -32,7 +32,7 @@ import top.charles7c.continew.admin.common.enums.SocialSourceEnum; import top.charles7c.continew.admin.system.mapper.UserSocialMapper; import top.charles7c.continew.admin.system.model.entity.UserSocialDO; import top.charles7c.continew.admin.system.service.UserSocialService; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import me.zhyd.oauth.model.AuthUser; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/FormTypeEnum.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/FormTypeEnum.java index 1094c0b2..7a71451c 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/FormTypeEnum.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/FormTypeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.tool.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; /** * 表单类型枚举 diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java index 0064bbe7..48d570fd 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java @@ -39,7 +39,7 @@ import cn.hutool.setting.dialect.PropsUtil; import top.charles7c.continew.admin.tool.enums.FormTypeEnum; import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * 字段配置实体 diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java index 9b36898f..deca76e7 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java @@ -53,14 +53,14 @@ import top.charles7c.continew.admin.tool.model.req.GenConfigReq; import top.charles7c.continew.admin.tool.model.resp.TableResp; import top.charles7c.continew.admin.tool.service.GeneratorService; import top.charles7c.continew.starter.core.constant.StringConstants; +import top.charles7c.continew.starter.core.exception.BusinessException; import top.charles7c.continew.starter.core.util.TemplateUtils; import top.charles7c.continew.starter.core.util.db.MetaUtils; import top.charles7c.continew.starter.core.util.db.Table; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; -import top.charles7c.continew.starter.extension.crud.exception.BusinessException; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 代码生成业务实现 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 dd2f2ba4..62fcc04b 100644 --- a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl +++ b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl @@ -32,8 +32,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; /** * ${businessName}查询条件 diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java index cdab84cd..78df08c8 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java @@ -48,8 +48,8 @@ import top.charles7c.continew.admin.system.model.resp.UserDetailResp; import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; import top.charles7c.continew.starter.core.util.ExceptionUtils; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; /** * 认证 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java index 95bc7cac..9e1b2a66 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java @@ -33,9 +33,9 @@ import cn.dev33.satoken.stp.StpUtil; import top.charles7c.continew.admin.auth.model.resp.LoginResp; import top.charles7c.continew.admin.auth.service.LoginService; import top.charles7c.continew.admin.monitor.annotation.Log; -import top.charles7c.continew.starter.extension.crud.exception.BadRequestException; +import top.charles7c.continew.starter.core.exception.BadRequestException; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java index 92ad1918..b4c207e7 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java @@ -54,8 +54,8 @@ import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; import top.charles7c.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaProperties; import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; import top.charles7c.continew.starter.core.util.TemplateUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; import top.charles7c.continew.starter.messaging.mail.util.MailUtils; /** diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java index 9a394b11..f032101b 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java @@ -54,11 +54,11 @@ import top.charles7c.continew.admin.system.model.resp.RoleResp; import top.charles7c.continew.admin.system.service.*; import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; import top.charles7c.continew.starter.core.util.FileUploadUtils; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; +import top.charles7c.continew.starter.data.mybatis.plus.enums.IBaseEnum; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; /** * 公共 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java index ea3bc90c..92aa4b6d 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java @@ -38,8 +38,8 @@ import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleRes import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp; import top.charles7c.continew.admin.monitor.service.DashboardService; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; /** * 仪表盘 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java index 442756f0..ea5ae035 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java @@ -32,10 +32,10 @@ import cn.dev33.satoken.stp.StpUtil; import top.charles7c.continew.admin.auth.model.query.OnlineUserQuery; import top.charles7c.continew.admin.auth.model.resp.OnlineUserResp; import top.charles7c.continew.admin.auth.service.OnlineUserService; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; /** * 在线用户 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java index b211a107..2f57ae71 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java @@ -30,11 +30,11 @@ import top.charles7c.continew.admin.system.model.req.AnnouncementReq; import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp; import top.charles7c.continew.admin.system.model.resp.AnnouncementResp; import top.charles7c.continew.admin.system.service.AnnouncementService; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.charles7c.continew.starter.extension.crud.base.BaseController; import top.charles7c.continew.starter.extension.crud.base.ValidateGroup; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; /** * 公告管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java index 212a863f..595d2049 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java @@ -31,12 +31,12 @@ import top.charles7c.continew.admin.system.model.req.MenuReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.service.MenuService; import top.charles7c.continew.starter.core.util.URLUtils; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.charles7c.continew.starter.extension.crud.base.BaseController; import top.charles7c.continew.starter.extension.crud.base.ValidateGroup; import top.charles7c.continew.starter.extension.crud.enums.Api; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; /** * 菜单管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java index 109faa4c..dc42ed9c 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java @@ -52,8 +52,8 @@ import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.admin.system.service.UserSocialService; import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; import top.charles7c.continew.starter.core.util.ExceptionUtils; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java index 720dd699..369742e9 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java @@ -38,10 +38,10 @@ import top.charles7c.continew.admin.tool.model.req.GenConfigReq; import top.charles7c.continew.admin.tool.model.resp.TableResp; import top.charles7c.continew.admin.tool.service.GeneratorService; import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; /** * 代码生成 API diff --git a/pom.xml b/pom.xml index c34eced1..0ddfb66c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ top.charles7c.continew continew-starter - 1.0.0 + 1.0.1-SNAPSHOT top.charles7c.continew @@ -130,6 +130,15 @@ true + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + always + true + +