chore: continew-starter 2.3.0 => 2.4.0

1.IBaseEnum => BaseEnum 2.移除 Jackson BaseEnum 配置（已迁移到 Starter 项目） 3.修复导出报错 4.接口文档枚举显示增强
continew-org · Jul 31, 2024 · 5b2e3d8 · 5b2e3d8
1 parent 6848559
commit 5b2e3d8
Show file tree

Hide file tree

Showing 35 changed files with 55 additions and 298 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 <img src="https://sonarcloud.io/api/project_badges/measure?project=Charles7c_continew-admin&metric=alert_status" alt="Sonar Status" />
 </a>
 <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 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" />
@@ -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://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        | 下一代的前端工具链，为开发提供极速响应。                     |
-| [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://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 权限认证框架，让鉴权变得简单、优雅。             |

diff --git a/...n-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java b/...n-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java
diff --git a/...min-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java b/...min-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java
diff --git a/...n-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java b/...n-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java
diff --git a/...on/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java b/...on/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java
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
@@ -18,7 +18,7 @@
 
 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 @@
  */
 @Getter
 @RequiredArgsConstructor
-public enum DataScopeEnum implements IBaseEnum<Integer> {
+public enum DataScopeEnum implements BaseEnum<Integer> {
 
     /**
      * 全部数据权限

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
@@ -19,7 +19,7 @@
 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 @@
  */
 @Getter
 @RequiredArgsConstructor
-public enum DisEnableStatusEnum implements IBaseEnum<Integer> {
+public enum DisEnableStatusEnum implements BaseEnum<Integer> {
 
     /**
      * 启用

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
@@ -18,7 +18,7 @@
 
 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 @@
  */
 @Getter
 @RequiredArgsConstructor
-public enum GenderEnum implements IBaseEnum<Integer> {
+public enum GenderEnum implements BaseEnum<Integer> {
 
     /**
      * 未知

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
@@ -18,7 +18,7 @@
 
 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 @@
  */
 @Getter
 @RequiredArgsConstructor
-public enum MenuTypeEnum implements IBaseEnum<Integer> {
+public enum MenuTypeEnum implements BaseEnum<Integer> {
 
     /**
      * 目录

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
@@ -19,7 +19,7 @@
 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 @@
  */
 @Getter
 @RequiredArgsConstructor
-public enum MessageTypeEnum implements IBaseEnum<Integer> {
+public enum MessageTypeEnum implements BaseEnum<Integer> {
 
     /**
      * 安全消息

diff --git a/...-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java b/...-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java
@@ -19,7 +19,7 @@
 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 @@
  */
 @Getter
 @RequiredArgsConstructor
-public enum SuccessFailureStatusEnum implements IBaseEnum<Integer> {
+public enum SuccessFailureStatusEnum implements BaseEnum<Integer> {
 
     /**
      * 成功

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
@@ -30,6 +30,7 @@
 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 @@ private 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));