From 5b2e3d8410ed91e8e473dbca62910c742d68adcb Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 31 Jul 2024 22:35:45 +0800 Subject: [PATCH] chore: continew-starter 2.3.0 => 2.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.IBaseEnum => BaseEnum 2.移除 Jackson BaseEnum 配置（已迁移到 Starter 项目） 3.修复导出报错 4.接口文档枚举显示增强 --- README.md | 4 +- .../config/jackson/BaseEnumDeserializer.java | 76 ------------------- .../config/jackson/BaseEnumSerializer.java | 46 ----------- .../config/jackson/JacksonConfiguration.java | 54 ------------- .../jackson/SimpleDeserializersWrapper.java | 68 ----------------- .../admin/common/enums/DataScopeEnum.java | 4 +- .../common/enums/DisEnableStatusEnum.java | 4 +- .../admin/common/enums/GenderEnum.java | 4 +- .../admin/common/enums/MenuTypeEnum.java | 4 +- .../admin/common/enums/MessageTypeEnum.java | 4 +- .../enums/SuccessFailureStatusEnum.java | 4 +- .../admin/common/util/helper/LoginHelper.java | 3 +- .../admin/generator/enums/FormTypeEnum.java | 4 +- .../admin/generator/enums/QueryTypeEnum.java | 4 +- .../admin/job/enums/JobBlockStrategyEnum.java | 4 +- .../admin/job/enums/JobExecuteReasonEnum.java | 4 +- .../admin/job/enums/JobExecuteStatusEnum.java | 4 +- .../admin/job/enums/JobRouteStrategyEnum.java | 4 +- .../admin/job/enums/JobStatusEnum.java | 4 +- .../admin/job/enums/JobTaskTypeEnum.java | 4 +- .../admin/job/enums/JobTriggerTypeEnum.java | 4 +- .../admin/system/enums/FileTypeEnum.java | 4 +- .../admin/system/enums/ImportPolicyEnum.java | 4 +- .../admin/system/enums/LogStatusEnum.java | 4 +- .../admin/system/enums/NoticeStatusEnum.java | 4 +- .../admin/system/enums/StorageTypeEnum.java | 4 +- .../admin/system/model/resp/DeptResp.java | 2 +- .../admin/system/model/resp/DictItemResp.java | 2 +- .../system/model/resp/RoleDetailResp.java | 2 +- .../system/model/resp/UserDetailResp.java | 2 +- .../model/resp/log/LoginLogExportResp.java | 2 +- .../resp/log/OperationLogExportResp.java | 2 +- .../service/impl/DictItemServiceImpl.java | 6 +- .../src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 35 files changed, 55 insertions(+), 298 deletions(-) delete mode 100644 continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java delete mode 100644 continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java delete mode 100644 continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java delete mode 100644 continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java diff --git a/README.md b/README.md index ceb339aa..6f1ba1e4 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Sonar Status -ContiNew Starter +ContiNew Starter Spring Boot @@ -207,7 +207,7 @@ public class DeptController extends BaseControllerArco Design | 2.55.0 | 字节跳动推出的前端 UI 框架，年轻化的色彩和组件设计。 | | TypeScript | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 | | Vite | 5.1.5 | 下一代的前端工具链，为开发提供极速响应。 | -| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.3.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | +| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.4.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | | Spring Boot | 3.2.7 | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） | | Undertow | 2.3.13.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 | | Sa-Token + JWT | 1.38.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 | diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java deleted file mode 100644 index 738729a8..00000000 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.continew.admin.common.config.jackson; - -import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReflectUtil; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; - -import java.io.IOException; -import java.lang.reflect.Field; - -/** - * 通用枚举接口 IBaseEnum 反序列化器 - * - * @author Charles7c - * @see IBaseEnum - * @since 2023/1/8 13:56 - */ -@JacksonStdImpl -public class BaseEnumDeserializer extends JsonDeserializer { - - /** - * 静态实例 - */ - public static final BaseEnumDeserializer SERIALIZER_INSTANCE = new BaseEnumDeserializer(); - - @Override - public IBaseEnum deserialize(JsonParser jsonParser, - DeserializationContext deserializationContext) throws IOException { - Class targetClass = jsonParser.getCurrentValue().getClass(); - String fieldName = jsonParser.getCurrentName(); - String value = jsonParser.getText(); - return this.getEnum(targetClass, value, fieldName); - } - - /** - * 通过某字段对应值获取枚举实例，获取不到时为 {@code null} - * - * @param targetClass 目标类型 - * @param value 字段值 - * @param fieldName 字段名 - * @return 对应枚举实例 ，获取不到时为 {@code null} - */ - private IBaseEnum getEnum(Class targetClass, String value, String fieldName) { - Field field = ReflectUtil.getField(targetClass, fieldName); - Class fieldTypeClass = field.getType(); - Object[] enumConstants = fieldTypeClass.getEnumConstants(); - for (Object enumConstant : enumConstants) { - if (ClassUtil.isAssignable(IBaseEnum.class, fieldTypeClass)) { - IBaseEnum baseEnum = (IBaseEnum)enumConstant; - if (baseEnum.getValue().equals(Integer.valueOf(value))) { - return baseEnum; - } - } - } - return null; - } -} diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java deleted file mode 100644 index c2488006..00000000 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.continew.admin.common.config.jackson; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; - -import java.io.IOException; - -/** - * 通用枚举接口 IBaseEnum 序列化器 - * - * @author Charles7c - * @see IBaseEnum - * @since 2023/1/8 13:56 - */ -@JacksonStdImpl -public class BaseEnumSerializer extends JsonSerializer { - - /** - * 静态实例 - */ - public static final BaseEnumSerializer SERIALIZER_INSTANCE = new BaseEnumSerializer(); - - @Override - public void serialize(IBaseEnum value, JsonGenerator generator, SerializerProvider serializers) throws IOException { - generator.writeObject(value.getValue()); - } -} diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java deleted file mode 100644 index 3d76a9ba..00000000 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.continew.admin.common.config.jackson; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; - -/** - * Jackson 配置 - * - * @author Charles7c - * @see IBaseEnum - * @since 2022/12/11 13:23 - */ -@Slf4j -@Configuration -public class JacksonConfiguration { - - /** - * 针对枚举接口 IBaseEnum 的序列化和反序列化 - */ - @Bean - public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) { - SimpleModule simpleModule = new SimpleModule(); - simpleModule.addSerializer(IBaseEnum.class, BaseEnumSerializer.SERIALIZER_INSTANCE); - - SimpleDeserializersWrapper deserializers = new SimpleDeserializersWrapper(); - deserializers.addDeserializer(IBaseEnum.class, BaseEnumDeserializer.SERIALIZER_INSTANCE); - simpleModule.setDeserializers(deserializers); - - ObjectMapper objectMapper = builder.createXmlMapper(false).build(); - objectMapper.registerModule(simpleModule); - return objectMapper; - } -} diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java deleted file mode 100644 index 99d6a536..00000000 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.continew.admin.common.config.jackson; - -import com.fasterxml.jackson.databind.BeanDescription; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.module.SimpleDeserializers; -import com.fasterxml.jackson.databind.type.ClassKey; -import lombok.extern.slf4j.Slf4j; - -/** - * 反序列化器包装类（重写 Jackson 反序列化枚举方法，参阅：FasterXML/jackson-databind#2842） - * - *

- * 默认处理：
- * 1. Jackson 会先查找指定枚举类型对应的反序列化器（例如：GenderEnum 枚举类型，则是找 GenderEnum 枚举类型的对应反序列化器）；
- * 2. 如果找不到则开始查找 Enum 类型（所有枚举父类）的反序列化器；
- * 3. 如果都找不到则会采用默认的枚举反序列化器（它仅能根据枚举类型的 name、ordinal 来进行反序列化）。 - *

- *

- * 重写增强后：
- * 1. 同默认 1；
- * 2. 同默认 2；
- * 3. 如果也找不到 Enum 类型（所有枚举父类）的反序列化器，开始查找指定枚举类型的接口的反序列化器（例如：GenderEnum 枚举类型，则是找它的接口 IBaseEnum 的反序列化器）；
- * 4. 同默认 3。 - *

- * - * @author Charles7c - * @since 2023/1/8 13:28 - */ -@Slf4j -public class SimpleDeserializersWrapper extends SimpleDeserializers { - - @Override - public JsonDeserializer findEnumDeserializer(Class type, - DeserializationConfig config, - BeanDescription beanDesc) throws JsonMappingException { - JsonDeserializer deser = super.findEnumDeserializer(type, config, beanDesc); - if (null != deser) { - return deser; - } - - // 重写增强：开始查找指定枚举类型的接口的反序列化器（例如：GenderEnum 枚举类型，则是找它的接口 BaseEnum 的反序列化器） - for (Class typeInterface : type.getInterfaces()) { - deser = this._classMappings.get(new ClassKey(typeInterface)); - if (null != deser) { - return deser; - } - } - return null; - } -} diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java index f22761f4..e0dfc123 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 数据权限枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum DataScopeEnum implements IBaseEnum { +public enum DataScopeEnum implements BaseEnum { /** * 全部数据权限 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java index 305fb7e2..7dd834e3 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.UiConstants; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 启用/禁用状态枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum DisEnableStatusEnum implements IBaseEnum { +public enum DisEnableStatusEnum implements BaseEnum { /** * 启用 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java index 9f1f7f42..f1bd9399 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 性别枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum GenderEnum implements IBaseEnum { +public enum GenderEnum implements BaseEnum { /** * 未知 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java index 09b55009..578004bc 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 菜单类型枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum MenuTypeEnum implements IBaseEnum { +public enum MenuTypeEnum implements BaseEnum { /** * 目录 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java index f8f8b113..edc27748 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.UiConstants; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 消息类型枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum MessageTypeEnum implements IBaseEnum { +public enum MessageTypeEnum implements BaseEnum { /** * 安全消息 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java index 2cff8df0..b38c8046 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.UiConstants; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 成功/失败状态枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum SuccessFailureStatusEnum implements IBaseEnum { +public enum SuccessFailureStatusEnum implements BaseEnum { /** * 成功 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java index fe3e0d5c..ba0b113b 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java @@ -30,6 +30,7 @@ import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.IpUtils; import top.continew.starter.extension.crud.service.CommonUserService; import top.continew.starter.web.util.ServletUtils; +import top.continew.starter.web.util.SpringWebUtils; import java.time.LocalDateTime; @@ -53,7 +54,7 @@ public class LoginHelper { */ public static String login(LoginUser loginUser) { // 记录登录信息 - HttpServletRequest request = ServletUtils.getRequest(); + HttpServletRequest request = SpringWebUtils.getRequest(); loginUser.setIp(JakartaServletUtil.getClientIP(request)); loginUser.setAddress(ExceptionUtils.exToNull(() -> IpUtils.getIpv4Address(loginUser.getIp()))); loginUser.setBrowser(ServletUtils.getBrowser(request)); diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java index d3f992de..27ff6f9e 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 表单类型枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum FormTypeEnum implements IBaseEnum { +public enum FormTypeEnum implements BaseEnum { /** * 输入框 diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java index f11b9c71..005fb036 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 查询类型枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum QueryTypeEnum implements IBaseEnum { +public enum QueryTypeEnum implements BaseEnum { /** * 等于 =，例如：WHERE age = 18 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java index 9a41f6fe..fd20309f 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 任务阻塞策略枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum JobBlockStrategyEnum implements IBaseEnum { +public enum JobBlockStrategyEnum implements BaseEnum { /** * 丢弃 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java index 464207b6..d1f14660 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 任务执行原因枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum JobExecuteReasonEnum implements IBaseEnum { +public enum JobExecuteReasonEnum implements BaseEnum { /** * 无 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java index 26f7f6d2..373fd796 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.job.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.UiConstants; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 任务执行状态枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum JobExecuteStatusEnum implements IBaseEnum { +public enum JobExecuteStatusEnum implements BaseEnum { /** * 待处理 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java index e8144581..794bfbbd 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 任务路由策略枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum JobRouteStrategyEnum implements IBaseEnum { +public enum JobRouteStrategyEnum implements BaseEnum { /** * 轮询 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java index 4c324136..783d20a0 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.job.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.UiConstants; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 任务状态枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum JobStatusEnum implements IBaseEnum { +public enum JobStatusEnum implements BaseEnum { /** * 禁用 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java index 0cebde65..c029f2be 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.job.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.UiConstants; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 任务类型枚举 @@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum JobTaskTypeEnum implements IBaseEnum { +public enum JobTaskTypeEnum implements BaseEnum { /** * 集群 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java index e3bc71d1..de2fff49 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 任务触发类型枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum JobTriggerTypeEnum implements IBaseEnum { +public enum JobTriggerTypeEnum implements BaseEnum { /** * CRON diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java index 1f7239f9..487f4a12 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.system.enums; import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; import java.util.Arrays; import java.util.Collections; @@ -33,7 +33,7 @@ import java.util.List; */ @Getter @RequiredArgsConstructor -public enum FileTypeEnum implements IBaseEnum { +public enum FileTypeEnum implements BaseEnum { /** * 其他 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java index c7e0544e..13e16284 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.system.enums; import cn.hutool.core.collection.CollUtil; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; import java.util.List; @@ -31,7 +31,7 @@ import java.util.List; */ @Getter @RequiredArgsConstructor -public enum ImportPolicyEnum implements IBaseEnum { +public enum ImportPolicyEnum implements BaseEnum { /** * 跳过该行 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java index 9a9d2f63..3156ced2 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 操作状态枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum LogStatusEnum implements IBaseEnum { +public enum LogStatusEnum implements BaseEnum { /** * 成功 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java index 0ba5144f..8fb45fd0 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java @@ -19,7 +19,7 @@ package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.UiConstants; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; import java.time.LocalDateTime; @@ -31,7 +31,7 @@ import java.time.LocalDateTime; */ @Getter @RequiredArgsConstructor -public enum NoticeStatusEnum implements IBaseEnum { +public enum NoticeStatusEnum implements BaseEnum { /** * 待发布 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java index 32edb447..219362f5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java @@ -18,7 +18,7 @@ package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; /** * 存储类型枚举 @@ -28,7 +28,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; */ @Getter @RequiredArgsConstructor -public enum StorageTypeEnum implements IBaseEnum { +public enum StorageTypeEnum implements BaseEnum { /** * 兼容S3协议存储 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java index df9b9ea6..5218465f 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java @@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.annotation.TreeField; -import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java index c23f8fbe..f5308edb 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java @@ -20,7 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java index 3698b4d8..064cc7bf 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java @@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DataScopeEnum; import top.continew.admin.system.service.RoleDeptService; -import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java index 33488644..4d7fce2d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java @@ -31,7 +31,7 @@ import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.common.enums.GenderEnum; import top.continew.admin.common.util.helper.LoginHelper; import top.continew.admin.system.service.DeptService; -import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.continew.starter.file.excel.converter.ExcelListConverter; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java index 3426b99c..c8d3b3b8 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java @@ -21,7 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.system.enums.LogStatusEnum; -import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java index c7f3b9a4..af9bf89e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java @@ -21,7 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.system.enums.LogStatusEnum; -import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java index 2710c4b6..c5f7d58a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java @@ -33,7 +33,7 @@ import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.validate.CheckUtils; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; @@ -106,7 +106,7 @@ public class DictItemServiceImpl extends BaseServiceImpl toEnumDict(Class enumClass) { Object[] enumConstants = enumClass.getEnumConstants(); return Arrays.stream(enumConstants).map(e -> { - IBaseEnum baseEnum = (IBaseEnum)e; + BaseEnum baseEnum = (BaseEnum)e; return new LabelValueResp(baseEnum.getDescription(), baseEnum.getValue(), baseEnum.getColor()); }).toList(); } @@ -116,7 +116,7 @@ public class DictItemServiceImpl extends BaseServiceImpl> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), IBaseEnum.class); + Set> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), BaseEnum.class); ENUM_DICT_CACHE.putAll(classSet.stream() .collect(Collectors.toMap(cls -> StrUtil.toUnderlineCase(cls.getSimpleName()) .toLowerCase(), this::toEnumDict))); diff --git a/continew-admin-webapi/src/main/resources/banner.txt b/continew-admin-webapi/src/main/resources/banner.txt index eab57481..29cddd83 100644 --- a/continew-admin-webapi/src/main/resources/banner.txt +++ b/continew-admin-webapi/src/main/resources/banner.txt @@ -5,5 +5,5 @@ \____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_| :: ${project.name} :: v${project.version} - :: ContiNew Starter :: v2.3.0 + :: ContiNew Starter :: v2.4.0 :: Spring Boot :: v${spring-boot.version} diff --git a/pom.xml b/pom.xml index a0fcac1d..6c4a9344 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ top.continew continew-starter - 2.3.0 + 2.4.0 top.continew