From f5ab22eedf594cee43592a2f29409ee9c33a88d3 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 17 Apr 2024 23:06:39 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=80=82=E9=85=8D=20continew-starter?= =?UTF-8?q?=202.0.0=EF=BC=8Ctop.charles7c.continew=20=3D>=20top.continew?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit groupId 及基础包名调整，更短的包名，聚合品牌形象 --- README.md | 18 +++++---- continew-admin-common/pom.xml | 40 ++++++++++++------- .../config/jackson/BaseEnumDeserializer.java | 14 +++---- .../config/jackson/BaseEnumSerializer.java | 2 +- .../config/jackson/JacksonConfiguration.java | 2 +- .../config/mybatis/BCryptEncryptor.java | 2 +- .../mybatis/DataPermissionFilterImpl.java | 6 +-- .../config/mybatis/DataPermissionMapper.java | 4 +- .../mybatis/MyBatisPlusMetaObjectHandler.java | 4 +- .../mybatis/MybatisPlusConfiguration.java | 2 +- .../admin/common/constant/CacheConstants.java | 2 +- .../common/constant/ContainerConstants.java | 2 +- .../admin/common/enums/DataScopeEnum.java | 2 +- .../common/enums/DisEnableStatusEnum.java | 2 +- .../admin/common/enums/GenderEnum.java | 2 +- .../admin/common/enums/MenuTypeEnum.java | 2 +- .../admin/common/enums/MessageTypeEnum.java | 2 +- .../enums/SuccessFailureStatusEnum.java | 2 +- .../admin/common/util/SecureUtils.java | 2 +- .../admin/common/util/helper/LoginHelper.java | 8 ++-- .../properties/GeneratorProperties.java | 2 +- .../admin/generator/enums/FormTypeEnum.java | 2 +- .../admin/generator/enums/QueryTypeEnum.java | 2 +- .../generator/mapper/FieldConfigMapper.java | 2 +- .../generator/mapper/GenConfigMapper.java | 2 +- .../generator/model/entity/FieldConfigDO.java | 2 +- .../generator/service/GeneratorService.java | 4 +- .../service/impl/GeneratorServiceImpl.java | 22 +++++----- .../main/resources/templates/Controller.ftl | 6 +-- .../main/resources/templates/DetailResp.ftl | 2 +- .../src/main/resources/templates/Entity.ftl | 2 +- .../src/main/resources/templates/Mapper.ftl | 2 +- .../src/main/resources/templates/Query.ftl | 4 +- .../src/main/resources/templates/Req.ftl | 2 +- .../src/main/resources/templates/Resp.ftl | 2 +- .../src/main/resources/templates/Service.ftl | 2 +- .../main/resources/templates/ServiceImpl.ftl | 2 +- continew-admin-system/pom.xml | 2 +- .../admin/auth/model/resp/UserInfoResp.java | 4 +- .../admin/auth/service/OnlineUserService.java | 4 +- .../auth/service/impl/LoginServiceImpl.java | 8 ++-- .../service/impl/OnlineUserServiceImpl.java | 6 +-- .../system/config/file/FileRecorderImpl.java | 2 +- .../system/config/log/LogConfiguration.java | 6 +-- .../system/config/log/LogDaoLocalImpl.java | 16 ++++---- .../system/enums/AnnouncementStatusEnum.java | 2 +- .../admin/system/enums/FileTypeEnum.java | 2 +- .../admin/system/enums/LogStatusEnum.java | 2 +- .../admin/system/enums/StorageTypeEnum.java | 2 +- .../system/mapper/AnnouncementMapper.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/MessageMapper.java | 2 +- .../system/mapper/MessageUserMapper.java | 2 +- .../admin/system/mapper/OptionMapper.java | 2 +- .../admin/system/mapper/RoleDeptMapper.java | 2 +- .../admin/system/mapper/RoleMapper.java | 2 +- .../admin/system/mapper/RoleMenuMapper.java | 2 +- .../admin/system/mapper/StorageMapper.java | 2 +- .../admin/system/mapper/UserMapper.java | 2 +- .../admin/system/mapper/UserRoleMapper.java | 2 +- .../admin/system/mapper/UserSocialMapper.java | 2 +- .../system/model/entity/AnnouncementDO.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 | 6 +-- .../admin/system/model/entity/MenuDO.java | 2 +- .../admin/system/model/entity/RoleDO.java | 2 +- .../admin/system/model/entity/StorageDO.java | 2 +- .../admin/system/model/entity/UserDO.java | 4 +- .../system/model/query/AnnouncementQuery.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 +- .../system/model/query/MessageQuery.java | 6 +-- .../admin/system/model/query/OptionQuery.java | 4 +- .../admin/system/model/query/RoleQuery.java | 4 +- .../system/model/query/StorageQuery.java | 4 +- .../admin/system/model/query/UserQuery.java | 4 +- .../system/model/req/AnnouncementReq.java | 2 +- .../admin/system/model/req/DeptReq.java | 4 +- .../admin/system/model/req/DictItemReq.java | 2 +- .../admin/system/model/req/DictReq.java | 2 +- .../admin/system/model/req/FileReq.java | 2 +- .../admin/system/model/req/MenuReq.java | 2 +- .../admin/system/model/req/MessageReq.java | 2 +- .../admin/system/model/req/OptionReq.java | 2 +- .../admin/system/model/req/RoleReq.java | 2 +- .../admin/system/model/req/StorageReq.java | 2 +- .../admin/system/model/req/UserReq.java | 4 +- .../model/resp/AnnouncementDetailResp.java | 2 +- .../system/model/resp/AnnouncementResp.java | 2 +- .../admin/system/model/resp/DeptResp.java | 6 +-- .../admin/system/model/resp/DictItemResp.java | 4 +- .../admin/system/model/resp/DictResp.java | 2 +- .../admin/system/model/resp/FileResp.java | 2 +- .../admin/system/model/resp/MenuResp.java | 6 +-- .../system/model/resp/RoleDetailResp.java | 4 +- .../admin/system/model/resp/RoleResp.java | 2 +- .../admin/system/model/resp/StorageResp.java | 2 +- .../system/model/resp/UserDetailResp.java | 4 +- .../admin/system/model/resp/UserResp.java | 6 +-- .../model/resp/log/LoginLogExportResp.java | 2 +- .../resp/log/OperationLogExportResp.java | 2 +- .../system/service/AnnouncementService.java | 4 +- .../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/LogService.java | 6 +-- .../admin/system/service/MenuService.java | 4 +- .../admin/system/service/MessageService.java | 4 +- .../admin/system/service/RoleService.java | 4 +- .../admin/system/service/StorageService.java | 4 +- .../admin/system/service/UserService.java | 4 +- .../service/impl/AnnouncementServiceImpl.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 8 ++-- .../service/impl/DictItemServiceImpl.java | 4 +- .../system/service/impl/DictServiceImpl.java | 4 +- .../system/service/impl/FileServiceImpl.java | 8 ++-- .../system/service/impl/LogServiceImpl.java | 12 +++--- .../system/service/impl/MenuServiceImpl.java | 4 +- .../service/impl/MessageServiceImpl.java | 8 ++-- .../service/impl/MessageUserServiceImpl.java | 2 +- .../service/impl/OptionServiceImpl.java | 6 +-- .../system/service/impl/RoleServiceImpl.java | 4 +- .../service/impl/StorageServiceImpl.java | 12 +++--- .../system/service/impl/UserServiceImpl.java | 8 ++-- .../service/impl/UserSocialServiceImpl.java | 2 +- .../admin/ContiNewAdminApplication.java | 10 ++--- .../admin/webapi/auth/AuthController.java | 10 ++--- .../webapi/auth/SocialAuthController.java | 8 ++-- .../webapi/common/CaptchaController.java | 18 ++++----- .../admin/webapi/common/CommonController.java | 12 +++--- .../webapi/common/DashboardController.java | 6 +-- .../webapi/monitor/OnlineUserController.java | 8 ++-- .../webapi/system/AnnouncementController.java | 10 ++--- .../admin/webapi/system/DeptController.java | 6 +-- .../admin/webapi/system/DictController.java | 6 +-- .../webapi/system/DictItemController.java | 6 +-- .../admin/webapi/system/FileController.java | 6 +-- .../admin/webapi/system/LogController.java | 8 ++-- .../admin/webapi/system/MenuController.java | 14 +++---- .../webapi/system/MessageController.java | 8 ++-- .../admin/webapi/system/OptionController.java | 2 +- .../admin/webapi/system/RoleController.java | 6 +-- .../webapi/system/StorageController.java | 6 +-- .../webapi/system/UserCenterController.java | 8 ++-- .../admin/webapi/system/UserController.java | 12 +++--- .../webapi/tool/GeneratorController.java | 8 ++-- .../src/main/resources/banner.txt | 2 +- pom.xml | 14 +------ 159 files changed, 370 insertions(+), 368 deletions(-) diff --git a/README.md b/README.md index a26eb775..241b0046 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ContiNew Starter -Spring Boot +Spring Boot Open JDK @@ -62,6 +62,8 @@ ContiNew Admin（Continue New Admin）持续迭代优化的前后端分离中后 ## 项目源码 +**注意：** 体验 3.0.0 请注意使用 3.0.x 分支，对应前端为：[github.com/Charles7c/continew-admin-ui-gi](https://github.com/Charles7c/continew-admin-ui-gi) + | | 后端源码 | 前端源码 | |--------| ----------------------------------------- | -------------------------------------------- | | GitHub | [github.com/Charles7c/continew-admin](https://github.com/Charles7c/continew-admin) | [github.com/Charles7c/continew-admin-ui](https://github.com/Charles7c/continew-admin-ui) | @@ -231,8 +233,8 @@ git clone https://github.com/Charles7c/continew-admin.git | 名称 | 版本 | 简介 | | :----------------------------------------------------------- |:-------------| :----------------------------------------------------------- | -| [ContiNew Starter](https://github.com/Charles7c/continew-starter) | 1.5.1 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | -| Spring Boot | 3.1.9 | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） | +| [ContiNew Starter](https://github.com/Charles7c/continew-starter) | 2.0.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | +| Spring Boot | 3.1.10 | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） | | Undertow | 2.3.10.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 | | Sa-Token + JWT | 1.37.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 | | MyBatis Plus | 3.5.5 | MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率。 | @@ -243,17 +245,17 @@ git clone https://github.com/Charles7c/continew-admin.git | P6Spy | 3.9.1 | SQL 性能分析组件。 | | Liquibase | 4.20.0 | 用于管理数据库版本，跟踪、管理和应用数据库变化。 | | [JetCache](https://github.com/alibaba/jetcache/blob/master/docs/CN/Readme.md) | 2.7.5 | 一个基于 Java 的缓存系统封装，提供统一的 API 和注解来简化缓存的使用。提供了比 SpringCache 更加强大的注解，可以原生的支持 TTL、两级缓存、分布式自动刷新，还提供了 Cache 接口用于手工缓存操作。 | -| Redisson | 3.27.2 | 不仅仅是一个 Redis Java 客户端，Redisson 充分的利用了 Redis 键值数据库提供的一系列优势，为使用者提供了一系列具有分布式特性的常用工具：分布式锁、限流器等。 | +| Redisson | 3.28.0 | 不仅仅是一个 Redis Java 客户端，Redisson 充分的利用了 Redis 键值数据库提供的一系列优势，为使用者提供了一系列具有分布式特性的常用工具：分布式锁、限流器等。 | | Redis | 7.2.3 | 高性能的 key-value 数据库。 | | [X File Storage](https://x-file-storage.xuyanwu.cn/#/) | 2.1.0 | 一行代码将文件存储到本地、FTP、SFTP、WebDAV、阿里云 OSS、华为云 OBS...等其它兼容 S3 协议的存储平台。 | -| SMS4J | 3.1.1 | 短信聚合框架，轻松集成多家短信服务，解决接入多个短信 SDK 的繁琐流程。 | +| SMS4J | 3.2.1 | 短信聚合框架，轻松集成多家短信服务，解决接入多个短信 SDK 的繁琐流程。 | | Just Auth | 1.16.6 | 开箱即用的整合第三方登录的开源组件，脱离繁琐的第三方登录 SDK，让登录变得 So easy！ | -| Easy Excel | 3.3.3 | 一个基于 Java 的、快速、简洁、解决大文件内存溢出的 Excel 处理工具。 | +| Easy Excel | 3.3.4 | 一个基于 Java 的、快速、简洁、解决大文件内存溢出的 Excel 处理工具。 | | [AJ-Captcha](https://ajcaptcha.beliefteam.cn/captcha-doc/) | 1.3.0 | Java 行为验证码，包含滑动拼图、文字点选两种方式，UI支持弹出和嵌入两种方式。 | | Easy Captcha | 1.6.2 | Java 图形验证码，支持 gif、中文、算术等类型，可用于 Java Web、JavaSE 等项目。 | -| [Crane4j](https://createsequence.gitee.io/crane4j-doc/#/) | 2.6.1 | 一个基于注解的，用于完成一切 “根据 A 的 key 值拿到 B，再把 B 的属性映射到 A” 这类需求的字段填充框架。 | +| [Crane4j](https://createsequence.gitee.io/crane4j-doc/#/) | 2.7.0 | 一个基于注解的，用于完成一切 “根据 A 的 key 值拿到 B，再把 B 的属性映射到 A” 这类需求的字段填充框架。 | | Knife4j | 4.5.0 | 前身是 swagger-bootstrap-ui，集 Swagger2 和 OpenAPI3 为一体的增强解决方案。 | -| Hutool | 5.8.26 | 小而全的 Java 工具类库，通过静态方法封装，降低相关 API 的学习成本，提高工作效率，使 Java 拥有函数式语言般的优雅，让 Java 语言也可以“甜甜的”。 | +| Hutool | 5.8.27 | 小而全的 Java 工具类库，通过静态方法封装，降低相关 API 的学习成本，提高工作效率，使 Java 拥有函数式语言般的优雅，让 Java 语言也可以“甜甜的”。 | | Lombok | 1.18.30 | 在 Java 开发过程中用注解的方式，简化了 JavaBean 的编写，避免了冗余和样板式代码，让编写的类更加简洁。 | ## 项目结构 diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index 2ad23fd0..d0299efa 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -54,73 +54,85 @@ - top.charles7c.continew + top.continew continew-starter-extension-crud - top.charles7c.continew + top.continew continew-starter-auth-justauth - top.charles7c.continew + top.continew continew-starter-auth-satoken - top.charles7c.continew + top.continew continew-starter-data-mybatis-plus - top.charles7c.continew + top.continew continew-starter-cache-jetcache - top.charles7c.continew + top.continew continew-starter-messaging-mail - top.charles7c.continew + top.continew continew-starter-captcha-graphic - top.charles7c.continew + top.continew continew-starter-captcha-behavior - top.charles7c.continew + top.continew continew-starter-file-excel - + - top.charles7c.continew - continew-starter-security-all + top.continew + continew-starter-security-crypto + + + + + top.continew + continew-starter-security-mask + + + + + top.continew + continew-starter-security-password - top.charles7c.continew + top.continew continew-starter-api-doc - top.charles7c.continew + top.continew continew-starter-json-jackson diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java index 214cdb99..a8173e1b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java @@ -16,18 +16,16 @@ package top.charles7c.continew.admin.common.config.jackson; -import java.io.IOException; -import java.lang.reflect.Field; - -import com.fasterxml.jackson.core.*; +import cn.hutool.core.util.ClassUtil; +import cn.hutool.core.util.ReflectUtil; +import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; -import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReflectUtil; - -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import java.io.IOException; +import java.lang.reflect.Field; /** * 通用枚举接口 IBaseEnum 反序列化器 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java index d8181618..332920ec 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 通用枚举接口 IBaseEnum 序列化器 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java index 6c1494af..7f4ff536 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * Jackson 配置 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/BCryptEncryptor.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/BCryptEncryptor.java index 49b81d63..1b791078 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/BCryptEncryptor.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/BCryptEncryptor.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.common.config.mybatis; import org.springframework.security.crypto.password.PasswordEncoder; -import top.charles7c.continew.starter.security.crypto.encryptor.IEncryptor; +import top.continew.starter.security.crypto.encryptor.IEncryptor; /** * BCrypt 加/解密处理器（不可逆） diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java index 01e5206f..983d3802 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java @@ -19,9 +19,9 @@ package top.charles7c.continew.admin.common.config.mybatis; import cn.hutool.core.convert.Convert; import top.charles7c.continew.admin.common.model.dto.LoginUser; import top.charles7c.continew.admin.common.util.helper.LoginHelper; -import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser; -import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; -import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataScope; +import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser; +import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; +import top.continew.starter.data.mybatis.plus.datapermission.DataScope; import java.util.stream.Collectors; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java index cc1d554c..07a6fba6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java @@ -20,8 +20,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; -import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermission; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.datapermission.DataPermission; import java.util.List; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index c34e5ebc..5b764006 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -20,8 +20,8 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import top.charles7c.continew.admin.common.util.helper.LoginHelper; -import top.charles7c.continew.starter.core.exception.BusinessException; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.extension.crud.model.entity.BaseDO; import java.time.LocalDateTime; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java index 681ceed6..bde72649 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.springframework.security.crypto.password.PasswordEncoder; -import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; +import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; /** * MyBatis Plus 配置 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java index e41f2197..26e9f927 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java @@ -16,7 +16,7 @@ package top.charles7c.continew.admin.common.constant; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; /** * 缓存相关常量 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java index 629032f7..4b7458e0 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java @@ -16,7 +16,7 @@ package top.charles7c.continew.admin.common.constant; -import top.charles7c.continew.starter.extension.crud.constant.ContainerPool; +import top.continew.starter.extension.crud.constant.ContainerPool; /** * 数据源容器相关常量（Crane4j 数据填充组件使用） diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java index 96c6c326..734c3ab6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 数据权限枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java index 65b15cce..f628e0d2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UiConstants; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 启用/禁用状态枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java index 727c3eec..6a718c7a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 性别枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java index 8f7dba03..4b6bdbaa 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 菜单类型枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java index 252ac71e..7080cc4a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UiConstants; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 消息类型枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java index 11a5242d..55a6b8f3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UiConstants; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 成功/失败状态枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java index 7e60c41f..ef0b63eb 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java @@ -20,7 +20,7 @@ import cn.hutool.core.codec.Base64; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.asymmetric.KeyType; import top.charles7c.continew.admin.common.config.properties.RsaProperties; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.core.util.validate.ValidationUtils; /** * 加密/解密工具类 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java index 6af3154f..b210b0a0 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java @@ -26,10 +26,10 @@ import cn.hutool.extra.spring.SpringUtil; import jakarta.servlet.http.HttpServletRequest; import top.charles7c.continew.admin.common.constant.CacheConstants; import top.charles7c.continew.admin.common.model.dto.LoginUser; -import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.core.util.IpUtils; -import top.charles7c.continew.starter.extension.crud.service.CommonUserService; -import top.charles7c.continew.starter.web.util.ServletUtils; +import top.continew.starter.core.util.ExceptionUtils; +import top.continew.starter.core.util.IpUtils; +import top.continew.starter.extension.crud.service.CommonUserService; +import top.continew.starter.web.util.ServletUtils; import java.time.LocalDateTime; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java index 9a50d230..d8f94972 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java @@ -20,7 +20,7 @@ import cn.hutool.core.map.MapUtil; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import top.charles7c.continew.starter.data.core.enums.DatabaseType; +import top.continew.starter.data.core.enums.DatabaseType; import java.util.List; import java.util.Map; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java index 446211f8..0adadb90 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 表单类型枚举 diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java index 8d277d68..68845296 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 查询类型枚举 diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java index 159cab92..b6a482cb 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.generator.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java index ace24ffa..fbaa620f 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.generator.mapper; import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 生成配置 Mapper diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java index c81866ae..d6aa2629 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java @@ -30,7 +30,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import top.charles7c.continew.admin.generator.enums.FormTypeEnum; import top.charles7c.continew.admin.generator.enums.QueryTypeEnum; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java index 444204d2..87f3eeeb 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java @@ -24,8 +24,8 @@ import top.charles7c.continew.admin.generator.model.query.TableQuery; import top.charles7c.continew.admin.generator.model.req.GenConfigReq; import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp; import top.charles7c.continew.admin.generator.model.resp.TableResp; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; import java.sql.SQLException; import java.util.List; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java index cd9fad23..54b3e652 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -46,17 +46,17 @@ import top.charles7c.continew.admin.generator.model.req.GenConfigReq; import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp; import top.charles7c.continew.admin.generator.model.resp.TableResp; import top.charles7c.continew.admin.generator.service.GeneratorService; -import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.exception.BusinessException; -import top.charles7c.continew.starter.core.util.TemplateUtils; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.data.core.enums.DatabaseType; -import top.charles7c.continew.starter.data.core.util.MetaUtils; -import top.charles7c.continew.starter.data.core.util.Table; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.web.util.FileUploadUtils; +import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.core.util.TemplateUtils; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.data.core.enums.DatabaseType; +import top.continew.starter.data.core.util.MetaUtils; +import top.continew.starter.data.core.util.Table; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.web.util.FileUploadUtils; import javax.sql.DataSource; import java.io.File; diff --git a/continew-admin-generator/src/main/resources/templates/Controller.ftl b/continew-admin-generator/src/main/resources/templates/Controller.ftl index b46ed068..498799af 100644 --- a/continew-admin-generator/src/main/resources/templates/Controller.ftl +++ b/continew-admin-generator/src/main/resources/templates/Controller.ftl @@ -1,13 +1,13 @@ package ${packageName}.${subPackageName}; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.enums.Api; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; import ${packageName}.model.query.${classNamePrefix}Query; import ${packageName}.model.req.${classNamePrefix}Req; import ${packageName}.model.resp.${classNamePrefix}DetailResp; diff --git a/continew-admin-generator/src/main/resources/templates/DetailResp.ftl b/continew-admin-generator/src/main/resources/templates/DetailResp.ftl index e9ad9942..1bcf7cce 100644 --- a/continew-admin-generator/src/main/resources/templates/DetailResp.ftl +++ b/continew-admin-generator/src/main/resources/templates/DetailResp.ftl @@ -15,7 +15,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; /** * ${businessName}详情信息 diff --git a/continew-admin-generator/src/main/resources/templates/Entity.ftl b/continew-admin-generator/src/main/resources/templates/Entity.ftl index 6c571b20..dabca8a4 100644 --- a/continew-admin-generator/src/main/resources/templates/Entity.ftl +++ b/continew-admin-generator/src/main/resources/templates/Entity.ftl @@ -12,7 +12,7 @@ import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; /** * ${businessName}实体 diff --git a/continew-admin-generator/src/main/resources/templates/Mapper.ftl b/continew-admin-generator/src/main/resources/templates/Mapper.ftl index 6f0b5968..bafa9cde 100644 --- a/continew-admin-generator/src/main/resources/templates/Mapper.ftl +++ b/continew-admin-generator/src/main/resources/templates/Mapper.ftl @@ -1,6 +1,6 @@ package ${packageName}.${subPackageName}; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import ${packageName}.model.entity.${classNamePrefix}DO; /** diff --git a/continew-admin-generator/src/main/resources/templates/Query.ftl b/continew-admin-generator/src/main/resources/templates/Query.ftl index 6b3f8fa2..42a941d9 100644 --- a/continew-admin-generator/src/main/resources/templates/Query.ftl +++ b/continew-admin-generator/src/main/resources/templates/Query.ftl @@ -16,8 +16,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; /** * ${businessName}查询条件 diff --git a/continew-admin-generator/src/main/resources/templates/Req.ftl b/continew-admin-generator/src/main/resources/templates/Req.ftl index ad8261c0..e57d1c58 100644 --- a/continew-admin-generator/src/main/resources/templates/Req.ftl +++ b/continew-admin-generator/src/main/resources/templates/Req.ftl @@ -18,7 +18,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; /** * 创建或修改${businessName}信息 diff --git a/continew-admin-generator/src/main/resources/templates/Resp.ftl b/continew-admin-generator/src/main/resources/templates/Resp.ftl index cdd17e68..fad6c26c 100644 --- a/continew-admin-generator/src/main/resources/templates/Resp.ftl +++ b/continew-admin-generator/src/main/resources/templates/Resp.ftl @@ -12,7 +12,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseResp; +import top.continew.starter.extension.crud.model.resp.BaseResp; /** * ${businessName}信息 diff --git a/continew-admin-generator/src/main/resources/templates/Service.ftl b/continew-admin-generator/src/main/resources/templates/Service.ftl index 4cdca20b..a6bf0454 100644 --- a/continew-admin-generator/src/main/resources/templates/Service.ftl +++ b/continew-admin-generator/src/main/resources/templates/Service.ftl @@ -1,6 +1,6 @@ package ${packageName}.${subPackageName}; -import top.charles7c.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.extension.crud.service.BaseService; import ${packageName}.model.query.${classNamePrefix}Query; import ${packageName}.model.req.${classNamePrefix}Req; import ${packageName}.model.resp.${classNamePrefix}DetailResp; diff --git a/continew-admin-generator/src/main/resources/templates/ServiceImpl.ftl b/continew-admin-generator/src/main/resources/templates/ServiceImpl.ftl index bd5e0a40..50e0de91 100644 --- a/continew-admin-generator/src/main/resources/templates/ServiceImpl.ftl +++ b/continew-admin-generator/src/main/resources/templates/ServiceImpl.ftl @@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import ${packageName}.mapper.${classNamePrefix}Mapper; import ${packageName}.model.entity.${classNamePrefix}DO; import ${packageName}.model.query.${classNamePrefix}Query; diff --git a/continew-admin-system/pom.xml b/continew-admin-system/pom.xml index 3b6e0bec..321352a5 100644 --- a/continew-admin-system/pom.xml +++ b/continew-admin-system/pom.xml @@ -15,7 +15,7 @@ - top.charles7c.continew + top.continew continew-starter-log-httptrace-pro diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java index 357e9bf4..c0b70260 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java @@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.common.enums.GenderEnum; -import top.charles7c.continew.starter.security.mask.annotation.JsonMask; -import top.charles7c.continew.starter.security.mask.enums.MaskType; +import top.continew.starter.security.mask.annotation.JsonMask; +import top.continew.starter.security.mask.enums.MaskType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/OnlineUserService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/OnlineUserService.java index eb53b6f7..5c7d68c3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/OnlineUserService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/OnlineUserService.java @@ -21,8 +21,8 @@ import java.util.List; import top.charles7c.continew.admin.auth.model.query.OnlineUserQuery; import top.charles7c.continew.admin.auth.model.resp.OnlineUserResp; import top.charles7c.continew.admin.common.model.dto.LoginUser; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; /** * 在线用户业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java index 402f6760..89804f10 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -48,10 +48,10 @@ import top.charles7c.continew.admin.system.model.entity.UserSocialDO; import top.charles7c.continew.admin.system.model.req.MessageReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.service.*; -import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.annotation.TreeField; -import top.charles7c.continew.starter.extension.crud.util.TreeUtils; +import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.annotation.TreeField; +import top.continew.starter.extension.crud.util.TreeUtils; import java.time.LocalDateTime; import java.util.*; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/OnlineUserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/OnlineUserServiceImpl.java index 19b2dcf6..f27bacdb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/OnlineUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/OnlineUserServiceImpl.java @@ -36,9 +36,9 @@ import top.charles7c.continew.admin.auth.model.resp.OnlineUserResp; import top.charles7c.continew.admin.auth.service.OnlineUserService; import top.charles7c.continew.admin.common.model.dto.LoginUser; import top.charles7c.continew.admin.common.util.helper.LoginHelper; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; /** * 在线用户业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileRecorderImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileRecorderImpl.java index d9aff9fc..c5b95a88 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileRecorderImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileRecorderImpl.java @@ -31,7 +31,7 @@ import top.charles7c.continew.admin.system.mapper.FileMapper; import top.charles7c.continew.admin.system.mapper.StorageMapper; import top.charles7c.continew.admin.system.model.entity.FileDO; import top.charles7c.continew.admin.system.model.entity.StorageDO; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.Optional; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogConfiguration.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogConfiguration.java index b31b4e42..2fcdd782 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogConfiguration.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogConfiguration.java @@ -21,9 +21,9 @@ import org.springframework.context.annotation.Configuration; import top.charles7c.continew.admin.system.mapper.LogMapper; import top.charles7c.continew.admin.system.service.UserService; -import top.charles7c.continew.starter.log.core.dao.LogDao; -import top.charles7c.continew.starter.log.httptracepro.autoconfigure.ConditionalOnEnabledLog; -import top.charles7c.continew.starter.web.autoconfigure.trace.TraceProperties; +import top.continew.starter.log.core.dao.LogDao; +import top.continew.starter.log.httptracepro.autoconfigure.ConditionalOnEnabledLog; +import top.continew.starter.web.autoconfigure.trace.TraceProperties; /** * 日志配置 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java index 652f873e..e8a4e6cd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java @@ -33,14 +33,14 @@ import top.charles7c.continew.admin.system.enums.LogStatusEnum; import top.charles7c.continew.admin.system.mapper.LogMapper; import top.charles7c.continew.admin.system.model.entity.LogDO; import top.charles7c.continew.admin.system.service.UserService; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.log.core.dao.LogDao; -import top.charles7c.continew.starter.log.core.model.LogRecord; -import top.charles7c.continew.starter.log.core.model.LogRequest; -import top.charles7c.continew.starter.log.core.model.LogResponse; -import top.charles7c.continew.starter.web.autoconfigure.trace.TraceProperties; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.ExceptionUtils; +import top.continew.starter.log.core.dao.LogDao; +import top.continew.starter.log.core.model.LogRecord; +import top.continew.starter.log.core.model.LogRequest; +import top.continew.starter.log.core.model.LogResponse; +import top.continew.starter.web.autoconfigure.trace.TraceProperties; +import top.continew.starter.web.model.R; import java.net.URI; import java.time.LocalDateTime; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java index a48e0f08..04d51a57 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.charles7c.continew.admin.common.constant.UiConstants; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 公告状态枚举 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/FileTypeEnum.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/FileTypeEnum.java index 7e5b015a..fa695be6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/FileTypeEnum.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/FileTypeEnum.java @@ -25,7 +25,7 @@ import lombok.RequiredArgsConstructor; import cn.hutool.core.util.StrUtil; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 文件类型枚举 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/LogStatusEnum.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/LogStatusEnum.java index e65e8909..fd19cd1f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/LogStatusEnum.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/LogStatusEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 操作状态枚举 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/StorageTypeEnum.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/StorageTypeEnum.java index 9daf8206..9a945663 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/StorageTypeEnum.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/StorageTypeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * 存储类型枚举 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java index 375e84f1..a31ae151 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java @@ -20,7 +20,7 @@ import java.util.List; import top.charles7c.continew.admin.system.model.entity.AnnouncementDO; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 公告 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java index b4819ebd..0230a1e1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.system.mapper; import top.charles7c.continew.admin.system.model.entity.DeptDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 部门 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java index 75769882..71aefd60 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; import top.charles7c.continew.admin.common.model.resp.LabelValueResp; import top.charles7c.continew.admin.system.model.entity.DictItemDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.io.Serializable; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java index 2e53650f..d79d647a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.system.mapper; import top.charles7c.continew.admin.system.model.entity.DictDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 字典 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/FileMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/FileMapper.java index 93dc6a63..1805d168 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/FileMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/FileMapper.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.system.mapper; import top.charles7c.continew.admin.system.model.entity.FileDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 文件 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/LogMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/LogMapper.java index 67478ae9..cb9966af 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/LogMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/LogMapper.java @@ -23,7 +23,7 @@ import org.apache.ibatis.annotations.Param; import top.charles7c.continew.admin.system.model.entity.LogDO; import top.charles7c.continew.admin.system.model.resp.*; import top.charles7c.continew.admin.system.model.resp.log.LogResp; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; import java.util.Map; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java index a7b99ffe..df9a6bc7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java @@ -22,7 +22,7 @@ import java.util.Set; import org.apache.ibatis.annotations.Param; import top.charles7c.continew.admin.system.model.entity.MenuDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 菜单 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java index a0db2d39..3e19b7a6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java @@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import top.charles7c.continew.admin.system.model.entity.MessageDO; import top.charles7c.continew.admin.system.model.resp.MessageResp; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 消息 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java index c6e0fc7e..27ad23f7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; import top.charles7c.continew.admin.system.model.entity.MessageUserDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 消息和用户 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java index 82171102..149a5028 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.system.mapper; import top.charles7c.continew.admin.system.model.entity.OptionDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 参数 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java index 992f7642..6b0ecb4c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import top.charles7c.continew.admin.system.model.entity.RoleDeptDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java index d58c67f1..dab3d20f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.system.mapper; import top.charles7c.continew.admin.system.model.entity.RoleDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 角色 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java index ca95e55d..19462ee4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper; import java.util.List; import top.charles7c.continew.admin.system.model.entity.RoleMenuDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 角色和菜单 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/StorageMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/StorageMapper.java index f603e3eb..fdc26b93 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/StorageMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/StorageMapper.java @@ -17,7 +17,7 @@ package top.charles7c.continew.admin.system.mapper; import top.charles7c.continew.admin.system.model.entity.StorageDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 存储 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java index 68970b13..5493f412 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java @@ -21,7 +21,7 @@ import org.apache.ibatis.annotations.Select; import top.charles7c.continew.admin.common.config.mybatis.DataPermissionMapper; import top.charles7c.continew.admin.system.model.entity.UserDO; -import top.charles7c.continew.starter.security.crypto.annotation.FieldEncrypt; +import top.continew.starter.security.crypto.annotation.FieldEncrypt; /** * 用户 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java index 9705fb80..b2302c89 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java @@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import top.charles7c.continew.admin.system.model.entity.UserRoleDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 用户和角色 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java index 74a786be..de7d233c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; import top.charles7c.continew.admin.system.model.entity.UserSocialDO; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** * 用户社会化关联 Mapper diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/AnnouncementDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/AnnouncementDO.java index bc2c3807..34e84525 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/AnnouncementDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/AnnouncementDO.java @@ -23,7 +23,7 @@ import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; /** * 公告实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java index 1d89a7cb..6650ca4b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java @@ -23,7 +23,7 @@ import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; /** * 部门实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java index 38911136..0a6136a1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java @@ -22,7 +22,7 @@ import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; /** * 字典实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java index 4b4323d6..552933e4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java index 008b5d1f..ee710b05 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java @@ -27,9 +27,9 @@ import com.baomidou.mybatisplus.annotation.*; import cn.hutool.core.util.StrUtil; import top.charles7c.continew.admin.system.enums.FileTypeEnum; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.URLUtils; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.URLUtils; +import top.continew.starter.extension.crud.model.entity.BaseDO; /** * 文件实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java index a3bb4dc3..3f8c4229 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.MenuTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java index 31784d33..e7c13c24 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java @@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import top.charles7c.continew.admin.common.enums.DataScopeEnum; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; /** * 角色实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/StorageDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/StorageDO.java index b97488bd..eda10b54 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/StorageDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/StorageDO.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.system.enums.StorageTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserDO.java index a61e395c..07006351 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserDO.java @@ -21,8 +21,8 @@ import lombok.Data; import top.charles7c.continew.admin.common.config.mybatis.BCryptEncryptor; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.GenderEnum; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; -import top.charles7c.continew.starter.security.crypto.annotation.FieldEncrypt; +import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java index 3a32c287..d6db1ced 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java @@ -18,8 +18,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java index d1508add..af80d9b2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java @@ -18,8 +18,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java index b57d1f20..29c1cfc2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java @@ -18,8 +18,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java index fd86a4a0..00d37f46 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java @@ -18,8 +18,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java index 66da52c2..6ca19c3f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java @@ -18,8 +18,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java index e09aeabc..a00e6182 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java @@ -19,8 +19,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java index 030e0cea..e23c0256 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java @@ -18,9 +18,9 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.annotation.QueryIgnore; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.annotation.QueryIgnore; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java index 4d24b0df..ca6ea9be 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java @@ -19,8 +19,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java index b30ad5dd..3c43cf73 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java @@ -18,8 +18,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java index 555faf14..a54f84c7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java @@ -18,8 +18,8 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java index 3306bfca..fb208233 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java @@ -20,8 +20,8 @@ import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/AnnouncementReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/AnnouncementReq.java index 6ff1b30d..e93968c5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/AnnouncementReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/AnnouncementReq.java @@ -21,7 +21,7 @@ import jakarta.validation.constraints.Future; import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java index 08d1dba4..c946efaf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java @@ -25,8 +25,8 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.constant.RegexConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; -import top.charles7c.continew.starter.extension.crud.util.ValidateGroup; +import top.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.util.ValidateGroup; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java index e4f2088d..3f219f91 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java @@ -23,7 +23,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java index 8281bc88..3392a49b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java @@ -22,7 +22,7 @@ import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.constant.RegexConstants; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java index aa8d14ba..b99f2d6a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; /** * 修改文件信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java index 74eb1916..664dd46d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java @@ -24,7 +24,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.MenuTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MessageReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MessageReq.java index c8d50bd4..2339a099 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MessageReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MessageReq.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.enums.MessageTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; /** * 创建消息信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java index a81d1e70..dfaec067 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; /** * 修改参数信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java index 28bc7289..146a9802 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java @@ -33,7 +33,7 @@ import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.constant.RegexConstants; import top.charles7c.continew.admin.common.enums.DataScopeEnum; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; /** * 创建或修改角色信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java index b3b92522..83bec85f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java @@ -25,7 +25,7 @@ import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.constant.RegexConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.system.enums.StorageTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.req.BaseReq; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java index 754caef5..8909e52c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java @@ -27,8 +27,8 @@ import org.hibernate.validator.constraints.Length; import top.charles7c.continew.admin.common.constant.RegexConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.GenderEnum; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; -import top.charles7c.continew.starter.extension.crud.util.ValidateGroup; +import top.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.util.ValidateGroup; import java.io.Serial; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementDetailResp.java index 1cd9e023..018f77e6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementDetailResp.java @@ -20,7 +20,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementResp.java index c4fef30c..2c88344c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementResp.java @@ -24,7 +24,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import top.charles7c.continew.admin.system.enums.AnnouncementStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseResp; +import top.continew.starter.extension.crud.model.resp.BaseResp; /** * 公告信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java index aebd2b3e..e2b19570 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java @@ -26,9 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.system.service.DeptService; -import top.charles7c.continew.starter.extension.crud.annotation.TreeField; -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.annotation.TreeField; +import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java index 6217b74d..18de06de 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java @@ -20,8 +20,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java index 40c83b17..f1932bd8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java @@ -18,7 +18,7 @@ package top.charles7c.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/FileResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/FileResp.java index 527a7bc8..d4ba787a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/FileResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/FileResp.java @@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import top.charles7c.continew.admin.system.enums.FileTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; /** * 文件信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java index 1c83bf3c..47d8675b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java @@ -22,9 +22,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.MenuTypeEnum; -import top.charles7c.continew.starter.extension.crud.annotation.TreeField; -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseResp; +import top.continew.starter.extension.crud.annotation.TreeField; +import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.extension.crud.model.resp.BaseResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java index c685b73f..2515b88b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java @@ -25,8 +25,8 @@ import lombok.Data; import top.charles7c.continew.admin.common.constant.ContainerConstants; import top.charles7c.continew.admin.common.enums.DataScopeEnum; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java index 1f0d6e47..1e032a37 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.common.enums.DataScopeEnum; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java index b4ac43c0..7ce33efd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java @@ -21,7 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.system.enums.StorageTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java index 093d9e2d..a06d92bf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java @@ -29,8 +29,8 @@ import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.GenderEnum; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.admin.system.service.DeptService; -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserResp.java index cf865a14..feaf0fad 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserResp.java @@ -25,9 +25,9 @@ import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.GenderEnum; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.admin.system.service.DeptService; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; -import top.charles7c.continew.starter.security.mask.annotation.JsonMask; -import top.charles7c.continew.starter.security.mask.enums.MaskType; +import top.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.starter.security.mask.annotation.JsonMask; +import top.continew.starter.security.mask.enums.MaskType; import java.io.Serial; import java.util.Objects; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LoginLogExportResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LoginLogExportResp.java index 929cebf9..d33b57db 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LoginLogExportResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LoginLogExportResp.java @@ -21,7 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.system.enums.LogStatusEnum; -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/OperationLogExportResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/OperationLogExportResp.java index 488a1e73..ab8fb314 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/OperationLogExportResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/OperationLogExportResp.java @@ -21,7 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.system.enums.LogStatusEnum; -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java index 18afae29..b28c5212 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java @@ -22,8 +22,8 @@ import top.charles7c.continew.admin.system.model.req.AnnouncementReq; import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp; import top.charles7c.continew.admin.system.model.resp.AnnouncementResp; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; -import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java index 57e4fdc9..6a229b37 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java @@ -20,8 +20,8 @@ import top.charles7c.continew.admin.system.model.entity.DeptDO; import top.charles7c.continew.admin.system.model.query.DeptQuery; import top.charles7c.continew.admin.system.model.req.DeptReq; import top.charles7c.continew.admin.system.model.resp.DeptResp; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; -import top.charles7c.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; /** * 部门业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java index dd30256c..39249d27 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java @@ -21,8 +21,8 @@ import top.charles7c.continew.admin.system.model.entity.DictItemDO; import top.charles7c.continew.admin.system.model.query.DictItemQuery; import top.charles7c.continew.admin.system.model.req.DictItemReq; import top.charles7c.continew.admin.system.model.resp.DictItemResp; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; -import top.charles7c.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; import java.io.Serializable; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java index 83af3ddd..91c9e26e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java @@ -20,8 +20,8 @@ import top.charles7c.continew.admin.system.model.entity.DictDO; import top.charles7c.continew.admin.system.model.query.DictQuery; import top.charles7c.continew.admin.system.model.req.DictReq; import top.charles7c.continew.admin.system.model.resp.DictResp; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; -import top.charles7c.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; /** * 字典业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java index 55a33d6d..aee7abd9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java @@ -22,8 +22,8 @@ import top.charles7c.continew.admin.system.model.entity.FileDO; import top.charles7c.continew.admin.system.model.query.FileQuery; import top.charles7c.continew.admin.system.model.req.FileReq; import top.charles7c.continew.admin.system.model.resp.FileResp; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; -import top.charles7c.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/LogService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/LogService.java index 8f25b271..83b253aa 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/LogService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/LogService.java @@ -21,9 +21,9 @@ import top.charles7c.continew.admin.system.model.query.LogQuery; import top.charles7c.continew.admin.system.model.resp.*; import top.charles7c.continew.admin.system.model.resp.log.LogDetailResp; import top.charles7c.continew.admin.system.model.resp.log.LogResp; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; +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 java.util.List; import java.util.Map; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java index 8f54c2fc..4bfc4e96 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java @@ -20,8 +20,8 @@ import top.charles7c.continew.admin.system.model.entity.MenuDO; import top.charles7c.continew.admin.system.model.query.MenuQuery; import top.charles7c.continew.admin.system.model.req.MenuReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; -import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; import java.util.List; import java.util.Set; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageService.java index c164a24b..07a9e2f4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageService.java @@ -21,8 +21,8 @@ import java.util.List; import top.charles7c.continew.admin.system.model.query.MessageQuery; import top.charles7c.continew.admin.system.model.req.MessageReq; import top.charles7c.continew.admin.system.model.resp.MessageResp; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; /** * 消息业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java index 69ece577..81f4daa0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java @@ -23,8 +23,8 @@ import top.charles7c.continew.admin.system.model.query.RoleQuery; import top.charles7c.continew.admin.system.model.req.RoleReq; import top.charles7c.continew.admin.system.model.resp.RoleDetailResp; import top.charles7c.continew.admin.system.model.resp.RoleResp; -import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; import java.util.List; import java.util.Set; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java index 98e0c25c..57b24e1e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java @@ -20,8 +20,8 @@ import top.charles7c.continew.admin.system.model.entity.StorageDO; import top.charles7c.continew.admin.system.model.query.StorageQuery; import top.charles7c.continew.admin.system.model.req.StorageReq; import top.charles7c.continew.admin.system.model.resp.StorageResp; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; -import top.charles7c.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; /** * 存储业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java index 32441812..824eaefb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java @@ -25,8 +25,8 @@ import top.charles7c.continew.admin.system.model.req.UserReq; import top.charles7c.continew.admin.system.model.req.UserRoleUpdateReq; import top.charles7c.continew.admin.system.model.resp.UserDetailResp; import top.charles7c.continew.admin.system.model.resp.UserResp; -import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.data.mybatis.plus.service.IService; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/AnnouncementServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/AnnouncementServiceImpl.java index 6af10330..ed4def00 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/AnnouncementServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/AnnouncementServiceImpl.java @@ -30,7 +30,7 @@ import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp; import top.charles7c.continew.admin.system.model.resp.AnnouncementResp; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; import top.charles7c.continew.admin.system.service.AnnouncementService; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; /** * 公告业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java index 43c9113b..45851ed9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java @@ -31,10 +31,10 @@ import top.charles7c.continew.admin.system.model.resp.DeptResp; import top.charles7c.continew.admin.system.service.DeptService; import top.charles7c.continew.admin.system.service.RoleDeptService; import top.charles7c.continew.admin.system.service.UserService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.data.core.enums.DatabaseType; -import top.charles7c.continew.starter.data.core.util.MetaUtils; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.data.core.enums.DatabaseType; +import top.continew.starter.data.core.util.MetaUtils; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.util.ArrayList; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java index e6f4bfc8..f4343282 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java @@ -25,8 +25,8 @@ import top.charles7c.continew.admin.system.model.query.DictItemQuery; import top.charles7c.continew.admin.system.model.req.DictItemReq; import top.charles7c.continew.admin.system.model.resp.DictItemResp; import top.charles7c.continew.admin.system.service.DictItemService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.io.Serializable; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java index 331bfca3..44b0a906 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java @@ -25,8 +25,8 @@ import top.charles7c.continew.admin.system.model.req.DictReq; import top.charles7c.continew.admin.system.model.resp.DictResp; import top.charles7c.continew.admin.system.service.DictItemService; import top.charles7c.continew.admin.system.service.DictService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.util.List; import java.util.Optional; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java index 88880db9..ad7147f2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java @@ -36,10 +36,10 @@ import top.charles7c.continew.admin.system.model.req.FileReq; import top.charles7c.continew.admin.system.model.resp.FileResp; import top.charles7c.continew.admin.system.service.FileService; import top.charles7c.continew.admin.system.service.StorageService; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.URLUtils; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.URLUtils; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.util.List; import java.util.Map; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/LogServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/LogServiceImpl.java index e2df6206..c9b04615 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/LogServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/LogServiceImpl.java @@ -38,12 +38,12 @@ import top.charles7c.continew.admin.system.model.resp.log.LogResp; import top.charles7c.continew.admin.system.model.resp.log.LoginLogExportResp; import top.charles7c.continew.admin.system.model.resp.log.OperationLogExportResp; import top.charles7c.continew.admin.system.service.LogService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.file.excel.util.ExcelUtils; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +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 java.util.Date; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java index 7e4be46d..ff1e582e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java @@ -31,8 +31,8 @@ import top.charles7c.continew.admin.system.model.query.MenuQuery; import top.charles7c.continew.admin.system.model.req.MenuReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.service.MenuService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.util.List; import java.util.Set; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java index 2b0d6079..28f093da 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java @@ -31,10 +31,10 @@ import top.charles7c.continew.admin.system.model.req.MessageReq; import top.charles7c.continew.admin.system.model.resp.MessageResp; import top.charles7c.continew.admin.system.service.MessageService; import top.charles7c.continew.admin.system.service.MessageUserService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java index 5888b26d..2b1a1742 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageUserServiceImpl.java @@ -25,7 +25,7 @@ import top.charles7c.continew.admin.system.model.entity.MessageUserDO; import top.charles7c.continew.admin.system.model.resp.MessageTypeUnreadResp; import top.charles7c.continew.admin.system.model.resp.MessageUnreadResp; import top.charles7c.continew.admin.system.service.MessageUserService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.core.util.validate.CheckUtils; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java index f3bf3fe3..4d7fed63 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java @@ -27,9 +27,9 @@ import top.charles7c.continew.admin.system.model.req.OptionReq; import top.charles7c.continew.admin.system.model.req.OptionResetValueReq; import top.charles7c.continew.admin.system.model.resp.OptionResp; import top.charles7c.continew.admin.system.service.OptionService; -import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; +import top.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java index 4dc0c5bb..71a885c5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java @@ -38,8 +38,8 @@ import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.model.resp.RoleDetailResp; import top.charles7c.continew.admin.system.model.resp.RoleResp; import top.charles7c.continew.admin.system.service.*; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.util.*; import java.util.stream.Collectors; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java index d0ee627b..49e4d1c8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java @@ -36,12 +36,12 @@ import top.charles7c.continew.admin.system.model.req.StorageReq; import top.charles7c.continew.admin.system.model.resp.StorageResp; import top.charles7c.continew.admin.system.service.FileService; import top.charles7c.continew.admin.system.service.StorageService; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.URLUtils; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; -import top.charles7c.continew.starter.web.util.SpringWebUtils; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.URLUtils; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.web.util.SpringWebUtils; import java.util.Collections; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java index 50349d7d..cb776a29 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java @@ -48,10 +48,10 @@ import top.charles7c.continew.admin.system.service.FileService; import top.charles7c.continew.admin.system.service.RoleService; import top.charles7c.continew.admin.system.service.UserRoleService; import top.charles7c.continew.admin.system.service.UserService; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.service.CommonUserService; -import top.charles7c.continew.starter.extension.crud.service.impl.BaseServiceImpl; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.service.CommonUserService; +import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.time.LocalDateTime; import java.util.Collection; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java index 207019ce..6df5d4b7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserSocialServiceImpl.java @@ -31,7 +31,7 @@ import top.charles7c.continew.admin.common.enums.SocialSourceEnum; import top.charles7c.continew.admin.system.mapper.UserSocialMapper; import top.charles7c.continew.admin.system.model.entity.UserSocialDO; import top.charles7c.continew.admin.system.service.UserSocialService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.core.util.validate.CheckUtils; import me.zhyd.oauth.model.AuthUser; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java index 7f5cb190..5af13bbd 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java @@ -31,11 +31,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.extension.crud.annotation.EnableCrudRestController; -import top.charles7c.continew.starter.web.annotation.EnableGlobalExceptionHandler; +import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.extension.crud.annotation.EnableCrudRestController; +import top.continew.starter.web.annotation.EnableGlobalExceptionHandler; import java.net.InetAddress; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java index 0a59c0e0..b43e9159 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java @@ -39,11 +39,11 @@ import top.charles7c.continew.admin.common.util.SecureUtils; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.admin.system.model.resp.UserDetailResp; import top.charles7c.continew.admin.system.service.UserService; -import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; -import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.web.model.R; -import top.charles7c.continew.starter.log.core.annotation.Log; +import top.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.core.util.ExceptionUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.web.model.R; +import top.continew.starter.log.core.annotation.Log; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java index 4d7d951c..04bac461 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java @@ -33,10 +33,10 @@ import org.springframework.web.bind.annotation.*; import top.charles7c.continew.admin.auth.model.resp.LoginResp; import top.charles7c.continew.admin.auth.model.resp.SocialAuthAuthorizeResp; import top.charles7c.continew.admin.auth.service.LoginService; -import top.charles7c.continew.starter.core.exception.BadRequestException; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.log.core.annotation.Log; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.exception.BadRequestException; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.log.core.annotation.Log; +import top.continew.starter.web.model.R; /** * 三方账号认证 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java index 032ffa02..2c5d303a 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java @@ -46,15 +46,15 @@ import org.springframework.web.bind.annotation.*; import top.charles7c.continew.admin.common.config.properties.CaptchaProperties; import top.charles7c.continew.admin.common.constant.CacheConstants; import top.charles7c.continew.admin.common.model.resp.CaptchaResp; -import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; -import top.charles7c.continew.starter.captcha.graphic.core.GraphicCaptchaService; -import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; -import top.charles7c.continew.starter.core.util.TemplateUtils; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.log.core.annotation.Log; -import top.charles7c.continew.starter.messaging.mail.util.MailUtils; -import top.charles7c.continew.starter.web.model.R; +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.util.TemplateUtils; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.log.core.annotation.Log; +import top.continew.starter.messaging.mail.util.MailUtils; +import top.continew.starter.web.model.R; import java.time.Duration; import java.util.LinkedHashMap; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java index 311f69c2..62b05bae 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java @@ -39,12 +39,12 @@ import top.charles7c.continew.admin.system.model.query.OptionQuery; import top.charles7c.continew.admin.system.model.query.RoleQuery; import top.charles7c.continew.admin.system.model.resp.FileUploadResp; import top.charles7c.continew.admin.system.service.*; -import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; -import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.log.core.annotation.Log; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.extension.crud.model.query.SortQuery; +import top.continew.starter.log.core.annotation.Log; +import top.continew.starter.web.model.R; import java.io.Serializable; import java.util.Arrays; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java index 31079fc1..431feae9 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java @@ -37,9 +37,9 @@ import top.charles7c.continew.admin.system.model.resp.DashboardPopularModuleResp import top.charles7c.continew.admin.system.model.resp.DashboardTotalResp; import top.charles7c.continew.admin.system.service.DashboardService; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.web.model.R; -import top.charles7c.continew.starter.log.core.annotation.Log; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.web.model.R; +import top.continew.starter.log.core.annotation.Log; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java index 72cc262b..022344f2 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java @@ -32,10 +32,10 @@ import cn.dev33.satoken.stp.StpUtil; import top.charles7c.continew.admin.auth.model.query.OnlineUserQuery; import top.charles7c.continew.admin.auth.model.resp.OnlineUserResp; import top.charles7c.continew.admin.auth.service.OnlineUserService; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.web.model.R; /** * 在线用户 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java index 9204115e..c89e023e 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java @@ -30,11 +30,11 @@ import top.charles7c.continew.admin.system.model.req.AnnouncementReq; import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp; import top.charles7c.continew.admin.system.model.resp.AnnouncementResp; import top.charles7c.continew.admin.system.service.AnnouncementService; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.util.ValidateGroup; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.util.ValidateGroup; +import top.continew.starter.web.model.R; /** * 公告管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DeptController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DeptController.java index 2da76df0..eac71486 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DeptController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DeptController.java @@ -22,9 +22,9 @@ import top.charles7c.continew.admin.system.model.query.DeptQuery; import top.charles7c.continew.admin.system.model.req.DeptReq; import top.charles7c.continew.admin.system.model.resp.DeptResp; import top.charles7c.continew.admin.system.service.DeptService; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.enums.Api; /** * 部门管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictController.java index 737e883e..5ef22444 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictController.java @@ -22,9 +22,9 @@ import top.charles7c.continew.admin.system.model.query.DictQuery; import top.charles7c.continew.admin.system.model.req.DictReq; import top.charles7c.continew.admin.system.model.resp.DictResp; import top.charles7c.continew.admin.system.service.DictService; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.enums.Api; /** * 字典管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictItemController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictItemController.java index bf44e0f5..d3d1258d 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictItemController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/DictItemController.java @@ -22,9 +22,9 @@ import top.charles7c.continew.admin.system.model.query.DictItemQuery; import top.charles7c.continew.admin.system.model.req.DictItemReq; import top.charles7c.continew.admin.system.model.resp.DictItemResp; import top.charles7c.continew.admin.system.service.DictItemService; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.enums.Api; /** * 字典项管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/FileController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/FileController.java index 02fb4193..f93bccf8 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/FileController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/FileController.java @@ -24,9 +24,9 @@ import top.charles7c.continew.admin.system.model.query.FileQuery; import top.charles7c.continew.admin.system.model.req.FileReq; import top.charles7c.continew.admin.system.model.resp.FileResp; import top.charles7c.continew.admin.system.service.FileService; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.enums.Api; /** * 文件管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/LogController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/LogController.java index a8ad5340..0e7a086a 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/LogController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/LogController.java @@ -31,10 +31,10 @@ import top.charles7c.continew.admin.system.model.query.LogQuery; import top.charles7c.continew.admin.system.model.resp.log.LogDetailResp; import top.charles7c.continew.admin.system.model.resp.log.LogResp; import top.charles7c.continew.admin.system.service.LogService; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.web.model.R; +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.web.model.R; /** * 系统日志 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java index bc3a93e3..e776f8b4 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java @@ -27,13 +27,13 @@ import top.charles7c.continew.admin.system.model.query.MenuQuery; import top.charles7c.continew.admin.system.model.req.MenuReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.service.MenuService; -import top.charles7c.continew.starter.core.util.URLUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.enums.Api; -import top.charles7c.continew.starter.extension.crud.util.ValidateGroup; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.util.URLUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.util.ValidateGroup; +import top.continew.starter.web.model.R; /** * 菜单管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java index 7eb2e032..7a0a9224 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java @@ -29,10 +29,10 @@ import top.charles7c.continew.admin.system.model.resp.MessageResp; import top.charles7c.continew.admin.system.model.resp.MessageUnreadResp; import top.charles7c.continew.admin.system.service.MessageService; import top.charles7c.continew.admin.system.service.MessageUserService; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.web.model.R; -import top.charles7c.continew.starter.log.core.annotation.Log; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.web.model.R; +import top.continew.starter.log.core.annotation.Log; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java index 8c6b2d90..4e5d3e7d 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java @@ -33,7 +33,7 @@ import top.charles7c.continew.admin.system.model.req.OptionReq; import top.charles7c.continew.admin.system.model.req.OptionResetValueReq; import top.charles7c.continew.admin.system.model.resp.OptionResp; import top.charles7c.continew.admin.system.service.OptionService; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.web.model.R; /** * 参数管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/RoleController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/RoleController.java index cd1aef95..e13f9c2c 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/RoleController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/RoleController.java @@ -25,9 +25,9 @@ import top.charles7c.continew.admin.system.model.req.RoleReq; import top.charles7c.continew.admin.system.model.resp.RoleDetailResp; import top.charles7c.continew.admin.system.model.resp.RoleResp; import top.charles7c.continew.admin.system.service.RoleService; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.enums.Api; /** * 角色管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java index fbc34501..77302b8d 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java @@ -22,9 +22,9 @@ import top.charles7c.continew.admin.system.model.query.StorageQuery; import top.charles7c.continew.admin.system.model.req.StorageReq; import top.charles7c.continew.admin.system.model.resp.StorageResp; import top.charles7c.continew.admin.system.service.StorageService; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.enums.Api; /** * 存储管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java index 3952a0dc..3c7c22ef 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java @@ -45,10 +45,10 @@ import top.charles7c.continew.admin.system.model.resp.AvatarResp; import top.charles7c.continew.admin.system.model.resp.UserSocialBindResp; import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.admin.system.service.UserSocialService; -import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; -import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.core.util.ExceptionUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.web.model.R; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java index e725e099..ea3f3b8b 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java @@ -36,12 +36,12 @@ import top.charles7c.continew.admin.system.model.req.UserRoleUpdateReq; import top.charles7c.continew.admin.system.model.resp.UserDetailResp; import top.charles7c.continew.admin.system.model.resp.UserResp; import top.charles7c.continew.admin.system.service.UserService; -import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.controller.BaseController; -import top.charles7c.continew.starter.extension.crud.util.ValidateGroup; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.util.ExceptionUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.controller.BaseController; +import top.continew.starter.extension.crud.util.ValidateGroup; +import top.continew.starter.web.model.R; /** * 用户管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java index 123774a1..2ac8fbe4 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java @@ -33,10 +33,10 @@ import top.charles7c.continew.admin.generator.model.req.GenConfigReq; import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp; import top.charles7c.continew.admin.generator.model.resp.TableResp; import top.charles7c.continew.admin.generator.service.GeneratorService; -import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.web.model.R; import java.sql.SQLException; import java.util.List; diff --git a/continew-admin-webapi/src/main/resources/banner.txt b/continew-admin-webapi/src/main/resources/banner.txt index 830ed3ca..56cafa31 100644 --- a/continew-admin-webapi/src/main/resources/banner.txt +++ b/continew-admin-webapi/src/main/resources/banner.txt @@ -5,5 +5,5 @@ \____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_| :: ${project.name} :: v${project.version} - :: ContiNew Starter :: v2.0.0-SNAPSHOT + :: ContiNew Starter :: v2.0.0 :: Spring Boot :: v${spring-boot.version} diff --git a/pom.xml b/pom.xml index b90f4d50..310169e6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,9 @@ 可轻松集成到应用中，从而避免开发人员手动引入依赖的麻烦，为 Spring Boot 项目的灵活快速构建提供支持。 --> - top.charles7c.continew + top.continew continew-starter - 2.0.0-SNAPSHOT + 2.0.0 top.charles7c.continew @@ -205,16 +205,6 @@ AliYun Mirror https://maven.aliyun.com/repository/public/ - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - always - true - -