From c87317d19946989e86dfbc5f24b155b2ea5abdc9 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 7 Sep 2024 19:00:06 +0800 Subject: [PATCH] chore: continew-starter 2.5.2 => 2.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复更新加密失效 修复特殊校验异常不打印堆栈 其他优化 Closes #84 --- README.md | 24 ++++++++++--------- continew-admin-common/pom.xml | 2 +- .../exception/GlobalExceptionHandler.java | 6 ++--- .../GlobalSaTokenExceptionHandler.java | 6 ++--- .../mybatis/DataPermissionFilterImpl.java | 6 ++--- .../config/mybatis/DataPermissionMapper.java | 4 ++-- .../mybatis/MybatisPlusConfiguration.java | 2 +- .../continew-admin-job-server/pom.xml | 2 +- .../generator/mapper/FieldConfigMapper.java | 2 +- .../generator/mapper/GenConfigMapper.java | 2 +- .../resources/templates/backend/Mapper.ftl | 2 +- .../resources/templates/frontend/index.ftl | 2 +- .../admin/system/mapper/DeptMapper.java | 2 +- .../admin/system/mapper/DictItemMapper.java | 2 +- .../admin/system/mapper/DictMapper.java | 2 +- .../admin/system/mapper/FileMapper.java | 2 +- .../admin/system/mapper/LogMapper.java | 2 +- .../admin/system/mapper/MenuMapper.java | 2 +- .../admin/system/mapper/MessageMapper.java | 2 +- .../system/mapper/MessageUserMapper.java | 2 +- .../admin/system/mapper/NoticeMapper.java | 2 +- .../admin/system/mapper/OptionMapper.java | 2 +- .../admin/system/mapper/RoleDeptMapper.java | 2 +- .../admin/system/mapper/RoleMapper.java | 2 +- .../admin/system/mapper/RoleMenuMapper.java | 2 +- .../admin/system/mapper/StorageMapper.java | 2 +- .../admin/system/mapper/UserMapper.java | 2 +- .../mapper/UserPasswordHistoryMapper.java | 2 +- .../admin/system/mapper/UserRoleMapper.java | 2 +- .../admin/system/mapper/UserSocialMapper.java | 2 +- .../admin/system/service/DeptService.java | 2 +- .../admin/system/service/DictItemService.java | 2 +- .../admin/system/service/DictService.java | 2 +- .../admin/system/service/FileService.java | 2 +- .../admin/system/service/MenuService.java | 2 +- .../admin/system/service/NoticeService.java | 2 +- .../admin/system/service/RoleService.java | 2 +- .../admin/system/service/StorageService.java | 2 +- .../admin/system/service/UserService.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 4 ++-- .../service/impl/MessageServiceImpl.java | 2 +- .../service/impl/OptionServiceImpl.java | 2 +- .../admin/config/log/LogDaoLocalImpl.java | 2 +- .../src/main/resources/banner.txt | 2 +- .../src/main/resources/config/application.yml | 2 ++ pom.xml | 2 +- 46 files changed, 67 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 939d2e22..aaab5a48 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Sonar Status -ContiNew Starter +ContiNew Starter Spring Boot @@ -210,16 +210,16 @@ public class DeptController extends BaseControllerVue | 3.4.21 | 渐进式 JavaScript 框架，易学易用，性能出色，适用场景丰富的 Web 前端框架。 | -| Arco Design | 2.55.0 | 字节跳动推出的前端 UI 框架，年轻化的色彩和组件设计。 | +| Arco Design | 2.56.0 | 字节跳动推出的前端 UI 框架，年轻化的色彩和组件设计。 | | TypeScript | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 | | Vite | 5.1.5 | 下一代的前端工具链，为开发提供极速响应。 | -| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.5.2 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | +| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.6.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 权限认证框架，让鉴权变得简单、优雅。 | +| Sa-Token + JWT | 1.39.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 | | MyBatis Plus | 3.5.7 | MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率。 | | dynamic-datasource-spring-boot-starter | 4.3.1 | 基于 Spring Boot 的快速集成多数据源的启动器。 | | Hikari | 5.0.1 | JDBC 连接池，号称 “史上最快连接池”，SpringBoot 在 2.0 之后，采用的默认数据库连接池就是 Hikari。 | @@ -228,18 +228,20 @@ public class DeptController extends BaseControllerP6Spy | 3.9.1 | SQL 性能分析组件。 | | Liquibase | 4.24.0 | 用于管理数据库版本，跟踪、管理和应用数据库变化。 | | [JetCache](https://github.com/alibaba/jetcache/blob/master/docs/CN/Readme.md) | 2.7.6 | 一个基于 Java 的缓存系统封装，提供统一的 API 和注解来简化缓存的使用。提供了比 SpringCache 更加强大的注解，可以原生的支持 TTL、两级缓存、分布式自动刷新，还提供了 Cache 接口用于手工缓存操作。 | -| Redisson | 3.32.0 | 不仅仅是一个 Redis Java 客户端，Redisson 充分的利用了 Redis 键值数据库提供的一系列优势，为使用者提供了一系列具有分布式特性的常用工具：分布式锁、限流器等。 | +| Redisson | 3.35.0 | 不仅仅是一个 Redis Java 客户端，Redisson 充分的利用了 Redis 键值数据库提供的一系列优势，为使用者提供了一系列具有分布式特性的常用工具：分布式锁、限流器等。 | | Redis | 7.2.3 | 高性能的 key-value 数据库。 | -| [Snail Job](https://snailjob.opensnail.com/) | 1.1.0 | 灵活，可靠和快速的分布式任务重试和分布式任务调度平台。 | -| [X File Storage](https://x-file-storage.xuyanwu.cn/#/) | 2.2.0 | 一行代码将文件存储到本地、FTP、SFTP、WebDAV、阿里云 OSS、华为云 OBS...等其它兼容 S3 协议的存储平台。 | -| SMS4J | 3.2.1 | 短信聚合框架，轻松集成多家短信服务，解决接入多个短信 SDK 的繁琐流程。 | +| [Snail Job](https://snailjob.opensnail.com/) | 1.1.2 | 灵活，可靠和快速的分布式任务重试和分布式任务调度平台。 | +| [X File Storage](https://x-file-storage.xuyanwu.cn/#/) | 2.2.1 | 一行代码将文件存储到本地、FTP、SFTP、WebDAV、阿里云 OSS、华为云 OBS...等其它兼容 S3 协议的存储平台。 | +| SMS4J | 3.3.2 | 短信聚合框架，轻松集成多家短信服务，解决接入多个短信 SDK 的繁琐流程。 | | Just Auth | 1.16.6 | 开箱即用的整合第三方登录的开源组件，脱离繁琐的第三方登录 SDK，让登录变得 So easy！ | | Easy Excel | 4.0.1 | 一个基于 Java 的、快速、简洁、解决大文件内存溢出的 Excel 处理工具。 | | [AJ-Captcha](https://ajcaptcha.beliefteam.cn/captcha-doc/) | 1.3.0 | Java 行为验证码，包含滑动拼图、文字点选两种方式，UI支持弹出和嵌入两种方式。 | | Easy Captcha | 1.6.2 | Java 图形验证码，支持 gif、中文、算术等类型，可用于 Java Web、JavaSE 等项目。 | | [Crane4j](https://createsequence.gitee.io/crane4j-doc/#/) | 2.9.0 | 一个基于注解的，用于完成一切 “根据 A 的 key 值拿到 B，再把 B 的属性映射到 A” 这类需求的字段填充框架。 | +| [CosID](https://cosid.ahoo.me/guide/getting-started.html) | 2.9.6 | 旨在提供通用、灵活、高性能的分布式 ID 生成器。 | +| [Graceful Response](https://doc.feiniaojin.com/graceful-response/home.html) | 5.0.0-boot3 | 一个Spring Boot技术栈下的优雅响应处理组件，可以帮助开发者完成响应数据封装、异常处理、错误码填充等过程，提高开发效率，提高代码质量。 | | Knife4j | 4.5.0 | 前身是 swagger-bootstrap-ui，集 Swagger2 和 OpenAPI3 为一体的增强解决方案。 | -| Hutool | 5.8.29 | 小而全的 Java 工具类库，通过静态方法封装，降低相关 API 的学习成本，提高工作效率，使 Java 拥有函数式语言般的优雅，让 Java 语言也可以“甜甜的”。 | +| Hutool | 5.8.32 | 小而全的 Java 工具类库，通过静态方法封装，降低相关 API 的学习成本，提高工作效率，使 Java 拥有函数式语言般的优雅，让 Java 语言也可以“甜甜的”。 | | Lombok | 1.18.32 | 在 Java 开发过程中用注解的方式，简化了 JavaBean 的编写，避免了冗余和样板式代码，让编写的类更加简洁。 | ## 快速开始 diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index 90ff6d58..1f9ef7fd 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -67,7 +67,7 @@ top.continew - continew-starter-data-mybatis-plus + continew-starter-data-mp diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java index 4a63d8f8..382682a7 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java @@ -45,7 +45,7 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(BusinessException.class) public R handleBusinessException(BusinessException e, HttpServletRequest request) { - log.error("请求地址 [{}]，发生业务异常。", request.getRequestURI(), e); + log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e); return R.fail(String.valueOf(HttpStatus.INTERNAL_SERVER_ERROR.value()), e.getMessage()); } @@ -54,7 +54,7 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(BadRequestException.class) public R handleBadRequestException(BadRequestException e, HttpServletRequest request) { - log.error("请求地址 [{}]，自定义验证失败。", request.getRequestURI(), e); + log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e); return R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), e.getMessage()); } @@ -63,6 +63,7 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(MultipartException.class) public R handleRequestTooBigException(MultipartException e, HttpServletRequest request) { + log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e); String msg = e.getMessage(); R defaultFail = R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), msg); if (CharSequenceUtil.isBlank(msg)) { @@ -81,7 +82,6 @@ public class GlobalExceptionHandler { return defaultFail; } String errorMsg = "请上传小于 %sKB 的文件".formatted(NumberUtil.parseLong(sizeLimit) / 1024); - log.error("请求地址 [{}]，上传文件失败，文件大小超过限制。", request.getRequestURI(), e); return R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), errorMsg); } } \ No newline at end of file diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java index cd94f82f..a9ded282 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java @@ -43,7 +43,7 @@ public class GlobalSaTokenExceptionHandler { */ @ExceptionHandler(NotLoginException.class) public R handleNotLoginException(NotLoginException e, HttpServletRequest request) { - log.error("请求地址 [{}]，认证失败，无法访问系统资源。", request.getRequestURI(), e); + log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e); String errorMsg = switch (e.getType()) { case NotLoginException.KICK_OUT -> "您已被踢下线"; case NotLoginException.BE_REPLACED_MESSAGE -> "您已被顶下线"; @@ -57,7 +57,7 @@ public class GlobalSaTokenExceptionHandler { */ @ExceptionHandler(NotPermissionException.class) public R handleNotPermissionException(NotPermissionException e, HttpServletRequest request) { - log.error("请求地址 [{}]，权限码校验失败。", request.getRequestURI(), e); + log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e); return R.fail(String.valueOf(HttpStatus.FORBIDDEN.value()), "没有访问权限，请联系管理员授权"); } @@ -66,7 +66,7 @@ public class GlobalSaTokenExceptionHandler { */ @ExceptionHandler(NotRoleException.class) public R handleNotRoleException(NotRoleException e, HttpServletRequest request) { - log.error("请求地址 [{}]，角色权限校验失败。", request.getRequestURI(), e); + log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e); return R.fail(String.valueOf(HttpStatus.FORBIDDEN.value()), "没有访问权限，请联系管理员授权"); } } \ No newline at end of file diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java index 0916f330..621c0691 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java @@ -19,9 +19,9 @@ package top.continew.admin.common.config.mybatis; import cn.hutool.core.convert.Convert; import top.continew.admin.common.model.dto.LoginUser; import top.continew.admin.common.util.helper.LoginHelper; -import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser; -import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; -import top.continew.starter.data.mybatis.plus.datapermission.DataScope; +import top.continew.starter.data.mp.datapermission.DataPermissionCurrentUser; +import top.continew.starter.data.mp.datapermission.DataPermissionFilter; +import top.continew.starter.data.mp.datapermission.DataScope; import java.util.stream.Collectors; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java index 59bfc2a0..4303b8bf 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java @@ -20,8 +20,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; -import top.continew.starter.data.mybatis.plus.base.BaseMapper; -import top.continew.starter.data.mybatis.plus.datapermission.DataPermission; +import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mp.datapermission.DataPermission; import java.util.List; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java index 153b2ca0..6546091d 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.crypto.password.PasswordEncoder; -import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; +import top.continew.starter.data.mp.datapermission.DataPermissionFilter; /** * MyBatis Plus 配置 diff --git a/continew-admin-extension/continew-admin-job-server/pom.xml b/continew-admin-extension/continew-admin-job-server/pom.xml index 5f9cf534..5bf90cb5 100644 --- a/continew-admin-extension/continew-admin-job-server/pom.xml +++ b/continew-admin-extension/continew-admin-job-server/pom.xml @@ -14,7 +14,7 @@ - 1.1.0 + 1.1.2 diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java index da2e83d4..46fad896 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java @@ -19,7 +19,7 @@ package top.continew.admin.generator.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import top.continew.admin.generator.model.entity.FieldConfigDO; -import top.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java index bc3290cd..7e1a17cb 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java @@ -17,7 +17,7 @@ package top.continew.admin.generator.mapper; import top.continew.admin.generator.model.entity.GenConfigDO; -import top.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mp.base.BaseMapper; /** * 生成配置 Mapper diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl b/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl index c266ef6f..f84e38e1 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl +++ b/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl @@ -1,6 +1,6 @@ package ${packageName}.${subPackageName}; -import top.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mp.base.BaseMapper; import ${packageName}.model.entity.${classNamePrefix}DO; /** diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/index.ftl b/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/index.ftl index f99c3b43..3bdaeda3 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/index.ftl +++ b/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/index.ftl @@ -108,7 +108,7 @@