mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-10-31 22:57:17 +08:00 
			
		
		
		
	chore: continew-starter 2.3.0 => 2.4.0
1.IBaseEnum => BaseEnum 2.移除 Jackson BaseEnum 配置(已迁移到 Starter 项目) 3.修复导出报错 4.接口文档枚举显示增强
This commit is contained in:
		| @@ -13,7 +13,7 @@ | |||||||
| <img src="https://sonarcloud.io/api/project_badges/measure?project=Charles7c_continew-admin&metric=alert_status" alt="Sonar Status" /> | <img src="https://sonarcloud.io/api/project_badges/measure?project=Charles7c_continew-admin&metric=alert_status" alt="Sonar Status" /> | ||||||
| </a> | </a> | ||||||
| <a href="https://github.com/continew-org/continew-starter" target="_blank"> | <a href="https://github.com/continew-org/continew-starter" target="_blank"> | ||||||
| <img src="https://img.shields.io/badge/ContiNew Starter-2.3.0-%236CB52D.svg" alt="ContiNew Starter" /> | <img src="https://img.shields.io/badge/ContiNew Starter-2.4.0-%236CB52D.svg" alt="ContiNew Starter" /> | ||||||
| </a> | </a> | ||||||
| <a href="https://spring.io/projects/spring-boot" target="_blank"> | <a href="https://spring.io/projects/spring-boot" target="_blank"> | ||||||
| <img src="https://img.shields.io/badge/Spring Boot-3.2.7-%236CB52D.svg?logo=Spring-Boot" alt="Spring Boot" /> | <img src="https://img.shields.io/badge/Spring Boot-3.2.7-%236CB52D.svg?logo=Spring-Boot" alt="Spring Boot" /> | ||||||
| @@ -207,7 +207,7 @@ public class DeptController extends BaseController<DeptService, DeptResp, DeptDe | |||||||
| | <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design</a> | 2.55.0       | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。         | | | <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design</a> | 2.55.0       | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。         | | ||||||
| | <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 5.0.4        | TypeScript 是微软开发的一个开源的编程语言,通过在 JavaScript 的基础上添加静态类型定义构建而成。 | | | <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 5.0.4        | TypeScript 是微软开发的一个开源的编程语言,通过在 JavaScript 的基础上添加静态类型定义构建而成。 | | ||||||
| | <a href="https://cn.vitejs.dev/" target="_blank">Vite</a>    | 5.1.5        | 下一代的前端工具链,为开发提供极速响应。                     | | | <a href="https://cn.vitejs.dev/" target="_blank">Vite</a>    | 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 项目的灵活快速构建提供支持。 | | ||||||
| | <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 3.2.7        | 简化 Spring 应用的初始搭建和开发过程,基于“约定优于配置”的理念,使开发人员不再需要定义样板化的配置。(Spring Boot 3.0 开始,要求 Java 17 作为最低版本) | | | <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 3.2.7        | 简化 Spring 应用的初始搭建和开发过程,基于“约定优于配置”的理念,使开发人员不再需要定义样板化的配置。(Spring Boot 3.0 开始,要求 Java 17 作为最低版本) | | ||||||
| | <a href="https://undertow.io/" target="_blank">Undertow</a>  | 2.3.13.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 | | | <a href="https://undertow.io/" target="_blank">Undertow</a>  | 2.3.13.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 | | ||||||
| | <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.38.0       | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。             | | | <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.38.0       | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。             | | ||||||
|   | |||||||
| @@ -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<IBaseEnum> { |  | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * 静态实例 |  | ||||||
|      */ |  | ||||||
|     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; |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -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<IBaseEnum> { |  | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * 静态实例 |  | ||||||
|      */ |  | ||||||
|     public static final BaseEnumSerializer SERIALIZER_INSTANCE = new BaseEnumSerializer(); |  | ||||||
|  |  | ||||||
|     @Override |  | ||||||
|     public void serialize(IBaseEnum value, JsonGenerator generator, SerializerProvider serializers) throws IOException { |  | ||||||
|         generator.writeObject(value.getValue()); |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -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; |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -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) |  | ||||||
|  * |  | ||||||
|  * <p> |  | ||||||
|  * 默认处理:<br> |  | ||||||
|  * 1. Jackson 会先查找指定枚举类型对应的反序列化器(例如:GenderEnum 枚举类型,则是找 GenderEnum 枚举类型的对应反序列化器);<br> |  | ||||||
|  * 2. 如果找不到则开始查找 Enum 类型(所有枚举父类)的反序列化器;<br> |  | ||||||
|  * 3. 如果都找不到则会采用默认的枚举反序列化器(它仅能根据枚举类型的 name、ordinal 来进行反序列化)。 |  | ||||||
|  * </p> |  | ||||||
|  * <p> |  | ||||||
|  * 重写增强后:<br> |  | ||||||
|  * 1. 同默认 1;<br> |  | ||||||
|  * 2. 同默认 2;<br> |  | ||||||
|  * 3. 如果也找不到 Enum 类型(所有枚举父类)的反序列化器,开始查找指定枚举类型的接口的反序列化器(例如:GenderEnum 枚举类型,则是找它的接口 IBaseEnum 的反序列化器);<br> |  | ||||||
|  * 4. 同默认 3。 |  | ||||||
|  * </p> |  | ||||||
|  * |  | ||||||
|  * @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; |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.common.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum DataScopeEnum implements IBaseEnum<Integer> { | public enum DataScopeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 全部数据权限 |      * 全部数据权限 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.common.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.admin.common.constant.UiConstants; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum DisEnableStatusEnum implements IBaseEnum<Integer> { | public enum DisEnableStatusEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 启用 |      * 启用 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.common.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum GenderEnum implements IBaseEnum<Integer> { | public enum GenderEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 未知 |      * 未知 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.common.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum MenuTypeEnum implements IBaseEnum<Integer> { | public enum MenuTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 目录 |      * 目录 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.common.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.admin.common.constant.UiConstants; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum MessageTypeEnum implements IBaseEnum<Integer> { | public enum MessageTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 安全消息 |      * 安全消息 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.common.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.admin.common.constant.UiConstants; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum SuccessFailureStatusEnum implements IBaseEnum<Integer> { | public enum SuccessFailureStatusEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 成功 |      * 成功 | ||||||
|   | |||||||
| @@ -30,6 +30,7 @@ import top.continew.starter.core.util.ExceptionUtils; | |||||||
| import top.continew.starter.core.util.IpUtils; | import top.continew.starter.core.util.IpUtils; | ||||||
| import top.continew.starter.extension.crud.service.CommonUserService; | import top.continew.starter.extension.crud.service.CommonUserService; | ||||||
| import top.continew.starter.web.util.ServletUtils; | import top.continew.starter.web.util.ServletUtils; | ||||||
|  | import top.continew.starter.web.util.SpringWebUtils; | ||||||
|  |  | ||||||
| import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||||
|  |  | ||||||
| @@ -53,7 +54,7 @@ public class LoginHelper { | |||||||
|      */ |      */ | ||||||
|     public static String login(LoginUser loginUser) { |     public static String login(LoginUser loginUser) { | ||||||
|         // 记录登录信息 |         // 记录登录信息 | ||||||
|         HttpServletRequest request = ServletUtils.getRequest(); |         HttpServletRequest request = SpringWebUtils.getRequest(); | ||||||
|         loginUser.setIp(JakartaServletUtil.getClientIP(request)); |         loginUser.setIp(JakartaServletUtil.getClientIP(request)); | ||||||
|         loginUser.setAddress(ExceptionUtils.exToNull(() -> IpUtils.getIpv4Address(loginUser.getIp()))); |         loginUser.setAddress(ExceptionUtils.exToNull(() -> IpUtils.getIpv4Address(loginUser.getIp()))); | ||||||
|         loginUser.setBrowser(ServletUtils.getBrowser(request)); |         loginUser.setBrowser(ServletUtils.getBrowser(request)); | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.generator.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum FormTypeEnum implements IBaseEnum<Integer> { | public enum FormTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 输入框 |      * 输入框 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.generator.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum QueryTypeEnum implements IBaseEnum<Integer> { | public enum QueryTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 等于 =,例如:WHERE age = 18 |      * 等于 =,例如:WHERE age = 18 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum JobBlockStrategyEnum implements IBaseEnum<Integer> { | public enum JobBlockStrategyEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 丢弃 |      * 丢弃 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum JobExecuteReasonEnum implements IBaseEnum<Integer> { | public enum JobExecuteReasonEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 无 |      * 无 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.job.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.admin.common.constant.UiConstants; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum JobExecuteStatusEnum implements IBaseEnum<Integer> { | public enum JobExecuteStatusEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 待处理 |      * 待处理 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum JobRouteStrategyEnum implements IBaseEnum<Integer> { | public enum JobRouteStrategyEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 轮询 |      * 轮询 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.job.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.admin.common.constant.UiConstants; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum JobStatusEnum implements IBaseEnum<Integer> { | public enum JobStatusEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 禁用 |      * 禁用 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.job.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.admin.common.constant.UiConstants; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum JobTaskTypeEnum implements IBaseEnum<Integer> { | public enum JobTaskTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 集群 |      * 集群 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.job.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum JobTriggerTypeEnum implements IBaseEnum<Integer> { | public enum JobTriggerTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * CRON |      * CRON | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.enums; | |||||||
| import cn.hutool.core.util.StrUtil; | import cn.hutool.core.util.StrUtil; | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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.Arrays; | ||||||
| import java.util.Collections; | import java.util.Collections; | ||||||
| @@ -33,7 +33,7 @@ import java.util.List; | |||||||
|  */ |  */ | ||||||
| @Getter | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum FileTypeEnum implements IBaseEnum<Integer> { | public enum FileTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 其他 |      * 其他 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.enums; | |||||||
| import cn.hutool.core.collection.CollUtil; | import cn.hutool.core.collection.CollUtil; | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.starter.data.mybatis.plus.base.IBaseEnum; | import top.continew.starter.core.enums.BaseEnum; | ||||||
|  |  | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
| @@ -31,7 +31,7 @@ import java.util.List; | |||||||
|  */ |  */ | ||||||
| @Getter | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum ImportPolicyEnum implements IBaseEnum<Integer> { | public enum ImportPolicyEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 跳过该行 |      * 跳过该行 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum LogStatusEnum implements IBaseEnum<Integer> { | public enum LogStatusEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 成功 |      * 成功 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.enums; | |||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import top.continew.admin.common.constant.UiConstants; | 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; | import java.time.LocalDateTime; | ||||||
|  |  | ||||||
| @@ -31,7 +31,7 @@ import java.time.LocalDateTime; | |||||||
|  */ |  */ | ||||||
| @Getter | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum NoticeStatusEnum implements IBaseEnum<Integer> { | public enum NoticeStatusEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 待发布 |      * 待发布 | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.enums; | |||||||
|  |  | ||||||
| import lombok.Getter; | import lombok.Getter; | ||||||
| import lombok.RequiredArgsConstructor; | 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 | @Getter | ||||||
| @RequiredArgsConstructor | @RequiredArgsConstructor | ||||||
| public enum StorageTypeEnum implements IBaseEnum<Integer> { | public enum StorageTypeEnum implements BaseEnum<Integer> { | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 兼容S3协议存储 |      * 兼容S3协议存储 | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | import top.continew.admin.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.starter.extension.crud.annotation.TreeField; | 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 top.continew.starter.extension.crud.model.resp.BaseDetailResp; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty; | |||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | 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 top.continew.starter.extension.crud.model.resp.BaseDetailResp; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DataScopeEnum; | import top.continew.admin.common.enums.DataScopeEnum; | ||||||
| import top.continew.admin.system.service.RoleDeptService; | 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 top.continew.starter.extension.crud.model.resp.BaseDetailResp; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ import top.continew.admin.common.enums.DisEnableStatusEnum; | |||||||
| import top.continew.admin.common.enums.GenderEnum; | import top.continew.admin.common.enums.GenderEnum; | ||||||
| import top.continew.admin.common.util.helper.LoginHelper; | import top.continew.admin.common.util.helper.LoginHelper; | ||||||
| import top.continew.admin.system.service.DeptService; | 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.extension.crud.model.resp.BaseDetailResp; | ||||||
| import top.continew.starter.file.excel.converter.ExcelListConverter; | import top.continew.starter.file.excel.converter.ExcelListConverter; | ||||||
| import top.continew.starter.security.crypto.annotation.FieldEncrypt; | import top.continew.starter.security.crypto.annotation.FieldEncrypt; | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; | |||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.system.enums.LogStatusEnum; | 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.Serial; | ||||||
| import java.io.Serializable; | import java.io.Serializable; | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; | |||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.system.enums.LogStatusEnum; | 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.Serial; | ||||||
| import java.io.Serializable; | import java.io.Serializable; | ||||||
|   | |||||||
| @@ -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.autoconfigure.project.ProjectProperties; | ||||||
| import top.continew.starter.core.constant.StringConstants; | import top.continew.starter.core.constant.StringConstants; | ||||||
| import top.continew.starter.core.util.validate.CheckUtils; | 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.model.resp.LabelValueResp; | ||||||
| import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; | import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; | ||||||
|  |  | ||||||
| @@ -106,7 +106,7 @@ public class DictItemServiceImpl extends BaseServiceImpl<DictItemMapper, DictIte | |||||||
|     private List<LabelValueResp> toEnumDict(Class<?> enumClass) { |     private List<LabelValueResp> toEnumDict(Class<?> enumClass) { | ||||||
|         Object[] enumConstants = enumClass.getEnumConstants(); |         Object[] enumConstants = enumClass.getEnumConstants(); | ||||||
|         return Arrays.stream(enumConstants).map(e -> { |         return Arrays.stream(enumConstants).map(e -> { | ||||||
|             IBaseEnum baseEnum = (IBaseEnum)e; |             BaseEnum baseEnum = (BaseEnum)e; | ||||||
|             return new LabelValueResp(baseEnum.getDescription(), baseEnum.getValue(), baseEnum.getColor()); |             return new LabelValueResp(baseEnum.getDescription(), baseEnum.getValue(), baseEnum.getColor()); | ||||||
|         }).toList(); |         }).toList(); | ||||||
|     } |     } | ||||||
| @@ -116,7 +116,7 @@ public class DictItemServiceImpl extends BaseServiceImpl<DictItemMapper, DictIte | |||||||
|      */ |      */ | ||||||
|     @PostConstruct |     @PostConstruct | ||||||
|     public void init() { |     public void init() { | ||||||
|         Set<Class<?>> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), IBaseEnum.class); |         Set<Class<?>> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), BaseEnum.class); | ||||||
|         ENUM_DICT_CACHE.putAll(classSet.stream() |         ENUM_DICT_CACHE.putAll(classSet.stream() | ||||||
|             .collect(Collectors.toMap(cls -> StrUtil.toUnderlineCase(cls.getSimpleName()) |             .collect(Collectors.toMap(cls -> StrUtil.toUnderlineCase(cls.getSimpleName()) | ||||||
|                 .toLowerCase(), this::toEnumDict))); |                 .toLowerCase(), this::toEnumDict))); | ||||||
|   | |||||||
| @@ -5,5 +5,5 @@ | |||||||
|   \____|\___/ |_| |_| \__||_||_| \_| \___|  \_/\_/       /_/   \_\\__,_||_| |_| |_||_||_| |_| |   \____|\___/ |_| |_| \__||_||_| \_| \___|  \_/\_/       /_/   \_\\__,_||_| |_| |_||_||_| |_| | ||||||
|  |  | ||||||
|  :: ${project.name}   ::                                               v${project.version} |  :: ${project.name}   ::                                               v${project.version} | ||||||
|  :: ContiNew Starter ::                                               v2.3.0 |  :: ContiNew Starter ::                                               v2.4.0 | ||||||
|  :: Spring Boot      ::                                               v${spring-boot.version} |  :: Spring Boot      ::                                               v${spring-boot.version} | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							| @@ -13,7 +13,7 @@ | |||||||
|     <parent> |     <parent> | ||||||
|         <groupId>top.continew</groupId> |         <groupId>top.continew</groupId> | ||||||
|         <artifactId>continew-starter</artifactId> |         <artifactId>continew-starter</artifactId> | ||||||
|         <version>2.3.0</version> |         <version>2.4.0</version> | ||||||
|     </parent> |     </parent> | ||||||
|  |  | ||||||
|     <groupId>top.continew</groupId> |     <groupId>top.continew</groupId> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user