build: continew-starter 2.12.2 => 2.13.0

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-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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>top.continew</groupId>
+        <groupId>top.continew.admin</groupId>
         <artifactId>continew-admin</artifactId>
         <version>${revision}</version>
     </parent>
@@ -18,7 +18,7 @@
     <dependencies>
         <!-- 公共模块 -->
         <dependency>
-            <groupId>top.continew</groupId>
+            <groupId>top.continew.admin</groupId>
             <artifactId>continew-common</artifactId>
         </dependency>
 

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;

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);
     }
 

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;
 

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;
 
 /**
  * 邮箱登录处理器

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;
 
 /**
  * 手机号登录处理器

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<SocialLoginReq> {
     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<SocialLoginReq> {
     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()));
     }

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;
 

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;
 

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;

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;

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;

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;

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<FileService, FileResp, FileRe
     @Operation(summary = "创建文件夹", description = "创建文件夹")
     @SaCheckPermission("system:file:createDir")
     @PostMapping("/dir")
-    public IdResp<Long> createDir(@Valid @RequestBody FileReq req) {
+    public IdResp<Long> createDir(@RequestBody @Valid FileReq req) {
         ValidationUtils.throwIfBlank(req.getParentPath(), "上级目录不能为空");
         return new IdResp<>(baseService.createDir(req));
     }

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<LogResp> page(LogQuery query, @Validated PageQuery pageQuery) {
+    public PageResp<LogResp> 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);
     }
 }

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;

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;

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<OptionResp> list(@Validated OptionQuery query) {
+    public List<OptionResp> 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<OptionReq> options) {
+    public void update(@RequestBody @Valid List<OptionReq> 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);
     }
 }

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<RoleService, RoleResp, RoleDe
     @Operation(summary = "修改权限", description = "修改角色的功能权限")
     @SaCheckPermission("system:role:updatePermission")
     @PutMapping("/{id}/permission")
-    public void updatePermission(@PathVariable("id") Long id, @Validated @RequestBody RoleUpdatePermissionReq req) {
+    public void updatePermission(@PathVariable("id") Long id, @RequestBody @Valid RoleUpdatePermissionReq req) {
         baseService.updatePermission(id, req);
     }
 
@@ -69,8 +70,8 @@ public class RoleController extends BaseController<RoleService, RoleResp, RoleDe
     @SaCheckPermission("system:role:list")
     @GetMapping("/{id}/user")
     public PageResp<RoleUserResp> 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<RoleService, RoleResp, RoleDe
     @SaCheckPermission("system:role:assign")
     @PostMapping("/{id}/user")
     public void assignToUsers(@PathVariable("id") Long id,
-                              @Validated @NotEmpty(message = "用户ID列表不能为空") @RequestBody List<Long> userIds) {
+                              @RequestBody @NotEmpty(message = "用户ID列表不能为空") List<Long> userIds) {
         baseService.assignToUsers(id, userIds);
     }
 
     @Operation(summary = "取消分配用户", description = "批量取消分配角色给用户")
     @SaCheckPermission("system:role:unassign")
     @DeleteMapping("/user")
-    public void unassignFromUsers(@Validated @NotEmpty(message = "用户列表不能为空") @RequestBody List<Long> userRoleIds) {
+    public void unassignFromUsers(@RequestBody @NotEmpty(message = "用户列表不能为空") List<Long> userRoleIds) {
         userRoleService.deleteByIds(userRoleIds);
     }
 

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<SmsConfigService, SmsConfigResp, SmsConfigResp, SmsConfigQuery, SmsConfigReq> {

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<SmsLogService, SmsLogResp, SmsLogResp, SmsLogQuery, SmsLogReq> {

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<StorageService, StorageResp, StorageResp, StorageQuery, StorageReq> {
@@ -51,7 +50,7 @@ public class StorageController extends BaseController<StorageService, StorageRes
     @Parameter(name = "id", description = "ID", example = "1", in = ParameterIn.PATH)
     @SaCheckPermission("system:storage:updateStatus")
     @PutMapping({"/{id}/status"})
-    public void updateStatus(@Validated @RequestBody CommonStatusUpdateReq req, @PathVariable("id") Long id) {
+    public void updateStatus(@RequestBody @Valid CommonStatusUpdateReq req, @PathVariable("id") Long id) {
         baseService.updateStatus(req, id);
     }
 

continew-system/src/main/java/top/continew/admin/system/controller/UserController.java

@@ -23,14 +23,15 @@ 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 jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import top.continew.admin.common.base.controller.BaseController;
 import top.continew.admin.common.constant.RegexConstants;
-import top.continew.admin.common.controller.BaseController;
 import top.continew.admin.common.util.SecureUtils;
 import top.continew.admin.system.model.query.UserQuery;
 import top.continew.admin.system.model.req.user.UserImportReq;
@@ -43,11 +44,10 @@ import top.continew.admin.system.model.resp.user.UserImportResp;
 import top.continew.admin.system.model.resp.user.UserResp;
 import top.continew.admin.system.service.UserService;
 import top.continew.starter.core.util.ExceptionUtils;
-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;
-import top.continew.starter.extension.crud.validation.CrudValidationGroup;
 
 import java.io.IOException;
 
@@ -67,7 +67,7 @@ public class UserController extends BaseController<UserService, UserResp, UserDe
 
     @Override
     @Operation(summary = "新增数据", description = "新增数据")
-    public IdResp<Long> create(@Validated(CrudValidationGroup.Create.class) @RequestBody UserReq req) {
+    public IdResp<Long> 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<UserService, UserResp, UserDe
     @Operation(summary = "解析导入数据", description = "解析导入数据")
     @SaCheckPermission("system:user:import")
     @PostMapping("/import/parse")
-    public UserImportParseResp parseImport(@NotNull(message = "文件不能为空") @RequestPart MultipartFile file) {
+    public UserImportParseResp parseImport(@RequestPart @NotNull(message = "文件不能为空") MultipartFile file) {
         ValidationUtils.throwIf(file::isEmpty, "文件不能为空");
         return baseService.parseImport(file);
     }
@@ -94,7 +94,7 @@ public class UserController extends BaseController<UserService, UserResp, UserDe
     @Operation(summary = "导入数据", description = "导入数据")
     @SaCheckPermission("system:user:import")
     @PostMapping(value = "/import")
-    public UserImportResp importUser(@Validated @RequestBody UserImportReq req) {
+    public UserImportResp importUser(@RequestBody @Valid UserImportReq req) {
         return baseService.importUser(req);
     }
 
@@ -102,7 +102,7 @@ public class UserController extends BaseController<UserService, UserResp, UserDe
     @Parameter(name = "id", description = "ID", example = "1", in = ParameterIn.PATH)
     @SaCheckPermission("system:user:resetPwd")
     @PatchMapping("/{id}/password")
-    public void resetPassword(@Validated @RequestBody UserPasswordResetReq req, @PathVariable Long id) {
+    public void resetPassword(@RequestBody @Valid UserPasswordResetReq req, @PathVariable Long id) {
         String rawNewPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(req.getNewPassword()));
         ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败");
         ValidationUtils.throwIf(!ReUtil
@@ -115,7 +115,7 @@ public class UserController extends BaseController<UserService, UserResp, UserDe
     @Parameter(name = "id", description = "ID", example = "1", in = ParameterIn.PATH)
     @SaCheckPermission("system:user:updateRole")
     @PatchMapping("/{id}/role")
-    public void updateRole(@Validated @RequestBody UserRoleUpdateReq updateReq, @PathVariable Long id) {
+    public void updateRole(@RequestBody @Valid UserRoleUpdateReq updateReq, @PathVariable Long id) {
         baseService.updateRole(updateReq, id);
     }
 }

continew-system/src/main/java/top/continew/admin/system/controller/UserMessageController.java

@@ -20,8 +20,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.common.context.UserContextHolder;
 import top.continew.admin.system.enums.NoticeMethodEnum;
@@ -36,7 +36,7 @@ import top.continew.admin.system.model.resp.notice.NoticeResp;
 import top.continew.admin.system.model.resp.notice.NoticeUnreadCountResp;
 import top.continew.admin.system.service.MessageService;
 import top.continew.admin.system.service.NoticeService;
-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.req.IdsReq;
 import top.continew.starter.extension.crud.model.resp.BasePageResp;
@@ -53,7 +53,6 @@ import java.util.List;
  * @since 2025/4/5 21:30
  */
 @Tag(name = "个人消息 API")
-@Validated
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/user/message")
@@ -72,7 +71,7 @@ public class UserMessageController {
 
     @Operation(summary = "分页查询消息列表", description = "分页查询消息列表")
     @GetMapping
-    public PageResp<MessageResp> page(MessageQuery query, @Validated PageQuery pageQuery) {
+    public PageResp<MessageResp> 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<NoticeResp> pageNotice(@Validated NoticeQuery query, @Validated PageQuery pageQuery) {
+    public BasePageResp<NoticeResp> pageNotice(@Valid NoticeQuery query, @Valid PageQuery pageQuery) {
         query.setUserId(UserContextHolder.getUserId());
         return noticeService.page(query, pageQuery);
     }

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);

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;
 

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;
 
 /**
  * 存储类型枚举

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

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

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;

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

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;
 

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;

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;

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

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;
 

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

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;
 

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;
 

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;
 

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

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;
 

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;
 
 /**

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;
 
 /**

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

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

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;

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

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

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;
 
 /**
  * 客户端业务接口

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;
 

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;
 

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;
 

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;

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;

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;