From 2138bee42c7105363f4413a847d4e6e4daca48d1 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 5 Jul 2025 21:33:45 +0800 Subject: [PATCH] build: continew-starter 2.12.2 => 2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.引入 continew-starter-validation（从 core 拆分）、sa-token-sign（从 sa-token-core 拆分并调整了部分 API） 2.Starter import 包路径调整 - EasyExcel 替换为 FastExcel：com.alibaba.excel（EasyExcel） => cn.idev.excel（FastExcel） - top.continew.starter.file.excel => top.continew.starter.excel - top.continew.starter.core.validation.constraints => top.continew.starter.validation.constraints - top.continew.starter.core.validation.ValidationUtils、CheckUtils、Validator => top.continew.starter.core.util.validation - cn.dev33.satoken.sign => cn.dev33.satoken.sign.template - top.continew.starter.core.autoconfigure.project => top.continew.starter.core.autoconfigure.application - top.continew.starter.data.core、top.continew.starter.data.mp => top.continew.starter.data - top.continew.starter.data.mp.base.BaseMapper => top.continew.starter.data.mapper.BaseMapper 2.Starter 基础类命名调整 CRUD：AbstractBaseController => AbstractCrudController，BaseService => CrudService，BaseServiceImpl => CrudServiceImpl Core：ProjectProperties（项目配置，project.xxx） => ApplicationProperties（应用配置更为贴切，且变量 application.xx 可以和 Maven 变量显著区分开） 3.groupId 调整：top.continew.starter、top.continew.admin（避免部分童鞋全局替换包名时出现把 starter 也一起替换了！） 4.Admin import 包路径调整：BaseController、BaseDO等 => common.base 5.新增 BaseService、BaseServiceImpl 替代 Starter 原 BaseXxx，方便用户根据项目实际需要重写或新增全局通用接口、方法 6.snail-job server 数据库脚本更新至 v1.5.0 7.Valid 及 Validated 使用梳理（CrudService 支持通过在实现类添加 Validated 注解来实现 Service 层基础校验） --- continew-common/pom.xml | 135 ++++++++++-------- .../{ => base}/controller/BaseController.java | 38 +++-- .../mapper}/DataPermissionMapper.java | 4 +- .../{ => base}/model/entity/BaseCreateDO.java | 2 +- .../{ => base}/model/entity/BaseDO.java | 2 +- .../{ => base}/model/entity/BaseUpdateDO.java | 2 +- .../model/req/CommonStatusUpdateReq.java | 2 +- .../{ => base}/model/resp/BaseDetailResp.java | 4 +- .../{ => base}/model/resp/BaseResp.java | 4 +- .../common/base/service/BaseService.java | 36 +++++ .../common/base/service/BaseServiceImpl.java | 41 ++++++ .../config/excel/ExcelDictConverter.java | 10 +- .../mybatis/MyBatisPlusMetaObjectHandler.java | 2 +- .../admin/common/util/SecureUtils.java | 2 +- .../pom.xml | 4 +- .../db/changelog/mysql/snail-job_data.sql | 10 +- .../db/changelog/mysql/snail-job_table.sql | 91 +++++++----- .../changelog/postgresql/snail-job_data.sql | 10 +- .../changelog/postgresql/snail-job_table.sql | 108 ++++++++------ continew-extension/pom.xml | 2 +- .../continew-plugin-generator/pom.xml | 4 +- .../properties/GeneratorProperties.java | 2 +- .../controller/GeneratorController.java | 7 +- .../generator/mapper/FieldConfigMapper.java | 2 +- .../generator/mapper/GenConfigMapper.java | 2 +- .../service/impl/GeneratorServiceImpl.java | 22 +-- .../templates/backend/Controller.ftl | 2 +- .../templates/backend/DetailResp.ftl | 6 +- .../resources/templates/backend/Mapper.ftl | 2 +- .../resources/templates/backend/Query.ftl | 4 +- .../resources/templates/backend/Service.ftl | 6 +- .../templates/backend/ServiceImpl.ftl | 2 +- continew-plugin/continew-plugin-open/pom.xml | 2 +- .../admin/open/controller/AppController.java | 2 +- .../handler/SaCheckPermissionHandler.java | 7 +- .../continew/admin/open/mapper/AppMapper.java | 2 +- .../admin/open/model/entity/AppDO.java | 2 +- .../admin/open/model/query/AppQuery.java | 4 +- .../admin/open/model/resp/AppDetailResp.java | 8 +- .../admin/open/model/resp/AppResp.java | 2 +- .../admin/open/service/AppService.java | 2 +- .../open/service/impl/AppServiceImpl.java | 4 +- .../admin/open/sign/OpenApiSignTemplate.java | 4 +- .../admin/open/util/OpenApiUtils.java | 2 +- .../continew-plugin-schedule/pom.xml | 2 +- .../schedule/config/FeignConfiguration.java | 6 +- .../schedule/controller/JobController.java | 10 +- .../schedule/controller/JobLogController.java | 9 +- .../schedule/model/query/JobLogQuery.java | 2 +- .../admin/schedule/model/query/JobQuery.java | 2 +- continew-plugin/pom.xml | 4 +- continew-server/pom.xml | 12 +- .../admin/ContiNewAdminApplication.java | 24 ++-- .../config/satoken/SaTokenConfiguration.java | 16 +-- .../controller/common/CaptchaController.java | 14 +- .../controller/common/CommonController.java | 4 +- .../common/DashboardController.java | 4 +- .../monitor/OnlineUserController.java | 6 +- continew-server/src/main/resources/banner.txt | 4 +- .../main/resources/config/application-dev.yml | 8 +- .../resources/config/application-prod.yml | 14 +- .../src/main/resources/config/application.yml | 21 ++- continew-system/pom.xml | 4 +- .../admin/auth/AbstractLoginHandler.java | 4 +- .../admin/auth/controller/AuthController.java | 6 +- .../auth/handler/AccountLoginHandler.java | 4 +- .../admin/auth/handler/EmailLoginHandler.java | 2 +- .../admin/auth/handler/PhoneLoginHandler.java | 2 +- .../auth/handler/SocialLoginHandler.java | 8 +- .../admin/auth/model/req/PhoneLoginReq.java | 2 +- .../auth/service/impl/AuthServiceImpl.java | 2 +- .../system/controller/ClientController.java | 2 +- .../system/controller/DeptController.java | 2 +- .../system/controller/DictController.java | 2 +- .../system/controller/DictItemController.java | 2 +- .../system/controller/FileController.java | 8 +- .../system/controller/LogController.java | 8 +- .../system/controller/MenuController.java | 4 +- .../system/controller/NoticeController.java | 4 +- .../system/controller/OptionController.java | 8 +- .../system/controller/RoleController.java | 13 +- .../controller/SmsConfigController.java | 4 +- .../system/controller/SmsLogController.java | 4 +- .../system/controller/StorageController.java | 9 +- .../system/controller/UserController.java | 16 +-- .../controller/UserMessageController.java | 13 +- .../controller/UserProfileController.java | 10 +- .../system/enums/PasswordPolicyEnum.java | 2 +- .../admin/system/enums/StorageTypeEnum.java | 2 +- .../admin/system/mapper/ClientMapper.java | 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/MessageLogMapper.java | 2 +- .../admin/system/mapper/MessageMapper.java | 2 +- .../admin/system/mapper/NoticeLogMapper.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/SmsConfigMapper.java | 2 +- .../admin/system/mapper/SmsLogMapper.java | 2 +- .../admin/system/mapper/StorageMapper.java | 2 +- .../admin/system/mapper/UserRoleMapper.java | 2 +- .../admin/system/mapper/user/UserMapper.java | 2 +- .../user/UserPasswordHistoryMapper.java | 2 +- .../system/mapper/user/UserSocialMapper.java | 2 +- .../admin/system/model/entity/ClientDO.java | 2 +- .../admin/system/model/entity/DeptDO.java | 2 +- .../admin/system/model/entity/DictDO.java | 2 +- .../admin/system/model/entity/DictItemDO.java | 2 +- .../admin/system/model/entity/FileDO.java | 2 +- .../admin/system/model/entity/MenuDO.java | 2 +- .../admin/system/model/entity/NoticeDO.java | 2 +- .../admin/system/model/entity/OptionDO.java | 2 +- .../admin/system/model/entity/RoleDO.java | 2 +- .../system/model/entity/SmsConfigDO.java | 2 +- .../admin/system/model/entity/SmsLogDO.java | 2 +- .../admin/system/model/entity/StorageDO.java | 2 +- .../system/model/entity/user/UserDO.java | 2 +- .../admin/system/model/query/ClientQuery.java | 4 +- .../admin/system/model/query/DeptQuery.java | 4 +- .../system/model/query/DictItemQuery.java | 4 +- .../admin/system/model/query/DictQuery.java | 4 +- .../admin/system/model/query/FileQuery.java | 4 +- .../admin/system/model/query/MenuQuery.java | 4 +- .../admin/system/model/query/OptionQuery.java | 6 +- .../admin/system/model/query/RoleQuery.java | 4 +- .../system/model/query/SmsConfigQuery.java | 4 +- .../admin/system/model/query/SmsLogQuery.java | 2 +- .../system/model/query/StorageQuery.java | 4 +- .../model/req/user/UserImportRowReq.java | 2 +- .../model/req/user/UserPhoneUpdateReq.java | 2 +- .../admin/system/model/req/user/UserReq.java | 2 +- .../admin/system/model/resp/ClientResp.java | 10 +- .../admin/system/model/resp/DeptResp.java | 8 +- .../admin/system/model/resp/DictItemResp.java | 6 +- .../admin/system/model/resp/DictResp.java | 2 +- .../admin/system/model/resp/MenuResp.java | 2 +- .../system/model/resp/SmsConfigResp.java | 8 +- .../admin/system/model/resp/SmsLogResp.java | 8 +- .../admin/system/model/resp/StorageResp.java | 2 +- .../system/model/resp/file/FileResp.java | 4 +- .../model/resp/log/LoginLogExportResp.java | 6 +- .../resp/log/OperationLogExportResp.java | 6 +- .../model/resp/notice/NoticeDetailResp.java | 8 +- .../system/model/resp/notice/NoticeResp.java | 2 +- .../model/resp/role/RoleDetailResp.java | 8 +- .../system/model/resp/role/RoleResp.java | 2 +- .../model/resp/user/UserDetailResp.java | 10 +- .../system/model/resp/user/UserResp.java | 2 +- .../admin/system/service/ClientService.java | 2 +- .../admin/system/service/DeptService.java | 4 +- .../admin/system/service/DictItemService.java | 4 +- .../admin/system/service/DictService.java | 4 +- .../admin/system/service/FileService.java | 4 +- .../admin/system/service/MenuService.java | 4 +- .../admin/system/service/NoticeService.java | 4 +- .../admin/system/service/RoleService.java | 4 +- .../system/service/SmsConfigService.java | 2 +- .../admin/system/service/SmsLogService.java | 2 +- .../admin/system/service/StorageService.java | 6 +- .../admin/system/service/UserService.java | 4 +- .../service/impl/ClientServiceImpl.java | 4 +- .../system/service/impl/DeptServiceImpl.java | 8 +- .../service/impl/DictItemServiceImpl.java | 10 +- .../system/service/impl/DictServiceImpl.java | 4 +- .../system/service/impl/FileServiceImpl.java | 6 +- .../system/service/impl/LogServiceImpl.java | 6 +- .../system/service/impl/MenuServiceImpl.java | 4 +- .../service/impl/NoticeServiceImpl.java | 6 +- .../service/impl/OptionServiceImpl.java | 6 +- .../system/service/impl/RoleServiceImpl.java | 4 +- .../service/impl/SmsConfigServiceImpl.java | 4 +- .../service/impl/SmsLogServiceImpl.java | 2 +- .../service/impl/StorageServiceImpl.java | 8 +- .../service/impl/UserRoleServiceImpl.java | 4 +- .../system/service/impl/UserServiceImpl.java | 13 +- .../service/impl/UserSocialServiceImpl.java | 2 +- pom.xml | 20 +-- 184 files changed, 714 insertions(+), 575 deletions(-) rename continew-common/src/main/java/top/continew/admin/common/{ => base}/controller/BaseController.java (67%) rename continew-common/src/main/java/top/continew/admin/common/{config/mybatis => base/mapper}/DataPermissionMapper.java (95%) rename continew-common/src/main/java/top/continew/admin/common/{ => base}/model/entity/BaseCreateDO.java (96%) rename continew-common/src/main/java/top/continew/admin/common/{ => base}/model/entity/BaseDO.java (96%) rename continew-common/src/main/java/top/continew/admin/common/{ => base}/model/entity/BaseUpdateDO.java (96%) rename continew-common/src/main/java/top/continew/admin/common/{ => base}/model/req/CommonStatusUpdateReq.java (96%) rename continew-common/src/main/java/top/continew/admin/common/{ => base}/model/resp/BaseDetailResp.java (95%) rename continew-common/src/main/java/top/continew/admin/common/{ => base}/model/resp/BaseResp.java (95%) create mode 100644 continew-common/src/main/java/top/continew/admin/common/base/service/BaseService.java create mode 100644 continew-common/src/main/java/top/continew/admin/common/base/service/BaseServiceImpl.java diff --git a/continew-common/pom.xml b/continew-common/pom.xml index 7d2f3cf5..2db3f20b 100644 --- a/continew-common/pom.xml +++ b/continew-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-admin ${revision} @@ -55,15 +55,27 @@ postgresql --> - + - top.continew - continew-starter-extension-crud-mp + top.continew.starter + continew-starter-json-jackson + + + + + top.continew.starter + continew-starter-validation + + + + + top.continew.starter + continew-starter-cache-jetcache - top.continew + top.continew.starter continew-starter-auth-satoken @@ -72,28 +84,63 @@ + + + cn.dev33 + sa-token-sign + - top.continew + top.continew.starter continew-starter-auth-justauth - + - top.continew - continew-starter-cache-jetcache + top.continew.starter + continew-starter-security-password - + - top.continew - continew-starter-extension-datapermission-mp + top.continew.starter + continew-starter-security-crypto + + + + + top.continew.starter + continew-starter-security-mask + + + + + top.continew.starter + continew-starter-ratelimiter + + + + + top.continew.starter + continew-starter-captcha-graphic + + + + + top.continew.starter + continew-starter-captcha-behavior + + + + + top.continew.starter + continew-starter-messaging-mail - top.continew + top.continew.starter continew-starter-messaging-websocket @@ -103,58 +150,22 @@ - - - top.continew - continew-starter-messaging-mail - - - - - top.continew - continew-starter-captcha-graphic - - - - - top.continew - continew-starter-captcha-behavior - - - - - top.continew - continew-starter-ratelimiter - - - - - top.continew - continew-starter-security-crypto - - - - - top.continew - continew-starter-security-mask - - - - - top.continew - continew-starter-security-password - - - - - top.continew - continew-starter-json-jackson - - - top.continew + top.continew.starter continew-starter-log-interceptor + + + + top.continew.starter + continew-starter-extension-datapermission-mp + + + + + top.continew.starter + continew-starter-extension-crud-mp + \ No newline at end of file diff --git a/continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java b/continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java similarity index 67% rename from continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java rename to continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java index 7881ab4b..a93997b0 100644 --- a/continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java @@ -14,54 +14,74 @@ * limitations under the License. */ -package top.continew.admin.common.controller; +package top.continew.admin.common.base.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaRequest; -import cn.dev33.satoken.sign.SaSignTemplate; +import cn.dev33.satoken.sign.template.SaSignTemplate; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.text.CharSequenceUtil; +import top.continew.admin.common.base.service.BaseService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.extension.crud.annotation.CrudApi; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.starter.extension.crud.controller.AbstractBaseController; +import top.continew.starter.extension.crud.controller.AbstractCrudController; import top.continew.starter.extension.crud.enums.Api; -import top.continew.starter.extension.crud.service.BaseService; import java.lang.reflect.Method; import java.util.Collection; /** * 控制器基类 + * + *

+ * 根据实际项目需要，自行重写 CRUD 接口或增加自定义通用业务接口 + *

* * @param 业务接口 * @param 列表类型 * @param 详情类型 - * @param 查询条件 - * @param 创建或修改参数类型 + * @param 查询条件类型 + * @param 创建或修改请求参数类型 * @author Charles7c * @since 2024/12/6 20:30 */ -public class BaseController, L, D, Q, C> extends AbstractBaseController { +public class BaseController, L, D, Q, C> extends AbstractCrudController { @Override public void preHandle(CrudApi crudApi, Object[] args, Method targetMethod, Class targetClass) throws Exception { + // 忽略带 sign 请求权限校验 SaRequest saRequest = SaHolder.getRequest(); Collection paramNames = saRequest.getParamNames(); if (paramNames.stream().anyMatch(SaSignTemplate.sign::equals)) { return; } + // 忽略接口类或接口方法上带 @SaIgnore 注解的权限校验 if (AnnotationUtil.hasAnnotation(targetMethod, SaIgnore.class) || AnnotationUtil .hasAnnotation(targetClass, SaIgnore.class)) { return; } + // 校验权限，例如：创建用户接口（POST /system/user） => 校验 system:user:create 权限 CrudRequestMapping crudRequestMapping = targetClass.getDeclaredAnnotation(CrudRequestMapping.class); String path = crudRequestMapping.value(); String prefix = String.join(StringConstants.COLON, CharSequenceUtil.splitTrim(path, StringConstants.SLASH)); - Api api = crudApi.value(); - String apiName = Api.PAGE.equals(api) || Api.TREE.equals(api) ? Api.LIST.name() : api.name(); + String apiName = this.getApiName(crudApi.value()); StpUtil.checkPermission("%s:%s".formatted(prefix, apiName.toLowerCase())); } + + /** + * 获取 API 名称 + * + * @param api API + * @return API 名称 + */ + private String getApiName(Api api) { + return switch (api) { + case PAGE, TREE, LIST -> Api.LIST.name(); + case DELETE, BATCH_DELETE -> Api.DELETE.name(); + default -> api.name(); + }; + } } diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java b/continew-common/src/main/java/top/continew/admin/common/base/mapper/DataPermissionMapper.java similarity index 95% rename from continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java rename to continew-common/src/main/java/top/continew/admin/common/base/mapper/DataPermissionMapper.java index 14007dec..a5fcff1d 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/mapper/DataPermissionMapper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.admin.common.config.mybatis; +package top.continew.admin.common.base.mapper; 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.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import top.continew.starter.extension.datapermission.annotation.DataPermission; import java.io.Serializable; diff --git a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseCreateDO.java b/continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseCreateDO.java similarity index 96% rename from continew-common/src/main/java/top/continew/admin/common/model/entity/BaseCreateDO.java rename to continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseCreateDO.java index a7d471ad..8d54b778 100644 --- a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseCreateDO.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseCreateDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.model.entity; +package top.continew.admin.common.base.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseDO.java b/continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseDO.java similarity index 96% rename from continew-common/src/main/java/top/continew/admin/common/model/entity/BaseDO.java rename to continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseDO.java index 95d329e4..5f142f01 100644 --- a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseDO.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.model.entity; +package top.continew.admin.common.base.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseUpdateDO.java b/continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseUpdateDO.java similarity index 96% rename from continew-common/src/main/java/top/continew/admin/common/model/entity/BaseUpdateDO.java rename to continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseUpdateDO.java index 4b326cc5..b969c311 100644 --- a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseUpdateDO.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/model/entity/BaseUpdateDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.model.entity; +package top.continew.admin.common.base.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-common/src/main/java/top/continew/admin/common/model/req/CommonStatusUpdateReq.java b/continew-common/src/main/java/top/continew/admin/common/base/model/req/CommonStatusUpdateReq.java similarity index 96% rename from continew-common/src/main/java/top/continew/admin/common/model/req/CommonStatusUpdateReq.java rename to continew-common/src/main/java/top/continew/admin/common/base/model/req/CommonStatusUpdateReq.java index 6eebdcb2..17349f02 100644 --- a/continew-common/src/main/java/top/continew/admin/common/model/req/CommonStatusUpdateReq.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/model/req/CommonStatusUpdateReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.model.req; +package top.continew.admin.common.base.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/continew-common/src/main/java/top/continew/admin/common/model/resp/BaseDetailResp.java b/continew-common/src/main/java/top/continew/admin/common/base/model/resp/BaseDetailResp.java similarity index 95% rename from continew-common/src/main/java/top/continew/admin/common/model/resp/BaseDetailResp.java rename to continew-common/src/main/java/top/continew/admin/common/base/model/resp/BaseDetailResp.java index 2d837ec9..afa97d61 100644 --- a/continew-common/src/main/java/top/continew/admin/common/model/resp/BaseDetailResp.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/model/resp/BaseDetailResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.common.model.resp; +package top.continew.admin.common.base.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/continew-common/src/main/java/top/continew/admin/common/model/resp/BaseResp.java b/continew-common/src/main/java/top/continew/admin/common/base/model/resp/BaseResp.java similarity index 95% rename from continew-common/src/main/java/top/continew/admin/common/model/resp/BaseResp.java rename to continew-common/src/main/java/top/continew/admin/common/base/model/resp/BaseResp.java index 801bcbef..4aba5cd8 100644 --- a/continew-common/src/main/java/top/continew/admin/common/model/resp/BaseResp.java +++ b/continew-common/src/main/java/top/continew/admin/common/base/model/resp/BaseResp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.common.model.resp; +package top.continew.admin.common.base.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-common/src/main/java/top/continew/admin/common/base/service/BaseService.java b/continew-common/src/main/java/top/continew/admin/common/base/service/BaseService.java new file mode 100644 index 00000000..6a38e216 --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/base/service/BaseService.java @@ -0,0 +1,36 @@ +/* + * 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.base.service; + +import top.continew.starter.extension.crud.service.CrudService; + +/** + * 业务接口基类 + * + *

+ * 根据实际项目需要，自行重写 CRUD 接口或增加自定义通用业务方法 + *

+ * + * @param 列表类型 + * @param 详情类型 + * @param 查询条件类型 + * @param 创建或修改请求参数类型 + * @author Charles7c + * @since 2024/12/6 20:30 + */ +public interface BaseService extends CrudService { +} diff --git a/continew-common/src/main/java/top/continew/admin/common/base/service/BaseServiceImpl.java b/continew-common/src/main/java/top/continew/admin/common/base/service/BaseServiceImpl.java new file mode 100644 index 00000000..262b92b3 --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/base/service/BaseServiceImpl.java @@ -0,0 +1,41 @@ +/* + * 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.base.service; + +import top.continew.starter.data.mapper.BaseMapper; +import top.continew.starter.extension.crud.model.entity.BaseIdDO; +import top.continew.starter.extension.crud.service.CrudServiceImpl; + +/** + * 业务实现基类 + * + * + *

+ * 根据实际项目需要，自行重写 CRUD 接口或增加自定义通用业务方法实现 + *

+ * + * @param Mapper 接口 + * @param 实体类型 + * @param 列表类型 + * @param 详情类型 + * @param 查询条件类型 + * @param 创建或修改请求参数类型 + * @author Charles7c + * @since 2024/12/6 20:30 + */ +public class BaseServiceImpl, T extends BaseIdDO, L, D, Q, C> extends CrudServiceImpl implements BaseService { +} diff --git a/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java b/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java index bbb13493..f73d2a0a 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java @@ -19,11 +19,11 @@ package top.continew.admin.common.config.excel; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.extra.spring.SpringUtil; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import top.continew.admin.common.service.CommonDictItemService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.extension.crud.model.resp.LabelValueResp; diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 8c6696d8..84c4f91f 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -20,7 +20,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import top.continew.admin.common.context.UserContextHolder; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import java.time.LocalDateTime; diff --git a/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java b/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java index 3c7baa00..d192d4c8 100644 --- a/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java +++ b/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java @@ -22,7 +22,7 @@ import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.extra.spring.SpringUtil; import top.continew.admin.common.config.properties.RsaProperties; import top.continew.starter.core.exception.BusinessException; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.security.crypto.autoconfigure.CryptoProperties; import top.continew.starter.security.crypto.encryptor.AesEncryptor; import top.continew.starter.security.crypto.encryptor.IEncryptor; diff --git a/continew-extension/continew-extension-schedule-server/pom.xml b/continew-extension/continew-extension-schedule-server/pom.xml index d699dd61..dd6f7c02 100644 --- a/continew-extension/continew-extension-schedule-server/pom.xml +++ b/continew-extension/continew-extension-schedule-server/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-extension ${revision} @@ -17,7 +17,7 @@ - 1.4.0 + 1.5.0 diff --git a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql index 00cbc4e8..3bd1ea02 100644 --- a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql +++ b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql @@ -1,14 +1,14 @@ -- liquibase formatted sql --- changeset snail-job-server:1.1.0 --- 默认命名空间：Default -INSERT INTO `sj_namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`) -VALUES (1, 'Default', '764d604ec6fc45f68cd92514c40e9e1a', NOW(), NOW(), 0); - +-- changeset snail-job-server:1.5.0 -- 默认用户：admin/admin INSERT INTO `sj_system_user` (username, password, role) VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2); +-- 默认命名空间：Default +INSERT INTO `sj_namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`) +VALUES (1, 'Default', '764d604ec6fc45f68cd92514c40e9e1a', NOW(), NOW(), 0); + -- 默认分组：continew-admin INSERT INTO `sj_group_config` (`id`, `namespace_id`, `group_name`, `description`, `token`, `group_status`, `version`, `group_partition`, `id_generator_mode`, `init_scene`, `create_dt`, `update_dt`) VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'continew-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, NOW(), NOW()); diff --git a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_table.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_table.sql index ac19abee..75e6be81 100644 --- a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_table.sql +++ b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_table.sql @@ -1,6 +1,6 @@ -- liquibase formatted sql --- changeset snail-job-server:1.1.0 +-- changeset snail-job-server:1.5.0 SET NAMES utf8mb4; CREATE TABLE `sj_namespace` @@ -81,16 +81,20 @@ CREATE TABLE `sj_notify_recipient` CREATE TABLE `sj_retry_dead_letter` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `scene_name` varchar(64) NOT NULL COMMENT '场景名称', - `idempotent_id` varchar(64) NOT NULL COMMENT '幂等id', - `biz_no` varchar(64) NOT NULL DEFAULT '' COMMENT '业务编号', - `executor_name` varchar(512) NOT NULL DEFAULT '' COMMENT '执行器名称', - `args_str` text NOT NULL COMMENT '执行方法参数', - `ext_attrs` text NOT NULL COMMENT '扩展字段', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', + `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', + `group_name` varchar(64) NOT NULL COMMENT '组名称', + `group_id` bigint(20) NOT NULL COMMENT '组Id', + `scene_name` varchar(64) NOT NULL COMMENT '场景名称', + `scene_id` bigint(20) NOT NULL COMMENT '场景ID', + `idempotent_id` varchar(64) NOT NULL COMMENT '幂等id', + `biz_no` varchar(64) NOT NULL DEFAULT '' COMMENT '业务编号', + `executor_name` varchar(512) NOT NULL DEFAULT '' COMMENT '执行器名称', + -- jackson 兼容历史数据 预计1.8.0默认改为fury + `serializer_name` varchar(32) NOT NULL DEFAULT 'jackson' COMMENT '执行方法参数序列化器名称', + `args_str` text NOT NULL COMMENT '执行方法参数', + `ext_attrs` text NOT NULL COMMENT '扩展字段', + `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`), KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`), KEY `idx_idempotent_id` (`idempotent_id`), @@ -106,12 +110,16 @@ CREATE TABLE `sj_retry` `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', `group_name` varchar(64) NOT NULL COMMENT '组名称', + `group_id` bigint(20) NOT NULL COMMENT '组Id', `scene_name` varchar(64) NOT NULL COMMENT '场景名称', + `scene_id` bigint(20) NOT NULL COMMENT '场景ID', `idempotent_id` varchar(64) NOT NULL COMMENT '幂等id', `biz_no` varchar(64) NOT NULL DEFAULT '' COMMENT '业务编号', `executor_name` varchar(512) NOT NULL DEFAULT '' COMMENT '执行器名称', `args_str` text NOT NULL COMMENT '执行方法参数', `ext_attrs` text NOT NULL COMMENT '扩展字段', + -- jackson 兼容历史数据 预计1.8.0默认改为fury + `serializer_name` varchar(32) NOT NULL DEFAULT 'jackson' COMMENT '执行方法参数序列化器名称', `next_trigger_at` bigint(13) NOT NULL COMMENT '下次触发时间', `retry_count` int(11) NOT NULL DEFAULT 0 COMMENT '重试次数', `retry_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '重试状态 0、重试中 1、成功 2、最大重试次数', @@ -122,13 +130,12 @@ CREATE TABLE `sj_retry` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`), - KEY `idx_namespace_id_group_name_retry_status` (`namespace_id`, `group_name`, `retry_status`), - KEY `idx_idempotent_id` (`idempotent_id`), KEY `idx_biz_no` (`biz_no`), + KEY `idx_idempotent_id` (`idempotent_id`), + KEY `idx_retry_status_bucket_index` (`retry_status`, `bucket_index`), KEY `idx_parent_id` (`parent_id`), KEY `idx_create_dt` (`create_dt`), - UNIQUE KEY `uk_name_task_type_idempotent_id_deleted` (`namespace_id`, `group_name`, `task_type`, `idempotent_id`, `deleted`) + UNIQUE KEY `uk_scene_tasktype_idempotentid_deleted` (`scene_id`, `task_type`, `idempotent_id`, `deleted`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='重试信息表' @@ -145,7 +152,7 @@ CREATE TABLE `sj_retry_task` `task_status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '重试状态', `task_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '任务类型 1、重试数据 2、回调数据', `operation_reason` tinyint(4) NOT NULL DEFAULT 0 COMMENT '操作原因', - `client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port', + `client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), @@ -196,6 +203,8 @@ CREATE TABLE `sj_retry_scene_config` `cb_trigger_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '1、默认等级 2、固定间隔时间 3、CRON 表达式', `cb_max_count` int(11) NOT NULL DEFAULT 16 COMMENT '回调的最大执行次数', `cb_trigger_interval` varchar(16) NOT NULL DEFAULT '' COMMENT '回调的最大执行次数', + `owner_id` bigint(20) NULL DEFAULT NULL COMMENT '负责人id', + `labels` varchar(512) NULL DEFAULT '' COMMENT '标签', `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', @@ -217,6 +226,7 @@ CREATE TABLE `sj_server_node` `expire_at` datetime NOT NULL COMMENT '过期时间', `node_type` tinyint(4) NOT NULL COMMENT '节点类型 1、客户端 2、是服务端', `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', + `labels` varchar(512) NULL DEFAULT '' COMMENT '标签', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), @@ -230,12 +240,12 @@ CREATE TABLE `sj_server_node` CREATE TABLE `sj_distributed_lock` ( - `name` varchar(64) NOT NULL COMMENT '锁名称', - `lock_until` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '锁定时长', - `locked_at` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '锁定时间', - `locked_by` varchar(255) NOT NULL COMMENT '锁定者', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `name` varchar(64) NOT NULL COMMENT '锁名称', + `lock_until` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '锁定时长', + `locked_at` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '锁定时间', + `locked_by` varchar(255) NOT NULL COMMENT '锁定者', + `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 @@ -268,19 +278,6 @@ CREATE TABLE `sj_system_user_permission` ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='系统用户权限表'; -CREATE TABLE `sj_sequence_alloc` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL DEFAULT '' COMMENT '组名称', - `max_id` bigint(20) NOT NULL DEFAULT 1 COMMENT '最大id', - `step` int(11) NOT NULL DEFAULT 100 COMMENT '步长', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='号段模式序号ID分配表'; - -- 分布式调度DDL CREATE TABLE `sj_job` ( @@ -306,7 +303,8 @@ CREATE TABLE `sj_job` `bucket_index` int(11) NOT NULL DEFAULT 0 COMMENT 'bucket', `resident` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是常驻任务', `notify_ids` varchar(128) NOT NULL DEFAULT '' COMMENT '通知告警场景配置id列表', - `owner_id` bigint(20) NULL COMMENT '负责人id', + `owner_id` bigint(20) NULL DEFAULT NULL COMMENT '负责人id', + `labels` varchar(512) NULL DEFAULT '' COMMENT '标签', `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', @@ -459,6 +457,7 @@ CREATE TABLE `sj_workflow` `notify_ids` varchar(128) NOT NULL DEFAULT '' COMMENT '通知告警场景配置id列表', `bucket_index` int(11) NOT NULL DEFAULT 0 COMMENT 'bucket', `version` int(11) NOT NULL COMMENT '版本号', + `owner_id` bigint(20) NULL DEFAULT NULL COMMENT '负责人id', `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', @@ -508,7 +507,7 @@ CREATE TABLE `sj_workflow_task_batch` `wf_context` text DEFAULT NULL COMMENT '全局上下文', `execution_at` bigint(13) NOT NULL DEFAULT 0 COMMENT '任务执行时间', `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `version` int(11) NOT NULL DEFAULT 1 COMMENT '版本号', + `version` int(11) NOT NULL DEFAULT 1 COMMENT '版本号', `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', @@ -518,4 +517,20 @@ CREATE TABLE `sj_workflow_task_batch` KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='工作流批次'; \ No newline at end of file + DEFAULT CHARSET = utf8mb4 COMMENT ='工作流批次'; + +CREATE TABLE `sj_job_executor` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', + `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', + `group_name` varchar(64) NOT NULL COMMENT '组名称', + `executor_info` varchar(256) NOT NULL COMMENT '任务执行器名称', + `executor_type` varchar(3) NOT NULL COMMENT '1:java 2:python 3:go', + `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), + KEY `idx_create_dt` (`create_dt`) +) ENGINE = InnoDB + AUTO_INCREMENT = 0 + DEFAULT CHARSET = utf8mb4 COMMENT ='任务执行器信息'; \ No newline at end of file diff --git a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql index 5d3e2bb0..9aa70614 100644 --- a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql +++ b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql @@ -1,14 +1,14 @@ -- liquibase formatted sql --- changeset snail-job-server:1.1.0 --- 默认命名空间：Default -INSERT INTO sj_namespace (id, name, unique_id, create_dt, update_dt, deleted) -VALUES (1, 'Default', '764d604ec6fc45f68cd92514c40e9e1a', NOW(), NOW(), 0); - +-- changeset snail-job-server:1.5.0 -- 默认用户：admin/admin INSERT INTO sj_system_user (username, password, role) VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2); +-- 默认命名空间：Default +INSERT INTO sj_namespace (id, name, unique_id, create_dt, update_dt, deleted) +VALUES (1, 'Default', '764d604ec6fc45f68cd92514c40e9e1a', NOW(), NOW(), 0); + -- 默认分组：continew-admin INSERT INTO sj_group_config (id, namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, create_dt, update_dt) VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'continew-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, NOW(), NOW()); diff --git a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql index b507dbad..dbac74d3 100644 --- a/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql +++ b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql @@ -1,6 +1,6 @@ -- liquibase formatted sql --- changeset snail-job-server:1.1.0 +-- changeset snail-job-server:1.5.0 -- sj_namespace CREATE TABLE sj_namespace ( @@ -122,16 +122,19 @@ COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人'; -- sj_retry_dead_letter CREATE TABLE sj_retry_dead_letter ( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - scene_name varchar(64) NOT NULL, - idempotent_id varchar(64) NOT NULL, - biz_no varchar(64) NOT NULL DEFAULT '', - executor_name varchar(512) NOT NULL DEFAULT '', - args_str text NOT NULL, - ext_attrs text NOT NULL, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name varchar(64) NOT NULL, + group_id bigint NOT NULL, + scene_name varchar(64) NOT NULL, + scene_id bigint NOT NULL, + idempotent_id varchar(64) NOT NULL, + biz_no varchar(64) NOT NULL DEFAULT '', + executor_name varchar(512) NOT NULL DEFAULT '', + serializer_name varchar(32) NOT NULL DEFAULT 'jackson', + args_str text NOT NULL, + ext_attrs text NOT NULL, + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name); @@ -142,10 +145,13 @@ CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt); COMMENT ON COLUMN sj_retry_dead_letter.id IS '主键'; COMMENT ON COLUMN sj_retry_dead_letter.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_retry_dead_letter.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_dead_letter.group_id IS '组Id'; COMMENT ON COLUMN sj_retry_dead_letter.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_dead_letter.scene_id IS '场景ID'; COMMENT ON COLUMN sj_retry_dead_letter.idempotent_id IS '幂等id'; COMMENT ON COLUMN sj_retry_dead_letter.biz_no IS '业务编号'; COMMENT ON COLUMN sj_retry_dead_letter.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry_dead_letter.serializer_name IS '执行方法参数序列化器名称'; COMMENT ON COLUMN sj_retry_dead_letter.args_str IS '执行方法参数'; COMMENT ON COLUMN sj_retry_dead_letter.ext_attrs IS '扩展字段'; COMMENT ON COLUMN sj_retry_dead_letter.create_dt IS '创建时间'; @@ -157,12 +163,15 @@ CREATE TABLE sj_retry id bigserial PRIMARY KEY, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', group_name varchar(64) NOT NULL, + group_id bigint NOT NULL, scene_name varchar(64) NOT NULL, + scene_id bigint NOT NULL, idempotent_id varchar(64) NOT NULL, biz_no varchar(64) NOT NULL DEFAULT '', executor_name varchar(512) NOT NULL DEFAULT '', args_str text NOT NULL, ext_attrs text NOT NULL, + serializer_name varchar(32) NOT NULL DEFAULT 'jackson', next_trigger_at bigint NOT NULL, retry_count int NOT NULL DEFAULT 0, retry_status smallint NOT NULL DEFAULT 0, @@ -174,24 +183,26 @@ CREATE TABLE sj_retry update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (namespace_id, group_name, task_type, idempotent_id, deleted); +CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (scene_id, task_type, idempotent_id, deleted); -CREATE INDEX idx_sj_retry_01 ON sj_retry (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_02 ON sj_retry (namespace_id, group_name, retry_status); -CREATE INDEX idx_sj_retry_03 ON sj_retry (idempotent_id); -CREATE INDEX idx_sj_retry_04 ON sj_retry (biz_no); -CREATE INDEX idx_sj_retry_05 ON sj_retry (parent_id); -CREATE INDEX idx_sj_retry_06 ON sj_retry (create_dt); +CREATE INDEX idx_sj_retry_01 ON sj_retry (biz_no); +CREATE INDEX idx_sj_retry_02 ON sj_retry (idempotent_id); +CREATE INDEX idx_sj_retry_03 ON sj_retry (retry_status, bucket_index); +CREATE INDEX idx_sj_retry_04 ON sj_retry (parent_id); +CREATE INDEX idx_sj_retry_05 ON sj_retry (create_dt); COMMENT ON COLUMN sj_retry.id IS '主键'; COMMENT ON COLUMN sj_retry.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_retry.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry.group_id IS '组Id'; COMMENT ON COLUMN sj_retry.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry.scene_id IS '场景ID'; COMMENT ON COLUMN sj_retry.idempotent_id IS '幂等id'; COMMENT ON COLUMN sj_retry.biz_no IS '业务编号'; COMMENT ON COLUMN sj_retry.executor_name IS '执行器名称'; COMMENT ON COLUMN sj_retry.args_str IS '执行方法参数'; COMMENT ON COLUMN sj_retry.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry.serializer_name IS '执行方法参数序列化器名称'; COMMENT ON COLUMN sj_retry.next_trigger_at IS '下次触发时间'; COMMENT ON COLUMN sj_retry.retry_count IS '重试次数'; COMMENT ON COLUMN sj_retry.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; @@ -287,6 +298,8 @@ CREATE TABLE sj_retry_scene_config cb_trigger_type smallint NOT NULL DEFAULT 1, cb_max_count int NOT NULL DEFAULT 16, cb_trigger_interval varchar(16) NOT NULL DEFAULT '', + owner_id bigint NULL DEFAULT NULL, + labels varchar(512) NULL DEFAULT '', description varchar(256) NOT NULL DEFAULT '', create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP @@ -311,6 +324,8 @@ COMMENT ON COLUMN sj_retry_scene_config.cb_status IS '回调状态 0、不开启 COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_type IS '1、默认等级 2、固定间隔时间 3、CRON 表达式'; COMMENT ON COLUMN sj_retry_scene_config.cb_max_count IS '回调的最大执行次数'; COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_interval IS '回调的最大执行次数'; +COMMENT ON COLUMN sj_retry_scene_config.owner_id IS '负责人id'; +COMMENT ON COLUMN sj_retry_scene_config.labels IS '标签'; COMMENT ON COLUMN sj_retry_scene_config.description IS '描述'; COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间'; @@ -328,6 +343,7 @@ CREATE TABLE sj_server_node expire_at timestamp NOT NULL, node_type smallint NOT NULL, ext_attrs varchar(256) NULL DEFAULT '', + labels varchar(512) NULL DEFAULT '', create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); @@ -346,6 +362,7 @@ COMMENT ON COLUMN sj_server_node.host_port IS '机器端口'; COMMENT ON COLUMN sj_server_node.expire_at IS '过期时间'; COMMENT ON COLUMN sj_server_node.node_type IS '节点类型 1、客户端 2、是服务端'; COMMENT ON COLUMN sj_server_node.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_server_node.labels IS '标签'; COMMENT ON COLUMN sj_server_node.create_dt IS '创建时间'; COMMENT ON COLUMN sj_server_node.update_dt IS '修改时间'; COMMENT ON TABLE sj_server_node IS '服务器节点'; @@ -353,7 +370,7 @@ COMMENT ON TABLE sj_server_node IS '服务器节点'; -- sj_distributed_lock CREATE TABLE sj_distributed_lock ( - name varchar(64) NOT NULL, + name varchar(64) NOT NULL PRIMARY KEY, lock_until timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_at timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_by varchar(255) NOT NULL, @@ -409,27 +426,6 @@ COMMENT ON COLUMN sj_system_user_permission.create_dt IS '创建时间'; COMMENT ON COLUMN sj_system_user_permission.update_dt IS '修改时间'; COMMENT ON TABLE sj_system_user_permission IS '系统用户权限表'; --- sj_sequence_alloc -CREATE TABLE sj_sequence_alloc -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL DEFAULT '', - max_id bigint NOT NULL DEFAULT 1, - step int NOT NULL DEFAULT 100, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_sequence_alloc_01 ON sj_sequence_alloc (namespace_id, group_name); - -COMMENT ON COLUMN sj_sequence_alloc.id IS '主键'; -COMMENT ON COLUMN sj_sequence_alloc.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_sequence_alloc.group_name IS '组名称'; -COMMENT ON COLUMN sj_sequence_alloc.max_id IS '最大id'; -COMMENT ON COLUMN sj_sequence_alloc.step IS '步长'; -COMMENT ON COLUMN sj_sequence_alloc.update_dt IS '更新时间'; -COMMENT ON TABLE sj_sequence_alloc IS '号段模式序号ID分配表'; - -- sj_job CREATE TABLE sj_job ( @@ -455,7 +451,8 @@ CREATE TABLE sj_job bucket_index int NOT NULL DEFAULT 0, resident smallint NOT NULL DEFAULT 0, notify_ids varchar(128) NOT NULL DEFAULT '', - owner_id bigint NULL, + owner_id bigint NULL DEFAULT NULL, + labels varchar(512) NULL DEFAULT '', description varchar(256) NOT NULL DEFAULT '', ext_attrs varchar(256) NULL DEFAULT '', deleted smallint NOT NULL DEFAULT 0, @@ -490,6 +487,7 @@ COMMENT ON COLUMN sj_job.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务'; COMMENT ON COLUMN sj_job.notify_ids IS '通知告警场景配置id列表'; COMMENT ON COLUMN sj_job.owner_id IS '负责人id'; +COMMENT ON COLUMN sj_job.labels IS '标签'; COMMENT ON COLUMN sj_job.description IS '描述'; COMMENT ON COLUMN sj_job.ext_attrs IS '扩展字段'; COMMENT ON COLUMN sj_job.deleted IS '逻辑删除 1、删除'; @@ -716,6 +714,7 @@ CREATE TABLE sj_workflow notify_ids varchar(128) NOT NULL DEFAULT '', bucket_index int NOT NULL DEFAULT 0, version int NOT NULL, + owner_id bigint NULL DEFAULT NULL, ext_attrs varchar(256) NULL DEFAULT '', deleted smallint NOT NULL DEFAULT 0, create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -741,6 +740,7 @@ COMMENT ON COLUMN sj_workflow.wf_context IS '上下文'; COMMENT ON COLUMN sj_workflow.notify_ids IS '通知告警场景配置id列表'; COMMENT ON COLUMN sj_workflow.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_workflow.version IS '版本号'; +COMMENT ON COLUMN sj_workflow.owner_id IS '负责人id'; COMMENT ON COLUMN sj_workflow.ext_attrs IS '扩展字段'; COMMENT ON COLUMN sj_workflow.deleted IS '逻辑删除 1、删除'; COMMENT ON COLUMN sj_workflow.create_dt IS '创建时间'; @@ -828,4 +828,28 @@ COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号'; COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除'; COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间'; COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; \ No newline at end of file +COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; + +-- sj_job_executor +CREATE TABLE sj_job_executor +( + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name varchar(64) NOT NULL, + executor_info varchar(256) NOT NULL, + executor_type varchar(3) NOT NULL, + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP +); + +CREATE INDEX idx_sj_job_executor_01 ON sj_job_executor (namespace_id, group_name); +CREATE INDEX idx_sj_job_executor_02 ON sj_job_executor (create_dt); + +COMMENT ON COLUMN sj_job_executor.id IS '主键'; +COMMENT ON COLUMN sj_job_executor.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_job_executor.group_name IS '组名称'; +COMMENT ON COLUMN sj_job_executor.executor_info IS '任务执行器名称'; +COMMENT ON COLUMN sj_job_executor.executor_type IS '1:java 2:python 3:go'; +COMMENT ON COLUMN sj_job_executor.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_job_executor.update_dt IS '修改时间'; +COMMENT ON TABLE sj_job_executor IS '任务执行器信息'; diff --git a/continew-extension/pom.xml b/continew-extension/pom.xml index adff6312..d7841846 100644 --- a/continew-extension/pom.xml +++ b/continew-extension/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-admin ${revision} diff --git a/continew-plugin/continew-plugin-generator/pom.xml b/continew-plugin/continew-plugin-generator/pom.xml index ad373fea..a6cacab5 100644 --- a/continew-plugin/continew-plugin-generator/pom.xml +++ b/continew-plugin/continew-plugin-generator/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-plugin ${revision} @@ -18,7 +18,7 @@ - top.continew + top.continew.admin continew-system diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java index a798f8e1..9da7bc89 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java @@ -21,7 +21,7 @@ import cn.hutool.core.map.MapUtil; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import top.continew.starter.data.core.enums.DatabaseType; +import top.continew.starter.data.enums.DatabaseType; import java.util.List; import java.util.Map; diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/controller/GeneratorController.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/controller/GeneratorController.java index 5903b956..3086c613 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/controller/GeneratorController.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/controller/GeneratorController.java @@ -22,8 +22,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import top.continew.admin.generator.model.entity.FieldConfigDO; import top.continew.admin.generator.model.entity.GenConfigDO; @@ -46,7 +46,6 @@ import java.util.List; * @since 2023/8/3 22:58 */ @Tag(name = "代码生成 API") -@Validated @RestController @RequiredArgsConstructor @RequestMapping("/code/generator") @@ -58,7 +57,7 @@ public class GeneratorController { @Operation(summary = "分页查询生成配置", description = "分页查询生成配置列表") @SaCheckPermission("code:generator:list") @GetMapping("/config") - public PageResp pageGenConfig(GenConfigQuery query, @Validated PageQuery pageQuery) { + public PageResp pageGenConfig(@Valid GenConfigQuery query, @Valid PageQuery pageQuery) { return baseService.pageGenConfig(query, pageQuery); } @@ -84,7 +83,7 @@ public class GeneratorController { @Parameter(name = "tableName", description = "表名称", required = true, example = "sys_user", in = ParameterIn.PATH) @SaCheckPermission("code:generator:config") @PostMapping("/config/{tableName}") - public void saveConfig(@Validated @RequestBody GenConfigReq req, @PathVariable String tableName) { + public void saveConfig(@RequestBody @Valid GenConfigReq req, @PathVariable String tableName) { baseService.saveConfig(req, tableName); } diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java index 745a0635..9c541fc6 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java @@ -20,7 +20,7 @@ import org.apache.ibatis.annotations.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.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java index 04816c33..63576a1c 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.generator.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.generator.model.entity.GenConfigDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 生成配置 Mapper diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index 10f1f13d..f84a3d39 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -53,13 +53,13 @@ import top.continew.admin.generator.model.query.GenConfigQuery; import top.continew.admin.generator.model.req.GenConfigReq; import top.continew.admin.generator.model.resp.GeneratePreviewResp; import top.continew.admin.generator.service.GeneratorService; -import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.autoconfigure.application.ApplicationProperties; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.exception.BusinessException; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.data.core.enums.DatabaseType; -import top.continew.starter.data.core.util.MetaUtils; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.data.enums.DatabaseType; +import top.continew.starter.data.util.MetaUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.core.util.FileUploadUtils; @@ -84,7 +84,7 @@ public class GeneratorServiceImpl implements GeneratorService { private final DataSource dataSource; private final GeneratorProperties generatorProperties; - private final ProjectProperties projectProperties; + private final ApplicationProperties applicationProperties; private final FieldConfigMapper fieldConfigMapper; private final GenConfigMapper genConfigMapper; private static final List TIME_PACKAGE_CLASS = Arrays.asList("LocalDate", "LocalTime", "LocalDateTime"); @@ -235,7 +235,7 @@ public class GeneratorServiceImpl implements GeneratorService { try { String tempDir = SystemUtil.getUserInfo().getTempDir(); // 删除旧代码 - FileUtil.del(tempDir + projectProperties.getAppName()); + FileUtil.del(tempDir + applicationProperties.getId()); tableNames.forEach(tableName -> { // 初始化配置及数据 List generatePreviewList = this.preview(tableName); @@ -243,7 +243,7 @@ public class GeneratorServiceImpl implements GeneratorService { this.generateCode(generatePreviewList, genConfigMapper.selectById(tableName)); }); // 打包下载 - File tempDirFile = new File(tempDir, projectProperties.getAppName()); + File tempDirFile = new File(tempDir, applicationProperties.getId()); String zipFilePath = tempDirFile.getPath() + jodd.io.ZipUtil.ZIP_EXT; ZipUtil.zip(tempDirFile.getPath(), zipFilePath); FileUploadUtils.download(response, new File(zipFilePath)); @@ -358,7 +358,7 @@ public class GeneratorServiceImpl implements GeneratorService { if (StringUtils.isBlank(dictCode)) { return fieldConfig; } - Set> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), BaseEnum.class); + Set> classSet = ClassUtil.scanPackageBySuper(applicationProperties.getBasePackage(), BaseEnum.class); Optional> clazzOptional = classSet.stream() .filter(s -> StrUtil.toUnderlineCase(s.getSimpleName()).toLowerCase().equals(dictCode)) .findFirst(); @@ -383,8 +383,8 @@ public class GeneratorServiceImpl implements GeneratorService { GeneratorProperties.TemplateConfig templateConfig) { // 获取前后端基础路径 String backendBasicPackagePath = this.buildBackendBasicPackagePath(genConfig, templateConfig); - String frontendBasicPackagePath = String.join(File.separator, projectProperties.getAppName(), projectProperties - .getAppName() + "-ui"); + String frontendBasicPackagePath = String.join(File.separator, applicationProperties + .getId(), applicationProperties.getId() + "-ui"); String packagePath; if (generatePreview.isBackend()) { // 例如：continew-admin/continew-system/src/main/java/top/continew/admin/system/service/impl @@ -432,7 +432,7 @@ public class GeneratorServiceImpl implements GeneratorService { GeneratorProperties.TemplateConfig templateConfig) { String extension = templateConfig.getExtension(); // 例如：continew-admin/continew-system/src/main/java/top/continew/admin/system - return String.join(File.separator, projectProperties.getAppName(), projectProperties.getAppName(), genConfig + return String.join(File.separator, applicationProperties.getId(), applicationProperties.getId(), genConfig .getModuleName(), "src", "main", FileNameUtil.EXT_JAVA.equals(extension) ? "java" : "resources") + (FileNameUtil.EXT_JAVA.equals(extension) diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl index 4be691ae..9dc14ae5 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import ${packageName}.model.query.${classNamePrefix}Query; import ${packageName}.model.req.${classNamePrefix}Req; import ${packageName}.model.resp.${classNamePrefix}DetailResp; diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl index ab648c87..ec39c324 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl @@ -4,11 +4,11 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import top.continew.admin.common.model.resp.BaseDetailResp; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; <#if imports??> <#list imports as className> import ${className}; diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Mapper.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Mapper.ftl index b3112a56..193e46d3 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Mapper.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Mapper.ftl @@ -2,7 +2,7 @@ package ${packageName}.${subPackageName}; import org.apache.ibatis.annotations.Mapper; import ${packageName}.model.entity.${classNamePrefix}DO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * ${businessName} Mapper diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl index 06a962ff..cf73ea20 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl @@ -4,8 +4,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; <#if imports??> <#list imports as className> import ${className}; diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Service.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Service.ftl index dbfa162e..b69b3c3c 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Service.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Service.ftl @@ -1,10 +1,12 @@ package ${packageName}.${subPackageName}; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.admin.common.base.service.BaseService; +import ${packageName}.model.entity.${classNamePrefix}DO; import ${packageName}.model.query.${classNamePrefix}Query; import ${packageName}.model.req.${classNamePrefix}Req; import ${packageName}.model.resp.${classNamePrefix}DetailResp; import ${packageName}.model.resp.${classNamePrefix}Resp; +import top.continew.starter.data.service.IService; /** * ${businessName}业务接口 @@ -12,4 +14,4 @@ import ${packageName}.model.resp.${classNamePrefix}Resp; * @author ${author} * @since ${datetime} */ -public interface ${className} extends BaseService<${classNamePrefix}Resp, ${classNamePrefix}DetailResp, ${classNamePrefix}Query, ${classNamePrefix}Req> {} \ No newline at end of file +public interface ${className} extends BaseService<${classNamePrefix}Resp, ${classNamePrefix}DetailResp, ${classNamePrefix}Query, ${classNamePrefix}Req>, IService<${classNamePrefix}DO> {} \ No newline at end of file diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/ServiceImpl.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/ServiceImpl.ftl index 0140b428..7f76769b 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/ServiceImpl.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/ServiceImpl.ftl @@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.admin.common.base.service.BaseServiceImpl; import ${packageName}.mapper.${classNamePrefix}Mapper; import ${packageName}.model.entity.${classNamePrefix}DO; import ${packageName}.model.query.${classNamePrefix}Query; diff --git a/continew-plugin/continew-plugin-open/pom.xml b/continew-plugin/continew-plugin-open/pom.xml index e5cd7185..798fb530 100644 --- a/continew-plugin/continew-plugin-open/pom.xml +++ b/continew-plugin/continew-plugin-open/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-plugin ${revision} diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java index 1fbc1c6e..9737f139 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.open.model.query.AppQuery; import top.continew.admin.open.model.req.AppReq; import top.continew.admin.open.model.resp.AppDetailResp; diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java index 9eb83deb..27de82fc 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java @@ -21,7 +21,7 @@ import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import org.springframework.stereotype.Component; import top.continew.admin.open.util.OpenApiUtils; -import java.lang.reflect.Method; +import java.lang.reflect.AnnotatedElement; import static cn.dev33.satoken.annotation.handler.SaCheckPermissionHandler._checkMethod; @@ -40,9 +40,10 @@ public class SaCheckPermissionHandler implements SaAnnotationHandlerInterface implements AppService { @Override diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/sign/OpenApiSignTemplate.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/sign/OpenApiSignTemplate.java index 4cbf4c38..705b6860 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/sign/OpenApiSignTemplate.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/sign/OpenApiSignTemplate.java @@ -17,13 +17,13 @@ package top.continew.admin.open.sign; import cn.dev33.satoken.secure.SaSecureUtil; -import cn.dev33.satoken.sign.SaSignTemplate; +import cn.dev33.satoken.sign.template.SaSignTemplate; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.open.model.entity.AppDO; import top.continew.admin.open.service.AppService; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.util.Map; diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/OpenApiUtils.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/OpenApiUtils.java index dbcbd65f..ef10134a 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/OpenApiUtils.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/OpenApiUtils.java @@ -18,7 +18,7 @@ package top.continew.admin.open.util; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaRequest; -import cn.dev33.satoken.sign.SaSignTemplate; +import cn.dev33.satoken.sign.template.SaSignTemplate; import java.util.Collection; diff --git a/continew-plugin/continew-plugin-schedule/pom.xml b/continew-plugin/continew-plugin-schedule/pom.xml index 8a376692..962104f0 100644 --- a/continew-plugin/continew-plugin-schedule/pom.xml +++ b/continew-plugin/continew-plugin-schedule/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-plugin ${revision} diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/FeignConfiguration.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/FeignConfiguration.java index 41badd26..2418c8a0 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/FeignConfiguration.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/FeignConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import top.continew.admin.schedule.api.JobClient; -import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.autoconfigure.application.ApplicationProperties; /** * Feign 配置 @@ -34,7 +34,7 @@ import top.continew.starter.core.autoconfigure.project.ProjectProperties; @RequiredArgsConstructor public class FeignConfiguration { - private final ProjectProperties projectProperties; + private final ApplicationProperties applicationProperties; @Value("${snail-job.server.api.url}") private String baseUrl; @@ -58,6 +58,6 @@ public class FeignConfiguration { */ @Bean public Logger.Level feignLoggerLevel() { - return projectProperties.isProduction() ? Logger.Level.BASIC : Logger.Level.FULL; + return applicationProperties.isProduction() ? Logger.Level.BASIC : Logger.Level.FULL; } } \ No newline at end of file diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobController.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobController.java index 144264db..c8362416 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobController.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobController.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -44,7 +45,6 @@ import java.util.List; * @since 2024/6/25 22:24 */ @Tag(name = " 任务 API") -@Validated @RestController @RequiredArgsConstructor @RequestMapping("/schedule/job") @@ -62,7 +62,8 @@ public class JobController { @Operation(summary = "新增任务", description = "新增任务") @SaCheckPermission("schedule:job:create") @PostMapping - public void create(@Validated(CrudValidationGroup.Create.class) @RequestBody JobReq req) { + @Validated(CrudValidationGroup.Create.class) + public void create(@RequestBody @Valid JobReq req) { baseService.create(req); } @@ -70,14 +71,15 @@ public class JobController { @Parameter(name = "id", description = "ID", example = "1", in = ParameterIn.PATH) @SaCheckPermission("schedule:job:update") @PutMapping("/{id}") - public void update(@Validated(CrudValidationGroup.Update.class) @RequestBody JobReq req, @PathVariable Long id) { + @Validated(CrudValidationGroup.Update.class) + public void update(@RequestBody @Valid JobReq req, @PathVariable Long id) { baseService.update(req, id); } @Operation(summary = "修改任务状态", description = "修改任务状态") @SaCheckPermission("schedule:job:update") @PatchMapping("/{id}/status") - public void updateStatus(@Validated @RequestBody JobStatusReq req, @PathVariable Long id) { + public void updateStatus(@RequestBody @Valid JobStatusReq req, @PathVariable Long id) { baseService.updateStatus(req, id); } diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobLogController.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobLogController.java index 934c854d..5cd7dd29 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobLogController.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobLogController.java @@ -21,8 +21,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import top.continew.admin.schedule.model.JobInstanceLogPageResult; import top.continew.admin.schedule.model.query.JobInstanceLogQuery; @@ -43,7 +43,6 @@ import java.util.List; * @since 2024/6/27 22:24 */ @Tag(name = " 任务日志 API") -@Validated @RestController @RequiredArgsConstructor @RequestMapping("/schedule/log") @@ -54,7 +53,7 @@ public class JobLogController { @Operation(summary = "分页查询任务日志列表", description = "分页查询任务日志列表") @SaCheckPermission("schedule:log:list") @GetMapping - public PageResp page(JobLogQuery query) { + public PageResp page(@Valid JobLogQuery query) { return baseService.page(query); } @@ -77,14 +76,14 @@ public class JobLogController { @Operation(summary = "查询任务实例列表", description = "查询任务实例列表") @SaCheckPermission("schedule:log:list") @GetMapping("/instance") - public List listInstance(JobInstanceQuery query) { + public List listInstance(@Valid JobInstanceQuery query) { return baseService.listInstance(query); } @Operation(summary = "分页查询任务实例日志列表", description = "分页查询任务实例日志列表") @SaCheckPermission("schedule:log:list") @GetMapping("/instance/log") - public JobInstanceLogPageResult pageInstanceLog(JobInstanceLogQuery query) { + public JobInstanceLogPageResult pageInstanceLog(@Valid JobInstanceLogQuery query) { return baseService.pageInstanceLog(query); } } diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java index d13872c5..a2fb308e 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; import top.continew.admin.schedule.enums.JobExecuteStatusEnum; -import top.continew.starter.core.validation.constraints.EnumValue; +import top.continew.starter.validation.constraints.EnumValue; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobQuery.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobQuery.java index 736432f6..c6b4ad46 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobQuery.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobQuery.java @@ -19,7 +19,7 @@ package top.continew.admin.schedule.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.schedule.enums.JobStatusEnum; -import top.continew.starter.core.validation.constraints.EnumValue; +import top.continew.starter.validation.constraints.EnumValue; import java.io.Serial; diff --git a/continew-plugin/pom.xml b/continew-plugin/pom.xml index 03d9224f..092cf258 100644 --- a/continew-plugin/pom.xml +++ b/continew-plugin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-admin ${revision} @@ -24,7 +24,7 @@ - top.continew + top.continew.admin continew-common diff --git a/continew-server/pom.xml b/continew-server/pom.xml index be9e099a..8ff192d1 100644 --- a/continew-server/pom.xml +++ b/continew-server/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-admin ${revision} @@ -30,31 +30,31 @@ - top.continew + top.continew.admin continew-system - top.continew + top.continew.admin continew-plugin-schedule - top.continew + top.continew.admin continew-plugin-open - top.continew + top.continew.admin continew-plugin-generator - top.continew + top.continew.starter continew-starter-trace diff --git a/continew-server/src/main/java/top/continew/admin/ContiNewAdminApplication.java b/continew-server/src/main/java/top/continew/admin/ContiNewAdminApplication.java index c0cae737..376f056a 100644 --- a/continew-server/src/main/java/top/continew/admin/ContiNewAdminApplication.java +++ b/continew-server/src/main/java/top/continew/admin/ContiNewAdminApplication.java @@ -29,12 +29,13 @@ import org.dromara.x.file.storage.spring.EnableFileStorage; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; +import org.springframework.boot.SpringBootVersion; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.autoconfigure.application.ApplicationProperties; import top.continew.starter.extension.crud.annotation.EnableCrudRestController; import top.continew.starter.web.annotation.EnableGlobalResponse; import top.continew.starter.web.model.R; @@ -56,7 +57,7 @@ import top.continew.starter.web.model.R; @RequiredArgsConstructor public class ContiNewAdminApplication implements ApplicationRunner { - private final ProjectProperties projectProperties; + private final ApplicationProperties applicationProperties; private final ServerProperties serverProperties; public static void main(String[] args) { @@ -67,7 +68,7 @@ public class ContiNewAdminApplication implements ApplicationRunner { @SaIgnore @GetMapping("/") public R index() { - return R.ok(projectProperties); + return R.ok(applicationProperties); } @Override @@ -76,18 +77,19 @@ public class ContiNewAdminApplication implements ApplicationRunner { Integer port = serverProperties.getPort(); String contextPath = serverProperties.getServlet().getContextPath(); String baseUrl = URLUtil.normalize("%s:%s%s".formatted(hostAddress, port, contextPath)); - log.info("----------------------------------------------"); - log.info("{} service started successfully.", projectProperties.getName()); - log.info("Profile: {}", SpringUtil.getProperty("spring.profiles.active")); - log.info("项目版本: v{} (ContiNew Starter: v{})", projectProperties.getVersion(), SpringUtil - .getProperty("project.starter")); - log.info("API 地址: {}", baseUrl); + log.info("-----------------------------------------------------"); + log.info("{} server started successfully.", applicationProperties.getName()); + log.info("ContiNew Starter: v{} (Spring Boot: v{})", SpringUtil + .getProperty("application.starter"), SpringBootVersion.getVersion()); + log.info("当前版本: v{} (Profile: {})", applicationProperties.getVersion(), SpringUtil + .getProperty("spring.profiles.active")); + log.info("服务地址: {}", baseUrl); Knife4jProperties knife4jProperties = SpringUtil.getBean(Knife4jProperties.class); if (!knife4jProperties.isProduction()) { - log.info("API 文档: {}/doc.html", baseUrl); + log.info("接口文档: {}/doc.html", baseUrl); } log.info("在线文档: https://continew.top"); log.info("常见问题: https://continew.top/admin/faq.html"); - log.info("----------------------------------------------"); + log.info("-----------------------------------------------------"); } } diff --git a/continew-server/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java b/continew-server/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java index 94c49efd..d4f44101 100644 --- a/continew-server/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java +++ b/continew-server/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java @@ -16,14 +16,14 @@ package top.continew.admin.config.satoken; -import cn.dev33.satoken.SaManager; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaRequest; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; -import cn.dev33.satoken.sign.SaSignTemplate; -import cn.dev33.satoken.sign.SaSignUtil; +import cn.dev33.satoken.sign.SaSignManager; +import cn.dev33.satoken.sign.template.SaSignTemplate; +import cn.dev33.satoken.sign.template.SaSignUtil; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; @@ -41,7 +41,7 @@ import top.continew.admin.open.sign.OpenApiSignTemplate; import top.continew.starter.auth.satoken.autoconfigure.SaTokenExtensionProperties; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; -import top.continew.starter.core.validation.CheckUtils; +import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import java.util.*; @@ -75,7 +75,7 @@ public class SaTokenConfiguration { */ @Bean public SaInterceptor saInterceptor() { - SaManager.setSaSignTemplate(signTemplate); + SaSignManager.setSaSignTemplate(signTemplate); return new SaExtensionInterceptor(handle -> SaRouter.match(StringConstants.PATH_PATTERN) .notMatch(properties.getSecurity().getExcludes()) .check(r -> { @@ -101,7 +101,7 @@ public class SaTokenConfiguration { } /** - * 配置 sa-token SaIgnore 注解排除路径 + * 配置 sa-token {@link SaIgnore} 注解排除路径 *

主要针对 @CrudRequestMapping 注解

*/ @EventListener(ApplicationReadyEvent.class) @@ -113,11 +113,11 @@ public class SaTokenConfiguration { if (AopUtils.isAopProxy(bean)) { clazz = AopProxyUtils.ultimateTargetClass(bean); } + // 使用 @CrudRequestMapping 的 Controller，如果使用了 @SaIgnore 注解，则表示忽略校验 CrudRequestMapping crudRequestMapping = AnnotationUtils.findAnnotation(clazz, CrudRequestMapping.class); SaIgnore saIgnore = AnnotationUtils.findAnnotation(clazz, SaIgnore.class); - if (crudRequestMapping != null && saIgnore != null) { - return crudRequestMapping.value() + "/**"; + return crudRequestMapping.value() + StringConstants.PATH_PATTERN; } return null; }).filter(Objects::nonNull).toList(); diff --git a/continew-server/src/main/java/top/continew/admin/controller/common/CaptchaController.java b/continew-server/src/main/java/top/continew/admin/controller/common/CaptchaController.java index 2cc8575e..a5b2f6fd 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/common/CaptchaController.java +++ b/continew-server/src/main/java/top/continew/admin/controller/common/CaptchaController.java @@ -52,16 +52,16 @@ import top.continew.admin.system.service.OptionService; import top.continew.admin.system.service.SmsConfigService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.captcha.graphic.core.GraphicCaptchaService; -import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.autoconfigure.application.ApplicationProperties; import top.continew.starter.core.util.TemplateUtils; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.core.validation.ValidationUtils; -import top.continew.starter.core.validation.constraints.Mobile; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.log.annotation.Log; import top.continew.starter.messaging.mail.util.MailUtils; import top.continew.starter.ratelimiter.annotation.RateLimiter; import top.continew.starter.ratelimiter.annotation.RateLimiters; import top.continew.starter.ratelimiter.enums.LimitType; +import top.continew.starter.validation.constraints.Mobile; import top.continew.starter.web.model.R; import java.time.Duration; @@ -84,7 +84,7 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/captcha") public class CaptchaController { - private final ProjectProperties projectProperties; + private final ApplicationProperties applicationProperties; private final CaptchaProperties captchaProperties; private final CaptchaService behaviorCaptchaService; private final GraphicCaptchaService graphicCaptchaService; @@ -162,12 +162,12 @@ public class CaptchaController { Long expirationInMinutes = captchaMail.getExpirationInMinutes(); Map siteConfig = optionService.getByCategory(OptionCategoryEnum.SITE); String content = TemplateUtils.render(captchaMail.getTemplatePath(), Dict.create() - .set("siteUrl", projectProperties.getUrl()) + .set("siteUrl", applicationProperties.getUrl()) .set("siteTitle", siteConfig.get("SITE_TITLE")) .set("siteCopyright", siteConfig.get("SITE_COPYRIGHT")) .set("captcha", captcha) .set("expiration", expirationInMinutes)); - MailUtils.sendHtml(email, "【%s】邮箱验证码".formatted(projectProperties.getName()), content); + MailUtils.sendHtml(email, "【%s】邮箱验证码".formatted(applicationProperties.getName()), content); // 保存验证码 String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + email; RedisUtils.set(captchaKey, captcha, Duration.ofMinutes(expirationInMinutes)); diff --git a/continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java b/continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java index e42aea6f..2e5ccba8 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java +++ b/continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java @@ -35,7 +35,7 @@ import top.continew.admin.system.enums.OptionCategoryEnum; import top.continew.admin.system.model.query.*; import top.continew.admin.system.model.resp.file.FileUploadResp; import top.continew.admin.system.service.*; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.log.annotation.Log; @@ -68,7 +68,7 @@ public class CommonController { @Operation(summary = "上传文件", description = "上传文件") @Parameter(name = "parentPath", description = "上级目录", example = "/", in = ParameterIn.QUERY) @PostMapping("/file") - public FileUploadResp upload(@NotNull(message = "文件不能为空") @RequestPart MultipartFile file, + public FileUploadResp upload(@RequestPart @NotNull(message = "文件不能为空") MultipartFile file, @RequestParam(required = false) String parentPath) throws IOException { ValidationUtils.throwIf(file::isEmpty, "文件不能为空"); FileInfo fileInfo = fileService.upload(file, parentPath); diff --git a/continew-server/src/main/java/top/continew/admin/controller/common/DashboardController.java b/continew-server/src/main/java/top/continew/admin/controller/common/DashboardController.java index bbbbac3c..846057ef 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/common/DashboardController.java +++ b/continew-server/src/main/java/top/continew/admin/controller/common/DashboardController.java @@ -25,7 +25,6 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,7 +35,7 @@ import top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp; import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp; import top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; import top.continew.admin.system.service.DashboardService; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.log.annotation.Log; import java.io.IOException; @@ -50,7 +49,6 @@ import java.util.List; */ @Tag(name = "仪表盘 API") @Log(ignore = true) -@Validated @RestController @RequiredArgsConstructor @RequestMapping("/dashboard") diff --git a/continew-server/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java b/continew-server/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java index 4254c38e..64fae8e6 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java +++ b/continew-server/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java @@ -22,13 +22,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import top.continew.admin.auth.model.query.OnlineUserQuery; import top.continew.admin.auth.model.resp.OnlineUserResp; import top.continew.admin.auth.service.OnlineUserService; -import top.continew.starter.core.validation.CheckUtils; +import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; @@ -49,7 +49,7 @@ public class OnlineUserController { @Operation(summary = "分页查询列表", description = "分页查询列表") @SaCheckPermission("monitor:online:list") @GetMapping - public PageResp page(OnlineUserQuery query, @Validated PageQuery pageQuery) { + public PageResp page(@Valid OnlineUserQuery query, @Valid PageQuery pageQuery) { return baseService.page(query, pageQuery); } diff --git a/continew-server/src/main/resources/banner.txt b/continew-server/src/main/resources/banner.txt index 6729007f..6f7af400 100644 --- a/continew-server/src/main/resources/banner.txt +++ b/continew-server/src/main/resources/banner.txt @@ -4,6 +4,6 @@ | |___| (_) || | | || |_ | || |\ || __/ \ V V /|_____|/ ___ \| (_| || | | | | || || | | | \____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_| - :: ${project.name} :: v${project.version} - :: ContiNew Starter :: v${project.starter} + :: ${application.name} :: v${application.version} (Profile: ${spring.profiles.active}) + :: ContiNew Starter :: v${application.starter} :: Spring Boot :: v${spring-boot.version} diff --git a/continew-server/src/main/resources/config/application-dev.yml b/continew-server/src/main/resources/config/application-dev.yml index 3cd72a4f..e837da3e 100644 --- a/continew-server/src/main/resources/config/application-dev.yml +++ b/continew-server/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ ---- ### 项目配置 -project: +--- ### 应用配置 +application: # URL（跨域配置默认放行此 URL，第三方登录回调默认使用此 URL 为前缀，请注意更改为你实际的前端 URL） url: http://localhost:5173 @@ -234,11 +234,11 @@ justauth: GITEE: client-id: 5d271b7f638941812aaf8bfc2e2f08f06d6235ef934e0e39537e2364eb8452c4 client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${project.url}/social/callback?source=gitee + redirect-uri: ${application.url}/social/callback?source=gitee GITHUB: client-id: 38080dad08cfbdfacca9 client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${project.url}/social/callback?source=github + redirect-uri: ${application.url}/social/callback?source=github cache: type: REDIS diff --git a/continew-server/src/main/resources/config/application-prod.yml b/continew-server/src/main/resources/config/application-prod.yml index 25dbf98b..389ba631 100644 --- a/continew-server/src/main/resources/config/application-prod.yml +++ b/continew-server/src/main/resources/config/application-prod.yml @@ -1,5 +1,5 @@ ---- ### 项目配置 -project: +--- ### 应用配置 +application: # URL（跨域配置默认放行此 URL，第三方登录回调默认使用此 URL 为前缀，请注意更改为你实际的前端 URL） url: https://admin.continew.top # 是否为生产环境 @@ -99,14 +99,14 @@ jetcache: ## 接口文档增强配置 knife4j: # 开启生产环境屏蔽 - production: ${project.production} + production: ${application.production} --- ### 跨域配置 continew-starter.web.cors: enabled: true # 配置允许跨域的域名 allowed-origins: - - ${project.url} + - ${application.url} # 配置允许跨域的请求方式 allowed-methods: '*' # 配置允许跨域的请求头 @@ -213,7 +213,7 @@ continew-starter.messaging.websocket: path: /websocket # 配置允许跨域的域名 allowed-origins: - - ${project.url} + - ${application.url} --- ### Sa-Token 扩展配置 sa-token.extension: @@ -236,11 +236,11 @@ justauth: GITEE: client-id: 5d271b7f638941812aaf8bfc2e2f08f06d6235ef934e0e39537e2364eb8452c4 client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${project.url}/social/callback?source=gitee + redirect-uri: ${application.url}/social/callback?source=gitee GITHUB: client-id: 38080dad08cfbdfacca9 client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${project.url}/social/callback?source=github + redirect-uri: ${application.url}/social/callback?source=github cache: type: REDIS diff --git a/continew-server/src/main/resources/config/application.yml b/continew-server/src/main/resources/config/application.yml index 4ba6b6ad..ebbaba9e 100644 --- a/continew-server/src/main/resources/config/application.yml +++ b/continew-server/src/main/resources/config/application.yml @@ -1,14 +1,13 @@ ---- ### 项目配置 -project: +--- ### 应用配置 +application: + id: continew-admin # 名称 name: ContiNew Admin - # 应用名称 - app-name: continew-admin - # 版本 - version: 4.0.0-SNAPSHOT - starter: 2.12.2 # 描述 description: 持续迭代优化的前后端分离中后台管理系统框架，开箱即用，持续提供舒适的开发体验。 + # 版本 + version: 4.0.0-SNAPSHOT + starter: 2.13.0 # 基本包 base-package: top.continew.admin ## 作者信息配置 @@ -44,7 +43,7 @@ server: --- ### Spring 项目配置 spring: application: - name: ${project.app-name} + name: ${application.id} ## 环境配置 profiles: # 启用的环境 @@ -133,7 +132,7 @@ knife4j: # 是否自定义 footer（默认 false，非自定义） enable-footer-custom: true # 自定义 footer 内容，支持 Markdown 语法 - footer-custom-content: 'Copyright © 2022-present [${project.contact.name}](${project.contact.url}) ⋅ [${project.name}](${project.url}) v${project.version}' + footer-custom-content: 'Copyright © 2022-present [${application.contact.name}](${application.contact.url}) ⋅ [${application.name}](${application.url}) v${application.version}' --- ### 全局响应配置 continew-starter.web: @@ -236,7 +235,7 @@ mybatis-plus: # Mapper XML 文件目录配置 mapper-locations: classpath*:/mapper/**/*Mapper.xml # 类型别名扫描包配置 - type-aliases-package: ${project.base-package}.**.model + type-aliases-package: ${application.base-package}.**.model ## MyBatis 配置 configuration: # MyBatis 自动映射策略 @@ -255,7 +254,7 @@ mybatis-plus: extension: enabled: true # Mapper 接口扫描包配置 - mapper-package: ${project.base-package}.**.mapper + mapper-package: ${application.base-package}.**.mapper # ID 生成器配置 id-generator: type: COSID diff --git a/continew-system/pom.xml b/continew-system/pom.xml index a9bd2d6a..a2c10663 100644 --- a/continew-system/pom.xml +++ b/continew-system/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew + top.continew.admin continew-admin ${revision} @@ -18,7 +18,7 @@ - top.continew + top.continew.admin continew-common diff --git a/continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java b/continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java index 03eb9f87..86dd31ee 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java +++ b/continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java @@ -36,8 +36,8 @@ import top.continew.admin.system.service.DeptService; import top.continew.admin.system.service.OptionService; import top.continew.admin.system.service.RoleService; import top.continew.admin.system.service.UserService; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.core.validation.Validator; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.Validator; import top.continew.starter.core.util.ServletUtils; import java.util.Set; diff --git a/continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java b/continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java index 5bd5a695..33b624f2 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java +++ b/continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java @@ -20,18 +20,17 @@ import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import com.xkcoding.justauth.autoconfigure.JustAuthProperties; - import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import me.zhyd.oauth.AuthRequestBuilder; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.utils.AuthStateUtils; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import top.continew.admin.auth.model.req.LoginReq; import top.continew.admin.auth.model.resp.LoginResp; @@ -56,7 +55,6 @@ import java.util.List; */ @Tag(name = "认证 API") @Log(module = "登录") -@Validated @RestController @RequiredArgsConstructor @RequestMapping("/auth") @@ -69,7 +67,7 @@ public class AuthController { @SaIgnore @Operation(summary = "登录", description = "用户登录") @PostMapping("/login") - public LoginResp login(@Validated @RequestBody LoginReq req, HttpServletRequest request) { + public LoginResp login(@RequestBody @Valid LoginReq req, HttpServletRequest request) { return authService.login(req, request); } diff --git a/continew-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java b/continew-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java index 95d012d9..e5823052 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java +++ b/continew-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java @@ -37,8 +37,8 @@ import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.util.ExceptionUtils; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.time.Duration; diff --git a/continew-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java b/continew-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java index f1f74990..7c21bb06 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java +++ b/continew-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java @@ -26,7 +26,7 @@ import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; /** * 邮箱登录处理器 diff --git a/continew-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java b/continew-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java index 7f9e673f..e1bc51c2 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java +++ b/continew-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java @@ -26,7 +26,7 @@ import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; /** * 手机号登录处理器 diff --git a/continew-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java b/continew-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java index 3ce11393..470e4f64 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java +++ b/continew-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java @@ -50,9 +50,9 @@ import top.continew.admin.system.model.resp.ClientResp; import top.continew.admin.system.service.MessageService; import top.continew.admin.system.service.UserRoleService; import top.continew.admin.system.service.UserSocialService; -import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.autoconfigure.application.ApplicationProperties; import top.continew.starter.core.exception.BadRequestException; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.time.LocalDateTime; import java.util.Collections; @@ -72,7 +72,7 @@ public class SocialLoginHandler extends AbstractLoginHandler { private final UserSocialService userSocialService; private final UserRoleService userRoleService; private final MessageService messageService; - private final ProjectProperties projectProperties; + private final ApplicationProperties applicationProperties; @Override public LoginResp login(SocialLoginReq req, ClientResp client, HttpServletRequest request) { @@ -166,7 +166,7 @@ public class SocialLoginHandler extends AbstractLoginHandler { private void sendSecurityMsg(UserDO user) { MessageTemplateEnum template = MessageTemplateEnum.SOCIAL_REGISTER; MessageReq req = new MessageReq(MessageTypeEnum.SECURITY); - req.setTitle(template.getTitle().formatted(projectProperties.getName())); + req.setTitle(template.getTitle().formatted(applicationProperties.getName())); req.setContent(template.getContent().formatted(user.getNickname())); messageService.add(req, CollUtil.toList(user.getId().toString())); } diff --git a/continew-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java b/continew-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java index 6e6e805b..355ad925 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java +++ b/continew-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.continew.starter.core.validation.constraints.Mobile; +import top.continew.starter.validation.constraints.Mobile; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java b/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java index 559a60a8..87bd8f9d 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java @@ -40,7 +40,7 @@ import top.continew.admin.system.model.resp.MenuResp; import top.continew.admin.system.service.ClientService; import top.continew.admin.system.service.MenuService; import top.continew.admin.system.service.RoleService; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.autoconfigure.CrudProperties; diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java b/continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java index b12cc3ac..cddb7ac3 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java @@ -18,7 +18,7 @@ package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.ClientQuery; import top.continew.admin.system.model.req.ClientReq; import top.continew.admin.system.model.resp.ClientResp; diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java b/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java index 50efa0ba..9e199c9c 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java @@ -18,7 +18,7 @@ package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.DeptQuery; import top.continew.admin.system.model.req.DeptReq; import top.continew.admin.system.model.resp.DeptResp; diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/DictController.java b/continew-system/src/main/java/top/continew/admin/system/controller/DictController.java index 59dd7979..5d6b839a 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/DictController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/DictController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.DictQuery; import top.continew.admin.system.model.req.DictReq; import top.continew.admin.system.model.resp.DictResp; diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java b/continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java index b6434084..6d0649f9 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java @@ -18,7 +18,7 @@ package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.DictItemQuery; import top.continew.admin.system.model.req.DictItemReq; import top.continew.admin.system.model.resp.DictItemResp; diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java b/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java index c6011ed4..2173b162 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java @@ -25,9 +25,10 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.x.file.storage.core.FileInfo; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.FileQuery; import top.continew.admin.system.model.req.FileReq; import top.continew.admin.system.model.resp.file.FileDirCalcSizeResp; @@ -35,7 +36,7 @@ import top.continew.admin.system.model.resp.file.FileResp; import top.continew.admin.system.model.resp.file.FileStatisticsResp; import top.continew.admin.system.model.resp.file.FileUploadResp; import top.continew.admin.system.service.FileService; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.enums.Api; import top.continew.starter.extension.crud.model.resp.IdResp; @@ -50,6 +51,7 @@ import java.io.IOException; * @since 2023/12/23 10:38 */ @Tag(name = "文件管理 API") +@Validated @RestController @RequiredArgsConstructor @CrudRequestMapping(value = "/system/file", api = {Api.PAGE, Api.UPDATE, Api.DELETE}) @@ -85,7 +87,7 @@ public class FileController extends BaseController createDir(@Valid @RequestBody FileReq req) { + public IdResp createDir(@RequestBody @Valid FileReq req) { ValidationUtils.throwIfBlank(req.getParentPath(), "上级目录不能为空"); return new IdResp<>(baseService.createDir(req)); } diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/LogController.java b/continew-system/src/main/java/top/continew/admin/system/controller/LogController.java index 80201d80..24857d4c 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/LogController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/LogController.java @@ -23,8 +23,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -56,7 +56,7 @@ public class LogController { @Operation(summary = "分页查询列表", description = "分页查询列表") @SaCheckPermission("monitor:log:list") @GetMapping - public PageResp page(LogQuery query, @Validated PageQuery pageQuery) { + public PageResp page(@Valid LogQuery query, @Valid PageQuery pageQuery) { return baseService.page(query, pageQuery); } @@ -73,7 +73,7 @@ public class LogController { @Operation(summary = "导出登录日志", description = "导出登录日志") @SaCheckPermission("monitor:log:export") @GetMapping("/export/login") - public void exportLoginLog(LogQuery query, SortQuery sortQuery, HttpServletResponse response) { + public void exportLoginLog(@Valid LogQuery query, @Valid SortQuery sortQuery, HttpServletResponse response) { baseService.exportLoginLog(query, sortQuery, response); } @@ -81,7 +81,7 @@ public class LogController { @Operation(summary = "导出操作日志", description = "导出操作日志") @SaCheckPermission("monitor:log:export") @GetMapping("/export/operation") - public void exportOperationLog(LogQuery query, SortQuery sortQuery, HttpServletResponse response) { + public void exportOperationLog(@Valid LogQuery query, @Valid SortQuery sortQuery, HttpServletResponse response) { baseService.exportOperationLog(query, sortQuery, response); } } diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java b/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java index 72354b45..6c0af016 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java @@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.RestController; import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.MenuQuery; import top.continew.admin.system.model.req.MenuReq; import top.continew.admin.system.model.resp.MenuResp; @@ -32,7 +32,7 @@ import top.continew.admin.system.service.MenuService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.URLUtils; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.extension.crud.annotation.CrudApi; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/NoticeController.java b/continew-system/src/main/java/top/continew/admin/system/controller/NoticeController.java index bbc21dd9..e528d57e 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/NoticeController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/NoticeController.java @@ -19,7 +19,7 @@ package top.continew.admin.system.controller; import cn.hutool.core.collection.CollUtil; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.enums.NoticeMethodEnum; import top.continew.admin.system.enums.NoticeScopeEnum; import top.continew.admin.system.model.query.NoticeQuery; @@ -27,7 +27,7 @@ import top.continew.admin.system.model.req.NoticeReq; import top.continew.admin.system.model.resp.notice.NoticeDetailResp; import top.continew.admin.system.model.resp.notice.NoticeResp; import top.continew.admin.system.service.NoticeService; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.extension.crud.annotation.CrudApi; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/OptionController.java b/continew-system/src/main/java/top/continew/admin/system/controller/OptionController.java index 5a577537..bdb3f802 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/OptionController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/OptionController.java @@ -22,7 +22,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import top.continew.admin.system.model.query.OptionQuery; import top.continew.admin.system.model.req.OptionReq; @@ -39,7 +38,6 @@ import java.util.List; * @since 2023/8/26 19:38 */ @Tag(name = "参数管理 API") -@Validated @RestController @RequiredArgsConstructor @RequestMapping("/system/option") @@ -51,7 +49,7 @@ public class OptionController { @SaCheckPermission(value = {"system:siteConfig:get", "system:securityConfig:get", "system:loginConfig:get", "system:mailConfig:get"}, mode = SaMode.OR) @GetMapping - public List list(@Validated OptionQuery query) { + public List list(@Valid OptionQuery query) { return baseService.list(query); } @@ -59,7 +57,7 @@ public class OptionController { @SaCheckPermission(value = {"system:siteConfig:update", "system:securityConfig:update", "system:loginConfig:update", "system:mailConfig:update"}, mode = SaMode.OR) @PutMapping - public void update(@Valid @RequestBody List options) { + public void update(@RequestBody @Valid List options) { baseService.update(options); } @@ -67,7 +65,7 @@ public class OptionController { @SaCheckPermission(value = {"system:siteConfig:update", "system:securityConfig:update", "system:loginConfig:update", "system:mailConfig:update"}, mode = SaMode.OR) @PatchMapping("/value") - public void resetValue(@Validated @RequestBody OptionResetValueReq req) { + public void resetValue(@RequestBody @Valid OptionResetValueReq req) { baseService.resetValue(req); } } \ No newline at end of file diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/RoleController.java b/continew-system/src/main/java/top/continew/admin/system/controller/RoleController.java index 2139ad02..715a4df3 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/RoleController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/RoleController.java @@ -21,11 +21,12 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.RoleQuery; import top.continew.admin.system.model.query.RoleUserQuery; import top.continew.admin.system.model.req.RoleReq; @@ -60,7 +61,7 @@ public class RoleController extends BaseController pageUser(@PathVariable("id") Long id, - @Validated RoleUserQuery query, - @Validated PageQuery pageQuery) { + @Valid RoleUserQuery query, + @Valid PageQuery pageQuery) { query.setRoleId(id); return userRoleService.pageUser(query, pageQuery); } @@ -79,14 +80,14 @@ public class RoleController extends BaseController userIds) { + @RequestBody @NotEmpty(message = "用户ID列表不能为空") List userIds) { baseService.assignToUsers(id, userIds); } @Operation(summary = "取消分配用户", description = "批量取消分配角色给用户") @SaCheckPermission("system:role:unassign") @DeleteMapping("/user") - public void unassignFromUsers(@Validated @NotEmpty(message = "用户列表不能为空") @RequestBody List userRoleIds) { + public void unassignFromUsers(@RequestBody @NotEmpty(message = "用户列表不能为空") List userRoleIds) { userRoleService.deleteByIds(userRoleIds); } diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/SmsConfigController.java b/continew-system/src/main/java/top/continew/admin/system/controller/SmsConfigController.java index 16e11c72..044ae2bd 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/SmsConfigController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/SmsConfigController.java @@ -21,11 +21,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.SmsConfigQuery; import top.continew.admin.system.model.req.SmsConfigReq; import top.continew.admin.system.model.resp.SmsConfigResp; @@ -41,7 +40,6 @@ import top.continew.starter.extension.crud.enums.Api; * @since 2025/03/15 18:41 */ @Tag(name = "短信配置管理 API") -@Validated @RestController @CrudRequestMapping(value = "/system/smsConfig", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE}) public class SmsConfigController extends BaseController { diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/SmsLogController.java b/continew-system/src/main/java/top/continew/admin/system/controller/SmsLogController.java index 9117bbdf..8070f817 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/SmsLogController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/SmsLogController.java @@ -17,9 +17,8 @@ package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; +import top.continew.admin.common.base.controller.BaseController; import top.continew.admin.system.model.query.SmsLogQuery; import top.continew.admin.system.model.req.SmsLogReq; import top.continew.admin.system.model.resp.SmsLogResp; @@ -35,7 +34,6 @@ import top.continew.starter.extension.crud.enums.Api; * @since 2025/03/15 22:15 */ @Tag(name = "短信日志管理 API") -@Validated @RestController @CrudRequestMapping(value = "/system/smsLog", api = {Api.PAGE, Api.GET, Api.DELETE, Api.EXPORT}) public class SmsLogController extends BaseController { diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/StorageController.java b/continew-system/src/main/java/top/continew/admin/system/controller/StorageController.java index 04f26bc2..b7003743 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/StorageController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/StorageController.java @@ -21,13 +21,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.controller.BaseController; -import top.continew.admin.common.model.req.CommonStatusUpdateReq; +import top.continew.admin.common.base.controller.BaseController; +import top.continew.admin.common.base.model.req.CommonStatusUpdateReq; import top.continew.admin.system.model.query.StorageQuery; import top.continew.admin.system.model.req.StorageReq; import top.continew.admin.system.model.resp.StorageResp; @@ -42,7 +42,6 @@ import top.continew.starter.extension.crud.enums.Api; * @since 2023/12/26 22:09 */ @Tag(name = "存储管理 API") -@Validated @RestController @CrudRequestMapping(value = "/system/storage", api = {Api.LIST, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE}) public class StorageController extends BaseController { @@ -51,7 +50,7 @@ public class StorageController extends BaseController create(@Validated(CrudValidationGroup.Create.class) @RequestBody UserReq req) { + public IdResp create(@RequestBody @Valid UserReq req) { String rawPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(req.getPassword())); ValidationUtils.throwIfNull(rawPassword, "密码解密失败"); ValidationUtils.throwIf(!ReUtil @@ -86,7 +86,7 @@ public class UserController extends BaseController SecureUtils.decryptByRsaPrivateKey(req.getNewPassword())); ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败"); ValidationUtils.throwIf(!ReUtil @@ -115,7 +115,7 @@ public class UserController extends BaseController page(MessageQuery query, @Validated PageQuery pageQuery) { + public PageResp page(@Valid MessageQuery query, @Valid PageQuery pageQuery) { query.setUserId(UserContextHolder.getUserId()); return messageService.page(query, pageQuery); } @@ -91,13 +90,13 @@ public class UserMessageController { @Operation(summary = "删除消息", description = "删除消息") @DeleteMapping - public void delete(@Validated @RequestBody IdsReq req) { + public void delete(@RequestBody @Valid IdsReq req) { messageService.delete(req.getIds()); } @Operation(summary = "消息标记为已读", description = "将消息标记为已读状态") @PatchMapping("/read") - public void read(@Validated @RequestBody IdsReq req) { + public void read(@RequestBody @Valid IdsReq req) { messageService.readMessage(req.getIds(), UserContextHolder.getUserId()); } @@ -125,7 +124,7 @@ public class UserMessageController { @Operation(summary = "分页查询公告列表", description = "分页查询公告列表") @GetMapping("/notice") - public BasePageResp pageNotice(@Validated NoticeQuery query, @Validated PageQuery pageQuery) { + public BasePageResp pageNotice(@Valid NoticeQuery query, @Valid PageQuery pageQuery) { query.setUserId(UserContextHolder.getUserId()); return noticeService.page(query, pageQuery); } diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java b/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java index d1bb8879..8782c414 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java @@ -49,7 +49,7 @@ import top.continew.admin.system.service.UserSocialService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.util.ExceptionUtils; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.io.IOException; import java.util.List; @@ -83,13 +83,13 @@ public class UserProfileController { @Operation(summary = "修改基础信息", description = "修改用户基础信息") @PatchMapping("/basic/info") - public void updateBasicInfo(@Validated @RequestBody UserBasicInfoUpdateReq req) { + public void updateBasicInfo(@RequestBody @Valid UserBasicInfoUpdateReq req) { userService.updateBasicInfo(req, UserContextHolder.getUserId()); } @Operation(summary = "修改密码", description = "修改用户登录密码") @PatchMapping("/password") - public void updatePassword(@Validated @RequestBody UserPasswordUpdateReq updateReq) { + public void updatePassword(@RequestBody @Valid UserPasswordUpdateReq updateReq) { String rawOldPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq .getOldPassword())); ValidationUtils.throwIfNull(rawOldPassword, DECRYPT_FAILED); @@ -101,7 +101,7 @@ public class UserProfileController { @Operation(summary = "修改手机号", description = "修改手机号") @PatchMapping("/phone") - public void updatePhone(@Validated @RequestBody UserPhoneUpdateReq updateReq) { + public void updatePhone(@RequestBody @Valid UserPhoneUpdateReq updateReq) { String rawOldPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq .getOldPassword())); ValidationUtils.throwIfBlank(rawOldPassword, DECRYPT_FAILED); @@ -115,7 +115,7 @@ public class UserProfileController { @Operation(summary = "修改邮箱", description = "修改用户邮箱") @PatchMapping("/email") - public void updateEmail(@Valid @RequestBody UserEmailUpdateReq updateReq) { + public void updateEmail(@RequestBody @Valid UserEmailUpdateReq updateReq) { String rawOldPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq .getOldPassword())); ValidationUtils.throwIfBlank(rawOldPassword, DECRYPT_FAILED); diff --git a/continew-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java b/continew-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java index ff6d0b66..069e509c 100644 --- a/continew-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java +++ b/continew-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java @@ -29,7 +29,7 @@ import top.continew.admin.common.constant.SysConstants; import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.service.OptionService; import top.continew.admin.system.service.UserPasswordHistoryService; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.util.Map; diff --git a/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java b/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java index d38644bd..220cc659 100644 --- a/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java +++ b/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java @@ -26,7 +26,7 @@ import top.continew.admin.system.validation.ValidationGroup; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.util.URLUtils; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; /** * 存储类型枚举 diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java index ee8187d1..e53bedb4 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.ClientDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 客户端 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java index 2dd6e6e5..453ed15f 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.DeptDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 部门 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java index b24ab86a..e3dcb57b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java @@ -21,7 +21,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.system.model.entity.DictItemDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java index 88169f4f..62014853 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.DictDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 字典 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java index 546f9cb4..a6a7b809 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java @@ -20,7 +20,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import top.continew.admin.system.model.entity.FileDO; import top.continew.admin.system.model.resp.file.FileStatisticsResp; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java index 57dcdd6d..1acf8b62 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java @@ -29,7 +29,7 @@ import top.continew.admin.system.model.resp.dashboard.DashboardAccessTrendResp; import top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp; import top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; import top.continew.admin.system.model.resp.log.LogResp; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.Date; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java index fc78fa93..930e0747 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java @@ -19,7 +19,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import top.continew.admin.system.model.entity.MenuDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; import java.util.Set; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/MessageLogMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/MessageLogMapper.java index 80fd4662..ffb373ac 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/MessageLogMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/MessageLogMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.MessageLogDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 消息日志 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java index eed2c3ba..3f92bdf7 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java @@ -24,7 +24,7 @@ import top.continew.admin.system.model.entity.MessageDO; import top.continew.admin.system.model.query.MessageQuery; import top.continew.admin.system.model.resp.message.MessageDetailResp; import top.continew.admin.system.model.resp.message.MessageResp; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeLogMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeLogMapper.java index 443534f5..8bb10ea2 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeLogMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeLogMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.NoticeLogDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 公告日志 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java index 4d6ab6b2..5d90c2c3 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java @@ -24,7 +24,7 @@ import top.continew.admin.system.model.entity.NoticeDO; import top.continew.admin.system.model.query.NoticeQuery; import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp; import top.continew.admin.system.model.resp.notice.NoticeResp; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java index a81c663c..54627794 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java @@ -20,7 +20,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import top.continew.admin.system.model.entity.OptionDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java index 3ba2c9f0..084b77ba 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java @@ -20,7 +20,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import top.continew.admin.system.model.entity.RoleDeptDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java index cc7a112c..b30b4bdb 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.RoleDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 角色 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java index 8071d5c4..a8dd1eb5 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.RoleMenuDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/SmsConfigMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/SmsConfigMapper.java index c1278967..664c242b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/SmsConfigMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/SmsConfigMapper.java @@ -17,7 +17,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import top.continew.admin.system.model.entity.SmsConfigDO; /** diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/SmsLogMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/SmsLogMapper.java index 1aae7cf3..d65a18f9 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/SmsLogMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/SmsLogMapper.java @@ -17,7 +17,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; import top.continew.admin.system.model.entity.SmsLogDO; /** diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java index 11834e38..e77de252 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java @@ -18,7 +18,7 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Mapper; import top.continew.admin.system.model.entity.StorageDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 存储 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java index 1ede222b..708ccb5e 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java @@ -23,7 +23,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import top.continew.admin.system.model.entity.UserRoleDO; import top.continew.admin.system.model.resp.role.RoleUserResp; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 用户和角色 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java index 7b1c820f..1237bc42 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.continew.admin.common.config.mybatis.DataPermissionMapper; +import top.continew.admin.common.base.mapper.DataPermissionMapper; import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.user.UserDetailResp; import top.continew.starter.extension.datapermission.annotation.DataPermission; diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java index 5374149c..88be33b6 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java @@ -19,7 +19,7 @@ package top.continew.admin.system.mapper.user; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import top.continew.admin.system.model.entity.user.UserPasswordHistoryDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 用户历史密码 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserSocialMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserSocialMapper.java index d908533d..8fd7547b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserSocialMapper.java +++ b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserSocialMapper.java @@ -19,7 +19,7 @@ package top.continew.admin.system.mapper.user; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import top.continew.admin.system.model.entity.user.UserSocialDO; -import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mapper.BaseMapper; /** * 用户社会化关联 Mapper diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java index 288cfe7a..86969ebf 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import java.io.Serial; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java index 0f675564..992c1d16 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java index 8e578914..ff512734 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.starter.extension.crud.annotation.DictModel; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java index 190ccff9..c222f665 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java index 9b01e8bc..b94e39fe 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java @@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.NoArgsConstructor; import org.dromara.x.file.storage.core.FileInfo; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import top.continew.admin.system.enums.FileTypeEnum; import top.continew.starter.core.constant.StringConstants; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java index ef5afff1..0f3f4b99 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.MenuTypeEnum; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java index 3d30ffcc..23db58e2 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import top.continew.admin.system.enums.NoticeScopeEnum; import top.continew.admin.system.enums.NoticeStatusEnum; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java index a6fd33ab..d29bc99c 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.admin.common.model.entity.BaseUpdateDO; +import top.continew.admin.common.base.model.entity.BaseUpdateDO; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java index 975cfeab..10b1025a 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DataScopeEnum; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import top.continew.starter.extension.crud.annotation.DictModel; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java index 8e19bfe6..1346fd10 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsLogDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsLogDO.java index 444d87ae..f1b9436e 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsLogDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsLogDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.SuccessFailureStatusEnum; -import top.continew.admin.common.model.entity.BaseCreateDO; +import top.continew.admin.common.base.model.entity.BaseCreateDO; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java index 88fdbab0..3a61f589 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java @@ -23,7 +23,7 @@ import cn.hutool.core.util.URLUtil; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import top.continew.admin.system.enums.StorageTypeEnum; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java index 43cd1c68..88c4d0c2 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java @@ -24,7 +24,7 @@ import top.continew.admin.common.config.mybatis.BCryptEncryptor; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.annotation.DictModel; -import top.continew.admin.common.model.entity.BaseDO; +import top.continew.admin.common.base.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java index 110e4fd8..ed2e2caf 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java @@ -19,8 +19,8 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java index 0e59a12c..c70b45f4 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java @@ -19,8 +19,8 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java index b4a087c4..1df8c613 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java @@ -19,8 +19,8 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java index 6dcf38af..04b0535a 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java @@ -18,8 +18,8 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java index c0f9ca96..4d457a6b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java @@ -19,8 +19,8 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.system.enums.FileTypeEnum; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java index 8123aba3..ff5691b9 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java @@ -20,8 +20,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java index 131bcecf..73ad2c85 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java @@ -19,9 +19,9 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.system.enums.OptionCategoryEnum; -import top.continew.starter.core.validation.constraints.EnumValue; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.validation.constraints.EnumValue; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java index 28557224..5c881ac2 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java @@ -18,8 +18,8 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java index 52b842b0..359fb35d 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java @@ -19,8 +19,8 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java index ffde1aef..edaa5b0e 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.SuccessFailureStatusEnum; -import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.annotation.Query; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java index ecfc17b6..3f93088f 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java @@ -20,8 +20,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.StorageTypeEnum; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java b/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java index 2b96687b..666714ce 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java @@ -23,7 +23,7 @@ import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; import top.continew.admin.common.constant.RegexConstants; -import top.continew.starter.core.validation.constraints.Mobile; +import top.continew.starter.validation.constraints.Mobile; import top.continew.starter.extension.crud.validation.CrudValidationGroup; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java b/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java index bc1462a4..beb4dff2 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.continew.starter.core.validation.constraints.Mobile; +import top.continew.starter.validation.constraints.Mobile; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java b/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java index c12fd0e4..434e16eb 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java @@ -23,7 +23,7 @@ import org.hibernate.validator.constraints.Length; import top.continew.admin.common.constant.RegexConstants; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.common.enums.GenderEnum; -import top.continew.starter.core.validation.constraints.Mobile; +import top.continew.starter.validation.constraints.Mobile; import top.continew.starter.extension.crud.validation.CrudValidationGroup; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java index 9ecf3b76..e7ec1375 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java @@ -16,16 +16,16 @@ package top.continew.admin.system.model.resp; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.config.excel.DictExcelProperty; import top.continew.admin.common.config.excel.ExcelDictConverter; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.resp.BaseDetailResp; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.continew.starter.file.excel.converter.ExcelListConverter; +import top.continew.admin.common.base.model.resp.BaseDetailResp; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelListConverter; import java.io.Serial; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java index b623a603..e8dc9b47 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java @@ -16,14 +16,14 @@ package top.continew.admin.system.model.resp; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.annotation.TreeField; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java index 42235360..eaa4a5eb 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java @@ -16,12 +16,12 @@ package top.continew.admin.system.model.resp; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java index 020fa722..eee15bcf 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java index 83cd0cc6..1ab8e1c7 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseResp; +import top.continew.admin.common.base.model.resp.BaseResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.MenuTypeEnum; import top.continew.starter.extension.crud.annotation.TreeField; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsConfigResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsConfigResp.java index 0293b77b..162bcd7b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsConfigResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsConfigResp.java @@ -16,15 +16,15 @@ package top.continew.admin.system.model.resp; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.config.excel.DictExcelProperty; import top.continew.admin.common.config.excel.ExcelDictConverter; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.resp.BaseDetailResp; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.admin.common.base.model.resp.BaseDetailResp; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.security.mask.annotation.JsonMask; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsLogResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsLogResp.java index 7af53310..ba96a66b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsLogResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/SmsLogResp.java @@ -16,13 +16,13 @@ package top.continew.admin.system.model.resp; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.enums.SuccessFailureStatusEnum; -import top.continew.admin.common.model.resp.BaseResp; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.admin.common.base.model.resp.BaseResp; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java index 514846fa..d728de06 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.StorageTypeEnum; import top.continew.starter.security.mask.annotation.JsonMask; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileResp.java index f5ed01cd..e274c44a 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileResp.java @@ -16,10 +16,10 @@ package top.continew.admin.system.model.resp.file; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.system.enums.FileTypeEnum; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java index 7c47af33..9fe02a9b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java @@ -16,12 +16,12 @@ package top.continew.admin.system.model.resp.log; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.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.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java index 308b1a2c..c83a60ce 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java @@ -16,12 +16,12 @@ package top.continew.admin.system.model.resp.log; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.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.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.io.Serializable; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeDetailResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeDetailResp.java index 3dfffd9a..f3c9eff7 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeDetailResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeDetailResp.java @@ -16,16 +16,16 @@ package top.continew.admin.system.model.resp.notice; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.common.config.excel.DictExcelProperty; import top.continew.admin.common.config.excel.ExcelDictConverter; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.system.enums.NoticeScopeEnum; import top.continew.admin.system.enums.NoticeStatusEnum; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeResp.java index eadf6a6f..17f091b4 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/notice/NoticeResp.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp.notice; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseResp; +import top.continew.admin.common.base.model.resp.BaseResp; import top.continew.admin.system.enums.NoticeScopeEnum; import top.continew.admin.system.enums.NoticeStatusEnum; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleDetailResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleDetailResp.java index 93c1ce5a..7c4a4c20 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleDetailResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleDetailResp.java @@ -19,14 +19,14 @@ package top.continew.admin.system.model.resp.role; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DataScopeEnum; import top.continew.admin.system.service.RoleDeptService; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleResp.java index efb7fe0c..eeb3bcfa 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/role/RoleResp.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DataScopeEnum; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java index aa61f3a3..3162e3f4 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java @@ -23,19 +23,19 @@ import cn.crane4j.annotation.Mapping; import cn.crane4j.annotation.condition.ConditionOnExpression; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; import cn.crane4j.core.executor.handler.OneToManyAssembleOperationHandler; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.common.constant.ContainerConstants; import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.common.enums.GenderEnum; import top.continew.admin.system.model.resp.DeptResp; import top.continew.admin.system.service.DeptService; -import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.continew.starter.file.excel.converter.ExcelListConverter; +import top.continew.starter.excel.converter.ExcelBaseEnumConverter; +import top.continew.starter.excel.converter.ExcelListConverter; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java index 7fbc9aea..5b04a83d 100644 --- a/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java +++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java @@ -22,7 +22,7 @@ import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; import cn.crane4j.core.executor.handler.OneToManyAssembleOperationHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.model.resp.BaseDetailResp; +import top.continew.admin.common.base.model.resp.BaseDetailResp; import top.continew.admin.common.constant.ContainerConstants; import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.enums.DisEnableStatusEnum; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/ClientService.java b/continew-system/src/main/java/top/continew/admin/system/service/ClientService.java index 9b46fcf7..bb388022 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/ClientService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/ClientService.java @@ -16,10 +16,10 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.query.ClientQuery; import top.continew.admin.system.model.req.ClientReq; import top.continew.admin.system.model.resp.ClientResp; -import top.continew.starter.extension.crud.service.BaseService; /** * 客户端业务接口 diff --git a/continew-system/src/main/java/top/continew/admin/system/service/DeptService.java b/continew-system/src/main/java/top/continew/admin/system/service/DeptService.java index af43bea9..12ef2d14 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/DeptService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/DeptService.java @@ -16,12 +16,12 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.entity.DeptDO; import top.continew.admin.system.model.query.DeptQuery; import top.continew.admin.system.model.req.DeptReq; import top.continew.admin.system.model.resp.DeptResp; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/DictItemService.java b/continew-system/src/main/java/top/continew/admin/system/service/DictItemService.java index 21f2ae65..0aae0def 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/DictItemService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/DictItemService.java @@ -16,13 +16,13 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.common.service.CommonDictItemService; import top.continew.admin.system.model.entity.DictItemDO; import top.continew.admin.system.model.query.DictItemQuery; import top.continew.admin.system.model.req.DictItemReq; import top.continew.admin.system.model.resp.DictItemResp; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/DictService.java b/continew-system/src/main/java/top/continew/admin/system/service/DictService.java index 09c4ac7c..90c6cb90 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/DictService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/DictService.java @@ -16,13 +16,13 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.entity.DictDO; import top.continew.admin.system.model.query.DictQuery; import top.continew.admin.system.model.req.DictReq; import top.continew.admin.system.model.resp.DictResp; -import top.continew.starter.data.mp.service.IService; +import top.continew.starter.data.service.IService; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.continew.starter.extension.crud.service.BaseService; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/FileService.java b/continew-system/src/main/java/top/continew/admin/system/service/FileService.java index 4e38d9d0..cfbdbf89 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/FileService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/FileService.java @@ -18,14 +18,14 @@ package top.continew.admin.system.service; import org.dromara.x.file.storage.core.FileInfo; import org.springframework.web.multipart.MultipartFile; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.entity.FileDO; import top.continew.admin.system.model.query.FileQuery; import top.continew.admin.system.model.req.FileReq; import top.continew.admin.system.model.resp.file.FileResp; import top.continew.admin.system.model.resp.file.FileStatisticsResp; import top.continew.starter.core.constant.StringConstants; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; import java.io.File; import java.io.IOException; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/MenuService.java b/continew-system/src/main/java/top/continew/admin/system/service/MenuService.java index 1ad27237..73c46ebb 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/MenuService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/MenuService.java @@ -16,12 +16,12 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.entity.MenuDO; import top.continew.admin.system.model.query.MenuQuery; import top.continew.admin.system.model.req.MenuReq; import top.continew.admin.system.model.resp.MenuResp; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; import java.util.List; import java.util.Set; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/NoticeService.java b/continew-system/src/main/java/top/continew/admin/system/service/NoticeService.java index 658266c1..7950d8e4 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/NoticeService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/NoticeService.java @@ -16,6 +16,7 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.enums.NoticeMethodEnum; import top.continew.admin.system.model.entity.NoticeDO; import top.continew.admin.system.model.query.NoticeQuery; @@ -23,8 +24,7 @@ import top.continew.admin.system.model.req.NoticeReq; import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp; import top.continew.admin.system.model.resp.notice.NoticeDetailResp; import top.continew.admin.system.model.resp.notice.NoticeResp; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/RoleService.java b/continew-system/src/main/java/top/continew/admin/system/service/RoleService.java index 3ab04120..5b9c2212 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/RoleService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/RoleService.java @@ -16,6 +16,7 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.common.context.RoleContext; import top.continew.admin.system.model.entity.RoleDO; import top.continew.admin.system.model.query.RoleQuery; @@ -23,8 +24,7 @@ import top.continew.admin.system.model.req.RoleReq; import top.continew.admin.system.model.req.RoleUpdatePermissionReq; import top.continew.admin.system.model.resp.role.RoleDetailResp; import top.continew.admin.system.model.resp.role.RoleResp; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; import java.util.List; import java.util.Set; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/SmsConfigService.java b/continew-system/src/main/java/top/continew/admin/system/service/SmsConfigService.java index f88898a4..e5f1403b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/SmsConfigService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/SmsConfigService.java @@ -16,11 +16,11 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.entity.SmsConfigDO; import top.continew.admin.system.model.query.SmsConfigQuery; import top.continew.admin.system.model.req.SmsConfigReq; import top.continew.admin.system.model.resp.SmsConfigResp; -import top.continew.starter.extension.crud.service.BaseService; /** * 短信配置业务接口 diff --git a/continew-system/src/main/java/top/continew/admin/system/service/SmsLogService.java b/continew-system/src/main/java/top/continew/admin/system/service/SmsLogService.java index 2ad590fa..ee02f42f 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/SmsLogService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/SmsLogService.java @@ -16,10 +16,10 @@ package top.continew.admin.system.service; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.query.SmsLogQuery; import top.continew.admin.system.model.req.SmsLogReq; import top.continew.admin.system.model.resp.SmsLogResp; -import top.continew.starter.extension.crud.service.BaseService; /** * 短信日志业务接口 diff --git a/continew-system/src/main/java/top/continew/admin/system/service/StorageService.java b/continew-system/src/main/java/top/continew/admin/system/service/StorageService.java index 940f9932..c1a82a08 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/StorageService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/StorageService.java @@ -16,13 +16,13 @@ package top.continew.admin.system.service; -import top.continew.admin.common.model.req.CommonStatusUpdateReq; +import top.continew.admin.common.base.model.req.CommonStatusUpdateReq; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.entity.StorageDO; import top.continew.admin.system.model.query.StorageQuery; import top.continew.admin.system.model.req.StorageReq; import top.continew.admin.system.model.resp.StorageResp; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; /** * 存储业务接口 diff --git a/continew-system/src/main/java/top/continew/admin/system/service/UserService.java b/continew-system/src/main/java/top/continew/admin/system/service/UserService.java index 3ce108f4..252d5548 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/UserService.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/UserService.java @@ -18,6 +18,7 @@ package top.continew.admin.system.service; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; +import top.continew.admin.common.base.service.BaseService; import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.query.UserQuery; import top.continew.admin.system.model.req.user.*; @@ -25,8 +26,7 @@ import top.continew.admin.system.model.resp.user.UserDetailResp; import top.continew.admin.system.model.resp.user.UserImportParseResp; import top.continew.admin.system.model.resp.user.UserImportResp; import top.continew.admin.system.model.resp.user.UserResp; -import top.continew.starter.data.mp.service.IService; -import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.service.IService; import java.io.IOException; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java index 4687ef9b..89272131 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java @@ -24,6 +24,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import top.continew.admin.auth.model.query.OnlineUserQuery; import top.continew.admin.auth.service.OnlineUserService; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.system.mapper.ClientMapper; import top.continew.admin.system.model.entity.ClientDO; import top.continew.admin.system.model.query.ClientQuery; @@ -31,8 +32,7 @@ import top.continew.admin.system.model.req.ClientReq; import top.continew.admin.system.model.resp.ClientResp; import top.continew.admin.system.service.ClientService; import top.continew.starter.core.constant.StringConstants; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.starter.core.util.validation.CheckUtils; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java index 37bfcd7f..52a8b503 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.mapper.DeptMapper; import top.continew.admin.system.model.entity.DeptDO; @@ -31,10 +32,9 @@ import top.continew.admin.system.model.resp.DeptResp; import top.continew.admin.system.service.DeptService; import top.continew.admin.system.service.RoleDeptService; import top.continew.admin.system.service.UserService; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.data.core.enums.DatabaseType; -import top.continew.starter.data.core.util.MetaUtils; -import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.data.enums.DatabaseType; +import top.continew.starter.data.util.MetaUtils; import javax.sql.DataSource; import java.util.ArrayList; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java index 39a973fd..d725efb3 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java @@ -24,6 +24,7 @@ import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.system.mapper.DictItemMapper; import top.continew.admin.system.model.entity.DictItemDO; @@ -32,12 +33,11 @@ import top.continew.admin.system.model.req.DictItemReq; import top.continew.admin.system.model.resp.DictItemResp; import top.continew.admin.system.service.DictItemService; import top.continew.starter.cache.redisson.util.RedisUtils; -import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.autoconfigure.application.ApplicationProperties; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.enums.BaseEnum; -import top.continew.starter.core.validation.CheckUtils; +import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.continew.starter.extension.crud.service.BaseServiceImpl; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -53,7 +53,7 @@ import java.util.concurrent.ConcurrentHashMap; @RequiredArgsConstructor public class DictItemServiceImpl extends BaseServiceImpl implements DictItemService { - private final ProjectProperties projectProperties; + private final ApplicationProperties applicationProperties; private static final Map> ENUM_DICT_CACHE = new ConcurrentHashMap<>(); @Override @@ -128,7 +128,7 @@ public class DictItemServiceImpl extends BaseServiceImpl> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), BaseEnum.class); + Set> classSet = ClassUtil.scanPackageBySuper(applicationProperties.getBasePackage(), BaseEnum.class); for (Class cls : classSet) { List value = this.toEnumDict(cls); if (CollUtil.isEmpty(value)) { diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java index 81c8ef43..1db3b443 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java @@ -18,6 +18,7 @@ package top.continew.admin.system.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.system.mapper.DictMapper; import top.continew.admin.system.model.entity.DictDO; import top.continew.admin.system.model.query.DictQuery; @@ -25,9 +26,8 @@ import top.continew.admin.system.model.req.DictReq; import top.continew.admin.system.model.resp.DictResp; import top.continew.admin.system.service.DictItemService; import top.continew.admin.system.service.DictService; -import top.continew.starter.core.validation.CheckUtils; +import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.continew.starter.extension.crud.service.BaseServiceImpl; import java.util.List; import java.util.Optional; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java index 17803cb7..a586ee91 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java @@ -30,6 +30,7 @@ import org.dromara.x.file.storage.core.ProgressListener; import org.dromara.x.file.storage.core.upload.UploadPretreatment; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.FileTypeEnum; import top.continew.admin.system.mapper.FileMapper; @@ -43,9 +44,8 @@ import top.continew.admin.system.service.FileService; import top.continew.admin.system.service.StorageService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.StrUtils; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.core.validation.ValidationUtils; -import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.io.File; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java index e537e2fa..ecf837c8 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java @@ -36,12 +36,12 @@ import top.continew.admin.system.model.resp.log.LogResp; import top.continew.admin.system.model.resp.log.LoginLogExportResp; import top.continew.admin.system.model.resp.log.OperationLogExportResp; import top.continew.admin.system.service.LogService; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.data.mp.util.QueryWrapperHelper; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.data.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; -import top.continew.starter.file.excel.util.ExcelUtils; +import top.continew.starter.excel.util.ExcelUtils; import java.time.LocalDateTime; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java index 78aba75a..e5487f29 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java @@ -22,6 +22,7 @@ import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.common.constant.SysConstants; import top.continew.admin.common.enums.DisEnableStatusEnum; @@ -34,8 +35,7 @@ import top.continew.admin.system.model.resp.MenuResp; import top.continew.admin.system.service.MenuService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.starter.core.util.validation.CheckUtils; import java.util.List; import java.util.Set; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java index bf7a7bb6..307904c9 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.system.enums.*; import top.continew.admin.system.mapper.NoticeMapper; @@ -34,11 +35,10 @@ import top.continew.admin.system.model.resp.notice.NoticeResp; import top.continew.admin.system.service.MessageService; import top.continew.admin.system.service.NoticeLogService; import top.continew.admin.system.service.NoticeService; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.core.validation.ValidationUtils; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; -import top.continew.starter.extension.crud.service.BaseServiceImpl; import java.time.LocalDateTime; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java index ca24ddd2..1d437657 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java @@ -37,9 +37,9 @@ import top.continew.admin.system.model.resp.OptionResp; import top.continew.admin.system.service.OptionService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.core.validation.ValidationUtils; -import top.continew.starter.data.mp.util.QueryWrapperHelper; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; +import top.continew.starter.data.util.QueryWrapperHelper; import java.util.List; import java.util.Map; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java index e64b4e7d..c9e89456 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.common.constant.SysConstants; import top.continew.admin.common.context.RoleContext; @@ -38,8 +39,7 @@ import top.continew.admin.system.model.resp.MenuResp; import top.continew.admin.system.model.resp.role.RoleDetailResp; import top.continew.admin.system.model.resp.role.RoleResp; import top.continew.admin.system.service.*; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.starter.core.util.validation.CheckUtils; import java.util.Collections; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsConfigServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsConfigServiceImpl.java index fe5fd41c..b29e51e2 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsConfigServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsConfigServiceImpl.java @@ -21,6 +21,7 @@ import org.dromara.sms4j.core.factory.SmsFactory; import org.dromara.sms4j.provider.config.BaseConfig; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.config.sms.SmsConfigUtil; import top.continew.admin.system.mapper.SmsConfigMapper; @@ -29,8 +30,7 @@ import top.continew.admin.system.model.query.SmsConfigQuery; import top.continew.admin.system.model.req.SmsConfigReq; import top.continew.admin.system.model.resp.SmsConfigResp; import top.continew.admin.system.service.SmsConfigService; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.starter.core.util.validation.CheckUtils; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsLogServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsLogServiceImpl.java index 2dcaa901..49bbc30b 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsLogServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/SmsLogServiceImpl.java @@ -17,13 +17,13 @@ package top.continew.admin.system.service.impl; import org.springframework.stereotype.Service; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.system.mapper.SmsLogMapper; import top.continew.admin.system.model.entity.SmsLogDO; import top.continew.admin.system.model.query.SmsLogQuery; import top.continew.admin.system.model.req.SmsLogReq; import top.continew.admin.system.model.resp.SmsLogResp; import top.continew.admin.system.service.SmsLogService; -import top.continew.starter.extension.crud.service.BaseServiceImpl; /** * 短信日志业务实现 diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java index c627084e..ffdab557 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java @@ -28,8 +28,9 @@ import org.dromara.x.file.storage.core.FileStorageServiceBuilder; import org.dromara.x.file.storage.core.platform.FileStorage; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import top.continew.admin.common.base.model.req.CommonStatusUpdateReq; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.model.req.CommonStatusUpdateReq; import top.continew.admin.common.util.SecureUtils; import top.continew.admin.system.enums.StorageTypeEnum; import top.continew.admin.system.mapper.StorageMapper; @@ -41,10 +42,9 @@ import top.continew.admin.system.service.FileService; import top.continew.admin.system.service.StorageService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ExceptionUtils; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.core.validation.ValidationUtils; -import top.continew.starter.extension.crud.service.BaseServiceImpl; import top.continew.starter.core.util.SpringWebUtils; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.util.Collections; import java.util.List; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java index aec19b39..b23de2ca 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java @@ -31,8 +31,8 @@ import top.continew.admin.system.model.entity.UserRoleDO; import top.continew.admin.system.model.query.RoleUserQuery; import top.continew.admin.system.model.resp.role.RoleUserResp; import top.continew.admin.system.service.UserRoleService; -import top.continew.starter.core.validation.CheckUtils; -import top.continew.starter.data.mp.util.QueryWrapperHelper; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.data.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 5c962aec..9bd3dceb 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -30,7 +30,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.validation.ValidationUtil; import cn.hutool.http.ContentType; import cn.hutool.json.JSONUtil; -import com.alibaba.excel.EasyExcel; +import cn.idev.excel.EasyExcel; import com.alicp.jetcache.anno.CacheInvalidate; import com.alicp.jetcache.anno.CacheType; import com.alicp.jetcache.anno.CacheUpdate; @@ -55,6 +55,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import top.continew.admin.auth.service.OnlineUserService; +import top.continew.admin.common.base.service.BaseServiceImpl; import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.common.constant.SysConstants; import top.continew.admin.common.context.UserContext; @@ -67,8 +68,8 @@ import top.continew.admin.system.enums.OptionCategoryEnum; import top.continew.admin.system.mapper.user.UserMapper; import top.continew.admin.system.model.entity.DeptDO; import top.continew.admin.system.model.entity.RoleDO; -import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.entity.UserRoleDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.query.UserQuery; import top.continew.admin.system.model.req.user.*; import top.continew.admin.system.model.resp.user.UserDetailResp; @@ -79,13 +80,11 @@ import top.continew.admin.system.service.*; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; -import top.continew.starter.core.util.SpringUtils; -import top.continew.starter.core.validation.CheckUtils; +import top.continew.starter.core.util.FileUploadUtils; +import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; -import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.continew.starter.core.util.FileUploadUtils; import java.io.IOException; import java.time.Duration; @@ -543,7 +542,7 @@ public class UserServiceImpl extends BaseServiceImpl4.0.0 - top.continew + top.continew.starter continew-starter - 2.12.2 + 2.13.0 - top.continew + top.continew.admin continew-admin ${revision} pom @@ -43,42 +43,42 @@ - top.continew + top.continew.admin continew-server ${revision} - top.continew + top.continew.admin continew-system ${revision} - top.continew + top.continew.admin continew-common ${revision} - top.continew + top.continew.admin continew-plugin-schedule ${revision} - top.continew + top.continew.admin continew-plugin-open ${revision} - top.continew + top.continew.admin continew-plugin-generator ${revision}