diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index d0299efa..24e9d5dc 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - top.charles7c.continew + top.continew continew-admin ${revision} diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/WebMvcConfiguration.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/WebMvcConfiguration.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/WebMvcConfiguration.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/WebMvcConfiguration.java index 46126485..fa41fd5f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/WebMvcConfiguration.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/WebMvcConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config; +package top.continew.admin.common.config; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; 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/continew/admin/common/config/jackson/BaseEnumDeserializer.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java index a8173e1b..738729a8 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/continew/admin/common/config/jackson/BaseEnumDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.jackson; +package top.continew.admin.common.config.jackson; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; @@ -30,14 +30,16 @@ import java.lang.reflect.Field; /** * 通用枚举接口 IBaseEnum 反序列化器 * - * @see IBaseEnum * @author Charles7c + * @see IBaseEnum * @since 2023/1/8 13:56 */ @JacksonStdImpl public class BaseEnumDeserializer extends JsonDeserializer { - /** 静态实例 */ + /** + * 静态实例 + */ public static final BaseEnumDeserializer SERIALIZER_INSTANCE = new BaseEnumDeserializer(); @Override 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/continew/admin/common/config/jackson/BaseEnumSerializer.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java index 332920ec..c2488006 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/continew/admin/common/config/jackson/BaseEnumSerializer.java @@ -14,28 +14,29 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.jackson; - -import java.io.IOException; +package top.continew.admin.common.config.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; - import top.continew.starter.data.mybatis.plus.base.IBaseEnum; +import java.io.IOException; + /** * 通用枚举接口 IBaseEnum 序列化器 * - * @see IBaseEnum * @author Charles7c + * @see IBaseEnum * @since 2023/1/8 13:56 */ @JacksonStdImpl public class BaseEnumSerializer extends JsonSerializer { - /** 静态实例 */ + /** + * 静态实例 + */ public static final BaseEnumSerializer SERIALIZER_INSTANCE = new BaseEnumSerializer(); @Override 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/continew/admin/common/config/jackson/JacksonConfiguration.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java index 7f4ff536..3d76a9ba 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/continew/admin/common/config/jackson/JacksonConfiguration.java @@ -14,24 +14,21 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.jackson; +package top.continew.admin.common.config.jackson; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; import lombok.extern.slf4j.Slf4j; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; - -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.module.SimpleModule; - import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * Jackson 配置 * - * @see IBaseEnum * @author Charles7c + * @see IBaseEnum * @since 2022/12/11 13:23 */ @Slf4j diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java index 4617bd05..99d6a536 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.jackson; - -import lombok.extern.slf4j.Slf4j; +package top.continew.admin.common.config.jackson; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.DeserializationConfig; @@ -24,6 +22,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.module.SimpleDeserializers; import com.fasterxml.jackson.databind.type.ClassKey; +import lombok.extern.slf4j.Slf4j; /** * 反序列化器包装类（重写 Jackson 反序列化枚举方法，参阅：FasterXML/jackson-databind#2842） 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/continew/admin/common/config/mybatis/BCryptEncryptor.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/BCryptEncryptor.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java index 1b791078..2d296ef6 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/continew/admin/common/config/mybatis/BCryptEncryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.mybatis; +package top.continew.admin.common.config.mybatis; import org.springframework.security.crypto.password.PasswordEncoder; import top.continew.starter.security.crypto.encryptor.IEncryptor; 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/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java similarity index 90% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java index 983d3802..0916f330 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/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.mybatis; +package top.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.continew.admin.common.model.dto.LoginUser; +import top.continew.admin.common.util.helper.LoginHelper; import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser; import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; import top.continew.starter.data.mybatis.plus.datapermission.DataScope; 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/continew/admin/common/config/mybatis/DataPermissionMapper.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java index 07a6fba6..59bfc2a0 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/continew/admin/common/config/mybatis/DataPermissionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.mybatis; +package top.continew.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -28,8 +28,7 @@ import java.util.List; /** * 数据权限 Mapper 基类 * - * @param - * 实体类 + * @param 实体类 * @author Charles7c * @since 2023/9/3 21:50 */ @@ -47,7 +46,7 @@ public interface DataPermissionMapper extends BaseMapper { /** * 根据 entity 条件，查询全部记录（并翻页） - * + * * @param page 分页查询条件 * @param queryWrapper 实体对象封装操作类（可以为 null） * @return 全部记录（并翻页） 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/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 5b764006..1544f523 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/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.mybatis; +package top.continew.admin.common.config.mybatis; 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.continew.admin.common.util.helper.LoginHelper; import top.continew.starter.core.exception.BusinessException; import top.continew.starter.extension.crud.model.entity.BaseDO; @@ -33,13 +33,21 @@ import java.time.LocalDateTime; */ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { - /** 创建人 */ + /** + * 创建人 + */ private static final String CREATE_USER = "createUser"; - /** 创建时间 */ + /** + * 创建时间 + */ private static final String CREATE_TIME = "createTime"; - /** 修改人 */ + /** + * 修改人 + */ private static final String UPDATE_USER = "updateUser"; - /** 修改时间 */ + /** + * 修改时间 + */ private static final String UPDATE_TIME = "updateTime"; /** 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/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java index bde72649..153b2ca0 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/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.mybatis; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; +package top.continew.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; - +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.security.crypto.password.PasswordEncoder; import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/CaptchaProperties.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/CaptchaProperties.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java index 59bd82be..2b8fc526 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/CaptchaProperties.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.properties; +package top.continew.admin.common.config.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/RsaProperties.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java similarity index 92% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/RsaProperties.java rename to continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java index 1e003fb9..429f5d07 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/RsaProperties.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.config.properties; +package top.continew.admin.common.config.properties; import cn.hutool.extra.spring.SpringUtil; @@ -27,7 +27,9 @@ import cn.hutool.extra.spring.SpringUtil; */ public class RsaProperties { - /** 私钥 */ + /** + * 私钥 + */ public static final String PRIVATE_KEY; static { 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/continew/admin/common/constant/CacheConstants.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java rename to continew-admin-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java index 26e9f927..79d869d6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.constant; +package top.continew.admin.common.constant; 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/continew/admin/common/constant/ContainerConstants.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java rename to continew-admin-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java index 4b7458e0..d67070bd 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.constant; +package top.continew.admin.common.constant; import top.continew.starter.extension.crud.constant.ContainerPool; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java b/continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java rename to continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java index dbccaab7..af42d93d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.constant; +package top.continew.admin.common.constant; /** * 正则相关常量 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java b/continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java rename to continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java index 26ea3220..3f82f348 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.constant; +package top.continew.admin.common.constant; /** * 系统相关常量 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java b/continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java rename to continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java index 1029c5a0..48cadc7a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.constant; +package top.continew.admin.common.constant; /** * UI 相关常量 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/continew/admin/common/enums/DataScopeEnum.java similarity index 81% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java rename to continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java index 734c3ab6..7f669caa 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.enums; +package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -31,19 +30,29 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum DataScopeEnum implements IBaseEnum { - /** 全部数据权限 */ + /** + * 全部数据权限 + */ ALL(1, "全部数据权限"), - /** 本部门及以下数据权限 */ + /** + * 本部门及以下数据权限 + */ DEPT_AND_CHILD(2, "本部门及以下数据权限"), - /** 本部门数据权限 */ + /** + * 本部门数据权限 + */ DEPT(3, "本部门数据权限"), - /** 仅本人数据权限 */ + /** + * 仅本人数据权限 + */ SELF(4, "仅本人数据权限"), - /** 自定义数据权限 */ + /** + * 自定义数据权限 + */ CUSTOM(5, "自定义数据权限"),; private final Integer value; 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/continew/admin/common/enums/DisEnableStatusEnum.java similarity index 88% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java rename to continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java index f628e0d2..4996a271 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.enums; +package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - -import top.charles7c.continew.admin.common.constant.UiConstants; +import top.continew.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -32,10 +31,14 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum DisEnableStatusEnum implements IBaseEnum { - /** 启用 */ + /** + * 启用 + */ ENABLE(1, "启用", UiConstants.COLOR_SUCCESS), - /** 禁用 */ + /** + * 禁用 + */ DISABLE(2, "禁用", UiConstants.COLOR_ERROR),; private final Integer value; 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/continew/admin/common/enums/GenderEnum.java similarity index 89% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java rename to continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java index 6a718c7a..24cd8897 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.enums; +package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -31,13 +30,19 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum GenderEnum implements IBaseEnum { - /** 未知 */ + /** + * 未知 + */ UNKNOWN(0, "未知"), - /** 男 */ + /** + * 男 + */ MALE(1, "男"), - /** 女 */ + /** + * 女 + */ FEMALE(2, "女"),; private final Integer value; 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/continew/admin/common/enums/MenuTypeEnum.java similarity index 89% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java rename to continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java index 4b6bdbaa..d5659c5e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.enums; +package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -31,13 +30,19 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum MenuTypeEnum implements IBaseEnum { - /** 目录 */ + /** + * 目录 + */ DIR(1, "目录"), - /** 菜单 */ + /** + * 菜单 + */ MENU(2, "菜单"), - /** 按钮 */ + /** + * 按钮 + */ BUTTON(3, "按钮"),; private final Integer value; 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/continew/admin/common/enums/MessageTypeEnum.java similarity index 88% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java rename to continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java index 7080cc4a..8a45b33e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.enums; +package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - -import top.charles7c.continew.admin.common.constant.UiConstants; +import top.continew.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -32,7 +31,9 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum MessageTypeEnum implements IBaseEnum { - /** 系统消息 */ + /** + * 系统消息 + */ SYSTEM(1, "系统消息", UiConstants.COLOR_PRIMARY),; private final Integer value; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SocialSourceEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java similarity index 90% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SocialSourceEnum.java rename to continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java index 60764ffe..dd1872d7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SocialSourceEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.enums; +package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -29,10 +29,14 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public enum SocialSourceEnum { - /** 码云 */ + /** + * 码云 + */ GITEE("码云"), - /** GitHub */ + /** + * GitHub + */ GITHUB("GitHub"),; private final String description; 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/continew/admin/common/enums/SuccessFailureStatusEnum.java similarity index 88% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java rename to continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java index 55a6b8f3..1212653e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.enums; +package top.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - -import top.charles7c.continew.admin.common.constant.UiConstants; +import top.continew.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -32,10 +31,14 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum SuccessFailureStatusEnum implements IBaseEnum { - /** 成功 */ + /** + * 成功 + */ SUCCESS(1, "成功", UiConstants.COLOR_SUCCESS), - /** 失败 */ + /** + * 失败 + */ FAILURE(2, "失败", UiConstants.COLOR_ERROR),; private final Integer value; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LoginUser.java b/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/LoginUser.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LoginUser.java rename to continew-admin-common/src/main/java/top/continew/admin/common/model/dto/LoginUser.java index c7b8da57..ab6ada69 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LoginUser.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/LoginUser.java @@ -14,19 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.model.dto; +package top.continew.admin.common.model.dto; + +import cn.hutool.core.collection.CollUtil; +import lombok.Data; +import top.continew.admin.common.constant.SysConstants; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Set; -import lombok.Data; - -import cn.hutool.core.collection.CollUtil; - -import top.charles7c.continew.admin.common.constant.SysConstants; - /** * 登录用户信息 * diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/RoleDTO.java b/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/RoleDTO.java similarity index 90% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/RoleDTO.java rename to continew-admin-common/src/main/java/top/continew/admin/common/model/dto/RoleDTO.java index 439a831a..212c92a8 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/RoleDTO.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/RoleDTO.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.model.dto; +package top.continew.admin.common.model.dto; + +import lombok.Data; +import top.continew.admin.common.enums.DataScopeEnum; import java.io.Serial; import java.io.Serializable; -import lombok.Data; - -import top.charles7c.continew.admin.common.enums.DataScopeEnum; - /** * 角色信息 * diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java b/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java rename to continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java index 8e3ba8ea..7b5e4c80 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.model.resp; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.common.model.resp; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serial; +import java.io.Serializable; /** * 验证码信息 diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/LabelValueResp.java b/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/LabelValueResp.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/LabelValueResp.java rename to continew-admin-common/src/main/java/top/continew/admin/common/model/resp/LabelValueResp.java index 58b9adfd..d100a36c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/LabelValueResp.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/LabelValueResp.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.model.resp; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.common.model.resp; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; -import io.swagger.v3.oas.annotations.media.Schema; - -import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serial; +import java.io.Serializable; /** * 键值对信息 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/continew/admin/common/util/SecureUtils.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java rename to continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java index ef0b63eb..c4a996ee 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.util; +package top.continew.admin.common.util; 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.continew.admin.common.config.properties.RsaProperties; 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/continew/admin/common/util/helper/LoginHelper.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java rename to continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java index b210b0a0..9812a7ad 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/continew/admin/common/util/helper/LoginHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.common.util.helper; +package top.continew.admin.common.util.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.exception.NotLoginException; @@ -24,8 +24,8 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; 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.continew.admin.common.constant.CacheConstants; +import top.continew.admin.common.model.dto.LoginUser; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.IpUtils; import top.continew.starter.extension.crud.service.CommonUserService; diff --git a/continew-admin-generator/pom.xml b/continew-admin-generator/pom.xml index 4941dd66..7ba680fc 100644 --- a/continew-admin-generator/pom.xml +++ b/continew-admin-generator/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - top.charles7c.continew + top.continew continew-admin ${revision} @@ -15,7 +15,7 @@ - top.charles7c.continew + top.continew continew-admin-common 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/continew/admin/generator/config/properties/GeneratorProperties.java similarity index 96% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java index 684af7bf..dbd489f8 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/continew/admin/generator/config/properties/GeneratorProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.config.properties; +package top.continew.admin.generator.config.properties; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.map.MapUtil; 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/continew/admin/generator/enums/FormTypeEnum.java similarity index 96% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java index 0adadb90..e246d8b6 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.enums; +package top.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; 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/continew/admin/generator/enums/QueryTypeEnum.java similarity index 97% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java index 68845296..a5e80098 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.enums; +package top.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; 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/continew/admin/generator/mapper/FieldConfigMapper.java similarity index 90% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java index b6a482cb..da2e83d4 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.mapper; +package top.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.continew.admin.generator.model.entity.FieldConfigDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; @@ -33,7 +33,7 @@ public interface FieldConfigMapper extends BaseMapper { /** * 根据表名称查询 - * + * * @param tableName 表名称 * @return 字段配置信息 */ 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/continew/admin/generator/mapper/GenConfigMapper.java similarity index 86% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java index fbaa620f..bc3290cd 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.mapper; +package top.continew.admin.generator.mapper; -import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; +import top.continew.admin.generator.model.entity.GenConfigDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -25,4 +25,5 @@ import top.continew.starter.data.mybatis.plus.base.BaseMapper; * @author Charles7c * @since 2023/4/12 23:56 */ -public interface GenConfigMapper extends BaseMapper {} +public interface GenConfigMapper extends BaseMapper { +} 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/continew/admin/generator/model/entity/FieldConfigDO.java similarity index 96% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java index d6aa2629..3a17c2e8 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/continew/admin/generator/model/entity/FieldConfigDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.model.entity; +package top.continew.admin.generator.model.entity; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; @@ -28,8 +28,8 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; import lombok.NonNull; -import top.charles7c.continew.admin.generator.enums.FormTypeEnum; -import top.charles7c.continew.admin.generator.enums.QueryTypeEnum; +import top.continew.admin.generator.enums.FormTypeEnum; +import top.continew.admin.generator.enums.QueryTypeEnum; import top.continew.starter.core.constant.StringConstants; import java.io.Serial; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/GenConfigDO.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java similarity index 94% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/GenConfigDO.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java index 2b469321..d04e4eef 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/GenConfigDO.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.model.entity; +package top.continew.admin.generator.model.entity; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.*; @@ -28,7 +28,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.constant.RegexConstants; import java.io.Serial; import java.io.Serializable; @@ -68,7 +68,7 @@ public class GenConfigDO implements Serializable { /** * 包名称 */ - @Schema(description = "包名称", example = "top.charles7c.continew.admin.system") + @Schema(description = "包名称", example = "top.continew.admin.system") @NotBlank(message = "包名称不能为空") @Pattern(regexp = RegexConstants.PACKAGE_NAME, message = "包名称格式错误") @Length(max = 60, message = "包名称不能超过 {max} 个字符") diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/query/TableQuery.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java similarity index 95% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/query/TableQuery.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java index b454da54..214bf3b5 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/query/TableQuery.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.model.query; +package top.continew.admin.generator.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/req/GenConfigReq.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java similarity index 88% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/req/GenConfigReq.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java index 287a32fa..dc0a258f 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/req/GenConfigReq.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.model.req; +package top.continew.admin.generator.model.req; import java.io.Serial; import java.io.Serializable; @@ -29,8 +29,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; -import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; +import top.continew.admin.generator.model.entity.FieldConfigDO; +import top.continew.admin.generator.model.entity.GenConfigDO; /** * 代码生成配置信息 diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/GeneratePreviewResp.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java similarity index 96% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/GeneratePreviewResp.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java index 6eb6a956..a07168a7 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/GeneratePreviewResp.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.model.resp; +package top.continew.admin.generator.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/TableResp.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java similarity index 97% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/TableResp.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java index 8498ae8f..81269b22 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/TableResp.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.model.resp; +package top.continew.admin.generator.model.resp; 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/continew/admin/generator/service/GeneratorService.java similarity index 83% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java index 87f3eeeb..baad0745 100644 --- a/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.service; +package top.continew.admin.generator.service; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; -import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; -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.continew.admin.generator.model.entity.FieldConfigDO; +import top.continew.admin.generator.model.entity.GenConfigDO; +import top.continew.admin.generator.model.query.TableQuery; +import top.continew.admin.generator.model.req.GenConfigReq; +import top.continew.admin.generator.model.resp.GeneratePreviewResp; +import top.continew.admin.generator.model.resp.TableResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; 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/continew/admin/generator/service/impl/GeneratorServiceImpl.java similarity index 91% rename from continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java rename to continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index a081e207..573eb64a 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/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.generator.service.impl; +package top.continew.admin.generator.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -33,18 +33,17 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.charles7c.continew.admin.generator.config.properties.GeneratorProperties; -import top.charles7c.continew.admin.generator.config.properties.GeneratorProperties.TemplateConfig; -import top.charles7c.continew.admin.generator.enums.QueryTypeEnum; -import top.charles7c.continew.admin.generator.mapper.FieldConfigMapper; -import top.charles7c.continew.admin.generator.mapper.GenConfigMapper; -import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; -import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; -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.admin.generator.service.GeneratorService; +import top.continew.admin.generator.config.properties.GeneratorProperties; +import top.continew.admin.generator.enums.QueryTypeEnum; +import top.continew.admin.generator.mapper.FieldConfigMapper; +import top.continew.admin.generator.mapper.GenConfigMapper; +import top.continew.admin.generator.model.entity.FieldConfigDO; +import top.continew.admin.generator.model.entity.GenConfigDO; +import top.continew.admin.generator.model.query.TableQuery; +import top.continew.admin.generator.model.req.GenConfigReq; +import top.continew.admin.generator.model.resp.GeneratePreviewResp; +import top.continew.admin.generator.model.resp.TableResp; +import top.continew.admin.generator.service.GeneratorService; import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; @@ -228,12 +227,12 @@ public class GeneratorServiceImpl implements GeneratorService { genConfigMap.put("apiName", StrUtil.lowerFirst(genConfig.getClassNamePrefix())); // 渲染代码 String classNamePrefix = genConfig.getClassNamePrefix(); - Map templateConfigMap = generatorProperties.getTemplateConfigs(); - for (Map.Entry templateConfigEntry : templateConfigMap.entrySet()) { + Map templateConfigMap = generatorProperties.getTemplateConfigs(); + for (Map.Entry templateConfigEntry : templateConfigMap.entrySet()) { this.pretreatment(genConfigMap, fieldConfigList, templateConfigEntry); String className = classNamePrefix + StrUtil.nullToEmpty(templateConfigEntry.getKey()); genConfigMap.put("className", className); - TemplateConfig templateConfig = templateConfigEntry.getValue(); + GeneratorProperties.TemplateConfig templateConfig = templateConfigEntry.getValue(); boolean isBackend = templateConfig.isBackend(); String extension = templateConfig.getExtension(); GeneratePreviewResp generatePreview = new GeneratePreviewResp(); @@ -291,11 +290,11 @@ public class GeneratorServiceImpl implements GeneratorService { String moduleName = StrUtil.subSuf(packageName, StrUtil .lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1); // 生成代码 - Map templateConfigMap = generatorProperties.getTemplateConfigs(); + Map templateConfigMap = generatorProperties.getTemplateConfigs(); for (GeneratePreviewResp generatePreview : generatePreviewList) { // 获取对应模板配置 - TemplateConfig templateConfig = templateConfigMap.getOrDefault(StrUtil.subBefore(generatePreview - .getFileName(), StringConstants.DOT, true) + GeneratorProperties.TemplateConfig templateConfig = templateConfigMap.getOrDefault(StrUtil + .subBefore(generatePreview.getFileName(), StringConstants.DOT, true) .replace(genConfig.getClassNamePrefix(), StringConstants.EMPTY), templateConfigMap.get("api")); String packagePath; if (generatePreview.isBackend()) { @@ -356,8 +355,8 @@ public class GeneratorServiceImpl implements GeneratorService { */ private void pretreatment(Map genConfigMap, List originFieldConfigList, - Map.Entry templateConfigEntry) { - TemplateConfig templateConfig = templateConfigEntry.getValue(); + Map.Entry templateConfigEntry) { + GeneratorProperties.TemplateConfig templateConfig = templateConfigEntry.getValue(); // 移除需要忽略的字段 List fieldConfigList = originFieldConfigList.stream() .filter(fieldConfig -> !StrUtil.equalsAny(fieldConfig.getFieldName(), templateConfig.getExcludeFields())) diff --git a/continew-admin-system/pom.xml b/continew-admin-system/pom.xml index 321352a5..87b4bcd1 100644 --- a/continew-admin-system/pom.xml +++ b/continew-admin-system/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - top.charles7c.continew + top.continew continew-admin ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-admin-common diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenConfiguration.java b/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenConfiguration.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java index ec19d747..157b8548 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenConfiguration.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.config.satoken; +package top.continew.admin.auth.config.satoken; import cn.dev33.satoken.stp.StpInterface; import org.springframework.context.annotation.Bean; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java b/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java similarity index 87% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java index 7e027abf..9c9afa08 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.config.satoken; +package top.continew.admin.auth.config.satoken; import cn.dev33.satoken.stp.StpInterface; -import top.charles7c.continew.admin.common.model.dto.LoginUser; -import top.charles7c.continew.admin.common.util.helper.LoginHelper; +import top.continew.admin.common.model.dto.LoginUser; +import top.continew.admin.common.util.helper.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/query/OnlineUserQuery.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/query/OnlineUserQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java index bdaab8c5..aff46021 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/query/OnlineUserQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java @@ -14,21 +14,18 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.query; +package top.continew.admin.auth.model.query; + +import cn.hutool.core.date.DatePattern; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import org.springframework.format.annotation.DateTimeFormat; - -import cn.hutool.core.date.DatePattern; - /** * 在线用户查询条件 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/AccountLoginReq.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/AccountLoginReq.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java index eb415ab6..5e0aa473 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/AccountLoginReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.req; +package top.continew.admin.auth.model.req; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; import java.io.Serial; import java.io.Serializable; -import jakarta.validation.constraints.NotBlank; - -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * 账号登录信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java index 517dff16..5050dec3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.req; +package top.continew.admin.auth.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java index 06994316..a7ed7584 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.req; +package top.continew.admin.auth.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/LoginResp.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/LoginResp.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java index 77b33dda..e890258e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/LoginResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.resp; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.auth.model.resp; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serial; +import java.io.Serializable; /** * 令牌信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/OnlineUserResp.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/OnlineUserResp.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java index 89c971ae..f86a33c7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/OnlineUserResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.resp; +package top.continew.admin.auth.model.resp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * 在线用户信息 * @@ -64,7 +63,7 @@ public class OnlineUserResp implements Serializable { /** * 登录 IP */ - @Schema(description = "登录 IP", example = "192.168.0.1") + @Schema(description = "登录 IP", example = "") private String ip; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/RouteResp.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java similarity index 98% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/RouteResp.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java index 1874cee8..80ead42b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/RouteResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.resp; +package top.continew.admin.auth.model.resp; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java index 7bb5272d..60ac7894 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.resp; +package top.continew.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; 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/continew/admin/auth/model/resp/UserInfoResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java index c0b70260..4656c2ff 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/continew/admin/auth/model/resp/UserInfoResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.model.resp; +package top.continew.admin.auth.model.resp; 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.continew.admin.common.enums.GenderEnum; import top.continew.starter.security.mask.annotation.JsonMask; import top.continew.starter.security.mask.enums.MaskType; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/LoginService.java b/continew-admin-system/src/main/java/top/continew/admin/auth/service/LoginService.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/LoginService.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/service/LoginService.java index 3fe4c91e..8a46565d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/LoginService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/service/LoginService.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.service; - -import java.util.List; - -import top.charles7c.continew.admin.auth.model.resp.RouteResp; +package top.continew.admin.auth.service; import me.zhyd.oauth.model.AuthUser; +import top.continew.admin.auth.model.resp.RouteResp; + +import java.util.List; /** * 登录业务接口 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/continew/admin/auth/service/OnlineUserService.java similarity index 85% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/OnlineUserService.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java index 5c7d68c3..20fc28e2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/OnlineUserService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.service; +package top.continew.admin.auth.service; -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.continew.admin.auth.model.query.OnlineUserQuery; +import top.continew.admin.auth.model.resp.OnlineUserResp; +import top.continew.admin.common.model.dto.LoginUser; 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/auth/service/PermissionService.java b/continew-admin-system/src/main/java/top/continew/admin/auth/service/PermissionService.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/PermissionService.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/service/PermissionService.java index 5823e514..5536870b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/PermissionService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/service/PermissionService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.service; +package top.continew.admin.auth.service; import java.util.Set; 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/continew/admin/auth/service/impl/LoginServiceImpl.java similarity index 86% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java index 89804f10..1aba3a64 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/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.service.impl; +package top.continew.admin.auth.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -29,25 +29,25 @@ import lombok.RequiredArgsConstructor; import me.zhyd.oauth.model.AuthUser; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import top.charles7c.continew.admin.auth.model.resp.RouteResp; -import top.charles7c.continew.admin.auth.service.LoginService; -import top.charles7c.continew.admin.auth.service.PermissionService; -import top.charles7c.continew.admin.common.constant.RegexConstants; -import top.charles7c.continew.admin.common.constant.SysConstants; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.admin.common.enums.GenderEnum; -import top.charles7c.continew.admin.common.enums.MenuTypeEnum; -import top.charles7c.continew.admin.common.enums.MessageTypeEnum; -import top.charles7c.continew.admin.common.model.dto.LoginUser; -import top.charles7c.continew.admin.common.util.helper.LoginHelper; -import top.charles7c.continew.admin.system.enums.MessageTemplateEnum; -import top.charles7c.continew.admin.system.model.entity.DeptDO; -import top.charles7c.continew.admin.system.model.entity.RoleDO; -import top.charles7c.continew.admin.system.model.entity.UserDO; -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.continew.admin.auth.model.resp.RouteResp; +import top.continew.admin.auth.service.LoginService; +import top.continew.admin.auth.service.PermissionService; +import top.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.constant.SysConstants; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.GenderEnum; +import top.continew.admin.common.enums.MenuTypeEnum; +import top.continew.admin.common.enums.MessageTypeEnum; +import top.continew.admin.common.model.dto.LoginUser; +import top.continew.admin.common.util.helper.LoginHelper; +import top.continew.admin.system.enums.MessageTemplateEnum; +import top.continew.admin.system.model.entity.DeptDO; +import top.continew.admin.system.model.entity.RoleDO; +import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.UserSocialDO; +import top.continew.admin.system.model.req.MessageReq; +import top.continew.admin.system.model.resp.MenuResp; +import top.continew.admin.system.service.*; import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.extension.crud.annotation.TreeField; @@ -207,7 +207,7 @@ public class LoginServiceImpl implements LoginService { /** * 发送系统消息 - * + * * @param user 用户信息 */ private void sendSystemMsg(UserDO user) { 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/continew/admin/auth/service/impl/OnlineUserServiceImpl.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/OnlineUserServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java index f27bacdb..0f46845b 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/continew/admin/auth/service/impl/OnlineUserServiceImpl.java @@ -14,14 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.service.impl; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Date; -import java.util.List; - -import org.springframework.stereotype.Service; +package top.continew.admin.auth.service.impl; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.exception.NotLoginException; @@ -30,16 +23,21 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; - -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.admin.common.model.dto.LoginUser; -import top.charles7c.continew.admin.common.util.helper.LoginHelper; +import org.springframework.stereotype.Service; +import top.continew.admin.auth.model.query.OnlineUserQuery; +import top.continew.admin.auth.model.resp.OnlineUserResp; +import top.continew.admin.auth.service.OnlineUserService; +import top.continew.admin.common.model.dto.LoginUser; +import top.continew.admin.common.util.helper.LoginHelper; 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; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.List; + /** * 在线用户业务实现 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/PermissionServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/PermissionServiceImpl.java similarity index 83% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/PermissionServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/PermissionServiceImpl.java index 51f20663..c9aeff7b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/PermissionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/PermissionServiceImpl.java @@ -14,20 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.auth.service.impl; - -import java.util.Set; - -import lombok.RequiredArgsConstructor; - -import org.springframework.stereotype.Service; +package top.continew.admin.auth.service.impl; import cn.hutool.core.collection.CollUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import top.continew.admin.auth.service.PermissionService; +import top.continew.admin.common.constant.SysConstants; +import top.continew.admin.system.service.MenuService; +import top.continew.admin.system.service.RoleService; -import top.charles7c.continew.admin.auth.service.PermissionService; -import top.charles7c.continew.admin.common.constant.SysConstants; -import top.charles7c.continew.admin.system.service.MenuService; -import top.charles7c.continew.admin.system.service.RoleService; +import java.util.Set; /** * 权限业务实现 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/continew/admin/system/config/file/FileRecorderImpl.java similarity index 84% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileRecorderImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java index c5b95a88..a8f95079 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/continew/admin/system/config/file/FileRecorderImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.config.file; +package top.continew.admin.system.config.file; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.EscapeUtil; @@ -25,12 +25,12 @@ import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.recorder.FileRecorder; import org.dromara.x.file.storage.core.upload.FilePartInfo; import org.springframework.stereotype.Component; -import top.charles7c.continew.admin.common.util.helper.LoginHelper; -import top.charles7c.continew.admin.system.enums.FileTypeEnum; -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.continew.admin.common.util.helper.LoginHelper; +import top.continew.admin.system.enums.FileTypeEnum; +import top.continew.admin.system.mapper.FileMapper; +import top.continew.admin.system.mapper.StorageMapper; +import top.continew.admin.system.model.entity.FileDO; +import top.continew.admin.system.model.entity.StorageDO; import top.continew.starter.core.constant.StringConstants; import java.util.Optional; @@ -87,8 +87,7 @@ public class FileRecorderImpl implements FileRecorder { /** * 根据 URL 查询文件 * - * @param url - * URL + * @param url URL * @return 文件信息 */ private FileDO getFileByUrl(String url) { @@ -101,13 +100,16 @@ public class FileRecorderImpl implements FileRecorder { @Override public void update(FileInfo fileInfo) { - /* 不使用分片功能则无需重写 */ } + /* 不使用分片功能则无需重写 */ + } @Override public void saveFilePart(FilePartInfo filePartInfo) { - /* 不使用分片功能则无需重写 */ } + /* 不使用分片功能则无需重写 */ + } @Override public void deleteFilePartByUploadId(String s) { - /* 不使用分片功能则无需重写 */} + /* 不使用分片功能则无需重写 */ + } } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileStorageConfigLoader.java b/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java similarity index 80% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileStorageConfigLoader.java rename to continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java index 6f24f3da..5a1634ba 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/file/FileStorageConfigLoader.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java @@ -14,25 +14,22 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.config.file; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; +package top.continew.admin.system.config.file; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.system.model.query.StorageQuery; +import top.continew.admin.system.model.req.StorageReq; +import top.continew.admin.system.model.resp.StorageResp; +import top.continew.admin.system.service.StorageService; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -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 java.util.List; /** * 文件存储配置加载器 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/continew/admin/system/config/log/LogConfiguration.java similarity index 88% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogConfiguration.java rename to continew-admin-system/src/main/java/top/continew/admin/system/config/log/LogConfiguration.java index 2fcdd782..038c677f 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/continew/admin/system/config/log/LogConfiguration.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.config.log; +package top.continew.admin.system.config.log; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - -import top.charles7c.continew.admin.system.mapper.LogMapper; -import top.charles7c.continew.admin.system.service.UserService; +import top.continew.admin.system.mapper.LogMapper; +import top.continew.admin.system.service.UserService; 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/continew/admin/system/config/log/LogDaoLocalImpl.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/system/config/log/LogDaoLocalImpl.java index e8a4e6cd..b10c874c 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/continew/admin/system/config/log/LogDaoLocalImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.config.log; +package top.continew.admin.system.config.log; import cn.dev33.satoken.SaManager; import cn.dev33.satoken.stp.StpUtil; @@ -27,12 +27,12 @@ import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.scheduling.annotation.Async; -import top.charles7c.continew.admin.auth.model.req.AccountLoginReq; -import top.charles7c.continew.admin.common.constant.SysConstants; -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.continew.admin.auth.model.req.AccountLoginReq; +import top.continew.admin.common.constant.SysConstants; +import top.continew.admin.system.enums.LogStatusEnum; +import top.continew.admin.system.mapper.LogMapper; +import top.continew.admin.system.model.entity.LogDO; +import top.continew.admin.system.service.UserService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.log.core.dao.LogDao; 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/continew/admin/system/enums/AnnouncementStatusEnum.java similarity index 86% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/AnnouncementStatusEnum.java index 04d51a57..93f7aaf1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/AnnouncementStatusEnum.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.enums; +package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - -import top.charles7c.continew.admin.common.constant.UiConstants; +import top.continew.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -32,13 +31,19 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum AnnouncementStatusEnum implements IBaseEnum { - /** 待发布 */ + /** + * 待发布 + */ PENDING_RELEASE(1, "待发布", UiConstants.COLOR_PRIMARY), - /** 已发布 */ + /** + * 已发布 + */ PUBLISHED(2, "已发布", UiConstants.COLOR_SUCCESS), - /** 已过期 */ + /** + * 已过期 + */ EXPIRED(3, "已过期", UiConstants.COLOR_ERROR),; private final Integer value; 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/continew/admin/system/enums/FileTypeEnum.java similarity index 97% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/FileTypeEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java index fa695be6..c3d5413a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/FileTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java @@ -14,19 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.enums; +package top.continew.admin.system.enums; + +import cn.hutool.core.util.StrUtil; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; import java.util.Arrays; import java.util.Collections; import java.util.List; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -import cn.hutool.core.util.StrUtil; - -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/continew/admin/system/enums/LogStatusEnum.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/LogStatusEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java index fd19cd1f..97783f93 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/LogStatusEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.enums; +package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -31,10 +30,14 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum; @RequiredArgsConstructor public enum LogStatusEnum implements IBaseEnum { - /** 成功 */ + /** + * 成功 + */ SUCCESS(1, "成功"), - /** 失败 */ + /** + * 失败 + */ FAILURE(2, "失败"),; private final Integer value; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/MessageTemplateEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/MessageTemplateEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java index d07a0add..3ceb34c2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/MessageTemplateEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.enums; +package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; 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/continew/admin/system/enums/StorageTypeEnum.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/StorageTypeEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java index 9a945663..3a54827b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/StorageTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.enums; +package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - 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/continew/admin/system/mapper/AnnouncementMapper.java similarity index 83% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/AnnouncementMapper.java index a31ae151..c157cd69 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/AnnouncementMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; + +import top.continew.admin.system.model.entity.AnnouncementDO; +import top.continew.admin.system.model.resp.DashboardAnnouncementResp; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; -import top.charles7c.continew.admin.system.model.entity.AnnouncementDO; -import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; -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/continew/admin/system/mapper/DeptMapper.java similarity index 81% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java index 0230a1e1..2061aa77 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; -import top.charles7c.continew.admin.system.model.entity.DeptDO; +import top.continew.admin.system.model.entity.DeptDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -25,4 +25,5 @@ import top.continew.starter.data.mybatis.plus.base.BaseMapper; * @author Charles7c * @since 2023/1/22 17:56 */ -public interface DeptMapper extends BaseMapper {} +public interface DeptMapper extends BaseMapper { +} 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/continew/admin/system/mapper/DictItemMapper.java similarity index 85% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java index 71aefd60..02cfd175 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.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.continew.admin.common.model.resp.LabelValueResp; +import top.continew.admin.system.model.entity.DictItemDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.io.Serializable; @@ -34,7 +34,7 @@ public interface DictItemMapper extends BaseMapper { /** * 根据字典编码查询 - * + * * @param dictCode 字典编码 * @return 字典项列表 */ 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/continew/admin/system/mapper/DictMapper.java similarity index 81% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java index d79d647a..415afb14 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; -import top.charles7c.continew.admin.system.model.entity.DictDO; +import top.continew.admin.system.model.entity.DictDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -25,4 +25,5 @@ import top.continew.starter.data.mybatis.plus.base.BaseMapper; * @author Charles7c * @since 2023/9/11 21:29 */ -public interface DictMapper extends BaseMapper {} \ No newline at end of file +public interface DictMapper extends BaseMapper { +} \ No newline at end of file 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/continew/admin/system/mapper/FileMapper.java similarity index 81% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/FileMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java index 1805d168..19719abd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/FileMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; -import top.charles7c.continew.admin.system.model.entity.FileDO; +import top.continew.admin.system.model.entity.FileDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -25,4 +25,5 @@ import top.continew.starter.data.mybatis.plus.base.BaseMapper; * @author Charles7c * @since 2023/12/23 10:38 */ -public interface FileMapper extends BaseMapper {} \ No newline at end of file +public interface FileMapper extends BaseMapper { +} \ No newline at end of file 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/continew/admin/system/mapper/LogMapper.java similarity index 86% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/LogMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java index cb9966af..7c3f7e4d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/LogMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java @@ -14,15 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; 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.continew.admin.system.model.entity.LogDO; +import top.continew.admin.system.model.resp.DashboardAccessTrendResp; +import top.continew.admin.system.model.resp.DashboardPopularModuleResp; +import top.continew.admin.system.model.resp.DashboardTotalResp; +import top.continew.admin.system.model.resp.log.LogResp; 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/MenuMapper.java b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java index df9a6bc7..c9084abf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; + +import org.apache.ibatis.annotations.Param; +import top.continew.admin.system.model.entity.MenuDO; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; import java.util.Set; -import org.apache.ibatis.annotations.Param; - -import top.charles7c.continew.admin.system.model.entity.MenuDO; -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/continew/admin/system/mapper/MessageMapper.java similarity index 88% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java index 3e19b7a6..653ffcea 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java @@ -14,16 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; - -import org.apache.ibatis.annotations.Param; +package top.continew.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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 org.apache.ibatis.annotations.Param; +import top.continew.admin.system.model.entity.MessageDO; +import top.continew.admin.system.model.resp.MessageResp; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** 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/continew/admin/system/mapper/MessageUserMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java index 27ad23f7..a00c4629 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; - -import top.charles7c.continew.admin.system.model.entity.MessageUserDO; +import top.continew.admin.system.model.entity.MessageUserDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -31,7 +30,7 @@ public interface MessageUserMapper extends BaseMapper { /** * 根据用户 ID 和消息类型查询未读消息数量 - * + * * @param userId 用户 ID * @param type 消息类型 * @return 未读消息信息 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/continew/admin/system/mapper/OptionMapper.java similarity index 81% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java index 149a5028..77ac0be2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; -import top.charles7c.continew.admin.system.model.entity.OptionDO; +import top.continew.admin.system.model.entity.OptionDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -25,4 +25,5 @@ import top.continew.starter.data.mybatis.plus.base.BaseMapper; * @author Bull-BCLS * @since 2023/8/26 19:38 */ -public interface OptionMapper extends BaseMapper {} \ No newline at end of file +public interface OptionMapper extends BaseMapper { +} \ No newline at end of file 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/continew/admin/system/mapper/RoleDeptMapper.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java index 6b0ecb4c..8085acb7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.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.continew.admin.system.model.entity.RoleDeptDO; 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/continew/admin/system/mapper/RoleMapper.java similarity index 81% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java index dab3d20f..3b04e260 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; -import top.charles7c.continew.admin.system.model.entity.RoleDO; +import top.continew.admin.system.model.entity.RoleDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -25,4 +25,5 @@ import top.continew.starter.data.mybatis.plus.base.BaseMapper; * @author Charles7c * @since 2023/2/8 23:17 */ -public interface RoleMapper extends BaseMapper {} +public interface RoleMapper extends BaseMapper { +} 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/continew/admin/system/mapper/RoleMenuMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java index 19462ee4..2d52b0e9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; + +import top.continew.admin.system.model.entity.RoleMenuDO; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; -import top.charles7c.continew.admin.system.model.entity.RoleMenuDO; -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/continew/admin/system/mapper/StorageMapper.java similarity index 87% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/StorageMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java index fdc26b93..40c6846d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/StorageMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; -import top.charles7c.continew.admin.system.model.entity.StorageDO; +import top.continew.admin.system.model.entity.StorageDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** 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/continew/admin/system/mapper/UserMapper.java similarity index 90% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java index 5493f412..3d1bc209 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; 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.continew.admin.common.config.mybatis.DataPermissionMapper; +import top.continew.admin.system.model.entity.UserDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; /** 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/continew/admin/system/mapper/UserRoleMapper.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java index b2302c89..e49f4e8b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; - -import java.util.List; +package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; - -import top.charles7c.continew.admin.system.model.entity.UserRoleDO; +import top.continew.admin.system.model.entity.UserRoleDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; +import java.util.List; + /** * 用户和角色 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/continew/admin/system/mapper/UserSocialMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java index de7d233c..c0b38b83 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.mapper; +package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; - -import top.charles7c.continew.admin.system.model.entity.UserSocialDO; +import top.continew.admin.system.model.entity.UserSocialDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** @@ -31,7 +30,7 @@ public interface UserSocialMapper extends BaseMapper { /** * 根据来源和开放 ID 查询 - * + * * @param source 来源 * @param openId 开放 ID * @return 用户社会化关联信息 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/continew/admin/system/model/entity/AnnouncementDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/AnnouncementDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/AnnouncementDO.java index 34e84525..61118b96 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/continew/admin/system/model/entity/AnnouncementDO.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import top.continew.starter.extension.crud.model.entity.BaseDO; import java.io.Serial; import java.time.LocalDateTime; -import lombok.Data; - -import com.baomidou.mybatisplus.annotation.TableName; - -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/continew/admin/system/model/entity/DeptDO.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java index 6650ca4b..5a8c87af 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/continew/admin/system/model/entity/DeptDO.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; - -import lombok.Data; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; - -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; +import lombok.Data; +import top.continew.admin.common.enums.DisEnableStatusEnum; 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/DictDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java index 0a6136a1..3d4453bb 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/continew/admin/system/model/entity/DictDO.java @@ -14,16 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; - -import lombok.Data; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; - +import lombok.Data; 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/DictItemDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java index 552933e4..4a4af79d 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/continew/admin/system/model/entity/DictItemDO.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; 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/continew/admin/system/model/entity/FileDO.java similarity index 90% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java index ee710b05..c27d46ca 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/continew/admin/system/model/entity/FileDO.java @@ -14,23 +14,21 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; - -import lombok.Data; - -import org.dromara.x.file.storage.core.FileInfo; - -import com.baomidou.mybatisplus.annotation.*; +package top.continew.admin.system.model.entity; import cn.hutool.core.util.StrUtil; - -import top.charles7c.continew.admin.system.enums.FileTypeEnum; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.dromara.x.file.storage.core.FileInfo; +import top.continew.admin.system.enums.FileTypeEnum; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.URLUtils; 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/LogDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/LogDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java index 41b673ee..9c77f6fb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/LogDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.charles7c.continew.admin.system.enums.LogStatusEnum; +import top.continew.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; 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/continew/admin/system/model/entity/MenuDO.java similarity index 90% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java index 3f8c4229..598a4cde 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/continew/admin/system/model/entity/MenuDO.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; +package top.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.admin.common.enums.MenuTypeEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.MenuTypeEnum; 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/MessageDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java index e2b55a5e..707165f2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java @@ -14,20 +14,18 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -import lombok.Data; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import top.continew.admin.common.enums.MessageTypeEnum; -import top.charles7c.continew.admin.common.enums.MessageTypeEnum; +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; /** * 消息实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageUserDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageUserDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java index 91a5e3e6..6c47f271 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageUserDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java index 7b481da6..34d7a874 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -import lombok.Data; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; /** * 参数实体 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/continew/admin/system/model/entity/RoleDO.java similarity index 88% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java index e7c13c24..57460b87 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/continew/admin/system/model/entity/RoleDO.java @@ -14,18 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; - -import lombok.Data; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; - -import top.charles7c.continew.admin.common.enums.DataScopeEnum; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; +import lombok.Data; +import top.continew.admin.common.enums.DataScopeEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; 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/RoleDeptDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDeptDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java index 907474ed..ea421d92 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDeptDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.NoArgsConstructor; -import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serial; +import java.io.Serializable; /** * 角色和部门实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleMenuDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleMenuDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java index 3e54d594..82eb09b7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleMenuDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.NoArgsConstructor; -import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serial; +import java.io.Serializable; /** * 角色和菜单实体 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/continew/admin/system/model/entity/StorageDO.java similarity index 90% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/StorageDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java index eda10b54..9b5a1c61 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/continew/admin/system/model/entity/StorageDO.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; +package top.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.admin.system.enums.StorageTypeEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.system.enums.StorageTypeEnum; 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/continew/admin/system/model/entity/UserDO.java similarity index 88% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java index 07006351..d8f0d3d2 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/continew/admin/system/model/entity/UserDO.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; 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.continew.admin.common.config.mybatis.BCryptEncryptor; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserRoleDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserRoleDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java index 160b76a6..7d6b937d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserRoleDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.NoArgsConstructor; -import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serial; +import java.io.Serializable; /** * 用户和角色实体 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserSocialDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserSocialDO.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java index de688d97..053c87b0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserSocialDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.entity; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -import lombok.Data; +package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +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/continew/admin/system/model/query/AnnouncementQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/AnnouncementQuery.java index d6db1ced..1889900b 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/continew/admin/system/model/query/AnnouncementQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/DeptQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java index af80d9b2..c14e31b6 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/continew/admin/system/model/query/DeptQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/DictItemQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java index 29c1cfc2..6e999232 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/continew/admin/system/model/query/DictItemQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/DictQuery.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java index 00d37f46..6dcf38af 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/continew/admin/system/model/query/DictQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/FileQuery.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java index 6ca19c3f..55bd4175 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/continew/admin/system/model/query/FileQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/LogQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/LogQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java index 1caf2f10..119c9389 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/LogQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; @@ -54,7 +54,7 @@ public class LogQuery implements Serializable { /** * IP */ - @Schema(description = "IP", example = "192.168.0.1") + @Schema(description = "IP", example = "") private String ip; /** 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/continew/admin/system/model/query/MenuQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java index a00e6182..384829fa 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/continew/admin/system/model/query/MenuQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/MessageQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java index e23c0256..ea1adf99 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/continew/admin/system/model/query/MessageQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/OptionQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java index ca6ea9be..d84d11f3 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/continew/admin/system/model/query/OptionQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; 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/continew/admin/system/model/query/RoleQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java index 3c43cf73..b80786fc 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/continew/admin/system/model/query/RoleQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/StorageQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java index a54f84c7..ee699e1f 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/continew/admin/system/model/query/StorageQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/query/UserQuery.java similarity index 97% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java index fb208233..9844a1c2 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/continew/admin/system/model/query/UserQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.query; +package top.continew.admin.system.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; 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/continew/admin/system/model/req/AnnouncementReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/AnnouncementReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/AnnouncementReq.java index e93968c5..b843a45d 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/continew/admin/system/model/req/AnnouncementReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Future; 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/continew/admin/system/model/req/DeptReq.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java index c946efaf..9b1a693e 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/continew/admin/system/model/req/DeptReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -23,8 +23,8 @@ import jakarta.validation.constraints.NotNull; 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.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.model.req.BaseReq; import top.continew.starter.extension.crud.util.ValidateGroup; 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/continew/admin/system/model/req/DictItemReq.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java index 3f219f91..c8bfbf57 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/continew/admin/system/model/req/DictItemReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -22,7 +22,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; 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/continew/admin/system/model/req/DictReq.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java index 3392a49b..0c9fe3fc 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/continew/admin/system/model/req/DictReq.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.constant.RegexConstants; 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/continew/admin/system/model/req/FileReq.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/FileReq.java index b99f2d6a..8bedca3f 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/continew/admin/system/model/req/FileReq.java @@ -14,20 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; - -import java.io.Serial; - -import jakarta.validation.constraints.NotBlank; - -import lombok.Data; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; - +import jakarta.validation.constraints.NotBlank; +import lombok.Data; import org.hibernate.validator.constraints.Length; - import top.continew.starter.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/MenuReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java index 3c3e5e1a..b2b99210 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/continew/admin/system/model/req/MenuReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -22,8 +22,8 @@ import jakarta.validation.constraints.NotBlank; 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.admin.common.enums.MenuTypeEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.MenuTypeEnum; 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/continew/admin/system/model/req/MessageReq.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MessageReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java index 2339a099..0c1126b9 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/continew/admin/system/model/req/MessageReq.java @@ -14,22 +14,18 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; - -import java.io.Serial; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -import lombok.Data; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; - +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; import org.hibernate.validator.constraints.Length; - -import top.charles7c.continew.admin.common.enums.MessageTypeEnum; +import top.continew.admin.common.enums.MessageTypeEnum; 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/OptionReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java index dfaec067..6ec62cf0 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/continew/admin/system/model/req/OptionReq.java @@ -14,20 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; - -import java.io.Serial; - -import jakarta.validation.constraints.NotBlank; - -import lombok.Data; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; - +import jakarta.validation.constraints.NotBlank; +import lombok.Data; import org.hibernate.validator.constraints.Length; - import top.continew.starter.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/OptionResetValueReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionResetValueReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java index 2d81aa20..831cd5a3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionResetValueReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; 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/continew/admin/system/model/req/RoleReq.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java index 146a9802..6fce13f5 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/continew/admin/system/model/req/RoleReq.java @@ -14,27 +14,23 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import top.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.enums.DataScopeEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.starter.extension.crud.model.req.BaseReq; import java.io.Serial; import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; - -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -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.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/continew/admin/system/model/req/StorageReq.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java index 83bec85f..9e685438 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/continew/admin/system/model/req/StorageReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -22,9 +22,9 @@ import jakarta.validation.constraints.NotNull; 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.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.admin.system.enums.StorageTypeEnum; +import top.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.system.enums.StorageTypeEnum; 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/UserBasicInfoUpdateReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java similarity index 90% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserBasicInfoUpdateReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java index ee681676..c026269b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserBasicInfoUpdateReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java @@ -14,21 +14,18 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.system.model.req; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; - import lombok.Data; +import top.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.enums.GenderEnum; -import io.swagger.v3.oas.annotations.media.Schema; - -import top.charles7c.continew.admin.common.constant.RegexConstants; -import top.charles7c.continew.admin.common.enums.GenderEnum; +import java.io.Serial; +import java.io.Serializable; /** * 用户基础信息修改信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserEmailUpdateRequest.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserEmailUpdateRequest.java similarity index 97% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserEmailUpdateRequest.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserEmailUpdateRequest.java index dc63b2b5..32f466e2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserEmailUpdateRequest.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserEmailUpdateRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordResetReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordResetReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordResetReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordResetReq.java index 40e0e7ef..41cfcce1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordResetReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordResetReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordUpdateReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordUpdateReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordUpdateReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordUpdateReq.java index 8a446336..0b1ed10a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordUpdateReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordUpdateReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPhoneUpdateReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPhoneUpdateReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPhoneUpdateReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPhoneUpdateReq.java index cedc9070..985e8881 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPhoneUpdateReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPhoneUpdateReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; 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/continew/admin/system/model/req/UserReq.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserReq.java index 8909e52c..602af6ef 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/continew/admin/system/model/req/UserReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; @@ -24,9 +24,9 @@ import jakarta.validation.constraints.NotNull; 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.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.admin.common.enums.GenderEnum; +import top.continew.admin.common.constant.RegexConstants; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.model.req.BaseReq; import top.continew.starter.extension.crud.util.ValidateGroup; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserRoleUpdateReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserRoleUpdateReq.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserRoleUpdateReq.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserRoleUpdateReq.java index 4ea32581..801b96da 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserRoleUpdateReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserRoleUpdateReq.java @@ -14,18 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.req; +package top.continew.admin.system.model.req; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.List; -import jakarta.validation.constraints.NotEmpty; - -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * 用户角色修改信息 * 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/continew/admin/system/model/resp/AnnouncementDetailResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementDetailResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementDetailResp.java index 018f77e6..70c83727 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/continew/admin/system/model/resp/AnnouncementDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; 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/continew/admin/system/model/resp/AnnouncementResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AnnouncementResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementResp.java index 2c88344c..6909297f 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/continew/admin/system/model/resp/AnnouncementResp.java @@ -14,18 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import top.continew.admin.system.enums.AnnouncementStatusEnum; +import top.continew.starter.extension.crud.model.resp.BaseResp; import java.io.Serial; import java.time.LocalDateTime; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import top.charles7c.continew.admin.system.enums.AnnouncementStatusEnum; -import top.continew.starter.extension.crud.model.resp.BaseResp; - /** * 公告信息 * @@ -65,7 +63,7 @@ public class AnnouncementResp extends BaseResp { /** * 状态 - * + * * @return 公告状态 */ @Schema(description = "状态（1：待发布；2：已发布；3：已过期）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AvatarResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AvatarResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java index 8bed064d..cee92753 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/AvatarResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; - -import java.io.Serial; -import java.io.Serializable; +package top.continew.admin.system.model.resp; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serial; +import java.io.Serializable; /** * 头像信息 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardAccessTrendResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAccessTrendResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardAccessTrendResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAccessTrendResp.java index ac047c53..911b7dea 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardAccessTrendResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAccessTrendResp.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * 仪表盘-访问趋势信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardAnnouncementResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAnnouncementResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardAnnouncementResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAnnouncementResp.java index 5246a14d..9ea51652 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardAnnouncementResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAnnouncementResp.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * 仪表盘-公告信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardGeoDistributionResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardGeoDistributionResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardGeoDistributionResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardGeoDistributionResp.java index 9ab11dfd..1961df57 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardGeoDistributionResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardGeoDistributionResp.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Map; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * 仪表盘-访客地域分布信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardPopularModuleResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardPopularModuleResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardPopularModuleResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardPopularModuleResp.java index 215fd669..4b4e0244 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardPopularModuleResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardPopularModuleResp.java @@ -14,18 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * 仪表盘-热门模块信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardTotalResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardTotalResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardTotalResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardTotalResp.java index 4caa8e48..c033ac68 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DashboardTotalResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardTotalResp.java @@ -14,18 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * 仪表盘-总计信息 * 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/continew/admin/system/model/resp/DeptResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java index e2b19570..cbfa4774 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/continew/admin/system/model/resp/DeptResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; @@ -24,8 +24,8 @@ 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.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.admin.system.service.DeptService; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.system.service.DeptService; 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; 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/continew/admin/system/model/resp/DictItemResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java index 18de06de..1a79ce1c 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/continew/admin/system/model/resp/DictItemResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; 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.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; 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/DictResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java index f1932bd8..03d63128 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/continew/admin/system/model/resp/DictResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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/continew/admin/system/model/resp/FileResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/FileResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java index d4ba787a..76b35661 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/continew/admin/system/model/resp/FileResp.java @@ -14,19 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; - -import java.io.Serial; - -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; +package top.continew.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; - -import top.charles7c.continew.admin.system.enums.FileTypeEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import top.continew.admin.system.enums.FileTypeEnum; 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/FileUploadResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/FileUploadResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java index 411ce195..82458136 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/FileUploadResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; 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/continew/admin/system/model/resp/MenuResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java index 072b75be..676c8e72 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/continew/admin/system/model/resp/MenuResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; 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.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.MenuTypeEnum; import top.continew.starter.extension.crud.annotation.TreeField; 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/MessageResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java index 37fa4679..7ed66d6c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.admin.common.enums.MessageTypeEnum; -import top.charles7c.continew.admin.common.constant.ContainerConstants; +import top.continew.admin.common.constant.ContainerConstants; +import top.continew.admin.common.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageTypeUnreadResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageTypeUnreadResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java index 33a283d3..f272df56 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageTypeUnreadResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import top.continew.admin.common.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import top.charles7c.continew.admin.common.enums.MessageTypeEnum; - /** * 各类型未读消息信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageUnreadResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageUnreadResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java index 1fd766b7..4045aa84 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MessageUnreadResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java @@ -14,18 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.List; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import com.fasterxml.jackson.annotation.JsonInclude; - /** * 未读消息信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/OptionResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/OptionResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java index e8f04218..0baee5cd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/OptionResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java @@ -14,19 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import cn.hutool.core.util.StrUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import cn.hutool.core.util.StrUtil; - /** * 参数信息 * 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/continew/admin/system/model/resp/RoleDetailResp.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java index 2515b88b..5fc157ff 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/continew/admin/system/model/resp/RoleDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -22,9 +22,9 @@ 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.admin.common.constant.ContainerConstants; -import top.charles7c.continew.admin.common.enums.DataScopeEnum; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.constant.ContainerConstants; +import top.continew.admin.common.enums.DataScopeEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; 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/RoleResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java index 1e032a37..0574b605 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/continew/admin/system/model/resp/RoleResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; 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.continew.admin.common.enums.DataScopeEnum; +import top.continew.admin.common.enums.DisEnableStatusEnum; 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/continew/admin/system/model/resp/StorageResp.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java index 7ce33efd..8197e593 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/continew/admin/system/model/resp/StorageResp.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import com.fasterxml.jackson.annotation.JsonIgnore; 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.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.system.enums.StorageTypeEnum; 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/continew/admin/system/model/resp/UserDetailResp.java similarity index 92% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java index a06d92bf..d9f905ed 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/continew/admin/system/model/resp/UserDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.AssembleMethod; @@ -24,11 +24,11 @@ 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.admin.common.constant.ContainerConstants; -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.continew.admin.common.constant.ContainerConstants; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.GenderEnum; +import top.continew.admin.common.util.helper.LoginHelper; +import top.continew.admin.system.service.DeptService; import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; 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/UserResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java similarity index 91% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java index feaf0fad..29e4044e 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/continew/admin/system/model/resp/UserResp.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.Mapping; 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.GenderEnum; -import top.charles7c.continew.admin.common.util.helper.LoginHelper; -import top.charles7c.continew.admin.system.service.DeptService; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.GenderEnum; +import top.continew.admin.common.util.helper.LoginHelper; +import top.continew.admin.system.service.DeptService; 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; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserSocialBindResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserSocialBindResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserSocialBindResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserSocialBindResp.java index c5464178..312a40b9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserSocialBindResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserSocialBindResp.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp; +package top.continew.admin.system.model.resp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serial; import java.io.Serializable; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * 第三方账号绑定信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LogDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LogDetailResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java index b9417548..7bf9ee84 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LogDetailResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp.log; +package top.continew.admin.system.model.resp.log; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -22,8 +22,8 @@ import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.admin.common.constant.ContainerConstants; -import top.charles7c.continew.admin.system.enums.LogStatusEnum; +import top.continew.admin.common.constant.ContainerConstants; +import top.continew.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; @@ -117,7 +117,7 @@ public class LogDetailResp implements Serializable { /** * IP */ - @Schema(description = "IP", example = "192.168.0.1") + @Schema(description = "IP", example = "") private String ip; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LogResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LogResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java index a8150df1..a93ef9af 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LogResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp.log; +package top.continew.admin.system.model.resp.log; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.admin.system.enums.LogStatusEnum; +import top.continew.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; @@ -65,7 +65,7 @@ public class LogResp implements Serializable { /** * IP */ - @Schema(description = "IP", example = "192.168.0.1") + @Schema(description = "IP", example = "") private String ip; /** 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/continew/admin/system/model/resp/log/LoginLogExportResp.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/LoginLogExportResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java index d33b57db..a3efde02 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/continew/admin/system/model/resp/log/LoginLogExportResp.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp.log; +package top.continew.admin.system.model.resp.log; 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.admin.system.enums.LogStatusEnum; +import top.continew.admin.system.enums.LogStatusEnum; import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; import java.io.Serial; @@ -79,7 +79,7 @@ public class LoginLogExportResp implements Serializable { /** * 登录 IP */ - @Schema(description = "登录 IP", example = "192.168.0.1") + @Schema(description = "登录 IP", example = "") @ExcelProperty(value = "登录 IP") private String ip; 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/continew/admin/system/model/resp/log/OperationLogExportResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/log/OperationLogExportResp.java rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java index ab8fb314..29233ea4 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/continew/admin/system/model/resp/log/OperationLogExportResp.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.model.resp.log; +package top.continew.admin.system.model.resp.log; 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.admin.system.enums.LogStatusEnum; +import top.continew.admin.system.enums.LogStatusEnum; import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; import java.io.Serial; @@ -86,7 +86,7 @@ public class OperationLogExportResp implements Serializable { /** * 操作 IP */ - @Schema(description = "操作 IP", example = "192.168.0.1") + @Schema(description = "操作 IP", example = "") @ExcelProperty(value = "操作 IP") private String ip; 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/continew/admin/system/service/AnnouncementService.java similarity index 70% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/AnnouncementService.java index b28c5212..47e2bf1e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/AnnouncementService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; -import top.charles7c.continew.admin.system.model.entity.AnnouncementDO; -import top.charles7c.continew.admin.system.model.query.AnnouncementQuery; -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.continew.admin.system.model.entity.AnnouncementDO; +import top.continew.admin.system.model.query.AnnouncementQuery; +import top.continew.admin.system.model.req.AnnouncementReq; +import top.continew.admin.system.model.resp.AnnouncementDetailResp; +import top.continew.admin.system.model.resp.AnnouncementResp; +import top.continew.admin.system.model.resp.DashboardAnnouncementResp; import top.continew.starter.extension.crud.service.BaseService; import top.continew.starter.data.mybatis.plus.service.IService; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DashboardService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java similarity index 93% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DashboardService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java index b64fecab..570705b3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DashboardService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; -import top.charles7c.continew.admin.system.model.resp.*; +import top.continew.admin.system.model.resp.*; 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/continew/admin/system/service/DeptService.java similarity index 71% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/DeptService.java index 6a229b37..5c16ec94 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/DeptService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; -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.continew.admin.system.model.entity.DeptDO; +import top.continew.admin.system.model.query.DeptQuery; +import top.continew.admin.system.model.req.DeptReq; +import top.continew.admin.system.model.resp.DeptResp; import top.continew.starter.data.mybatis.plus.service.IService; import top.continew.starter.extension.crud.service.BaseService; @@ -29,4 +29,5 @@ import top.continew.starter.extension.crud.service.BaseService; * @author Charles7c * @since 2023/1/22 17:54 */ -public interface DeptService extends BaseService, IService {} +public interface DeptService extends BaseService, IService { +} 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/continew/admin/system/service/DictItemService.java similarity index 77% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/DictItemService.java index 39249d27..c22b45ec 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/DictItemService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; -import top.charles7c.continew.admin.common.model.resp.LabelValueResp; -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.continew.admin.common.model.resp.LabelValueResp; +import top.continew.admin.system.model.entity.DictItemDO; +import top.continew.admin.system.model.query.DictItemQuery; +import top.continew.admin.system.model.req.DictItemReq; +import top.continew.admin.system.model.resp.DictItemResp; import top.continew.starter.data.mybatis.plus.service.IService; import top.continew.starter.extension.crud.service.BaseService; @@ -37,7 +37,7 @@ public interface DictItemService extends BaseService, IService {} \ No newline at end of file +public interface DictService extends BaseService, IService { +} \ No newline at end of file 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/continew/admin/system/service/FileService.java similarity index 84% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/FileService.java index aee7abd9..236da0ad 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/FileService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; import org.dromara.x.file.storage.core.FileInfo; import org.springframework.web.multipart.MultipartFile; -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.continew.admin.system.model.entity.FileDO; +import top.continew.admin.system.model.query.FileQuery; +import top.continew.admin.system.model.req.FileReq; +import top.continew.admin.system.model.resp.FileResp; 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/LogService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/LogService.java similarity index 86% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/LogService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/LogService.java index 83b253aa..7539b1b0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/LogService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/LogService.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; import jakarta.servlet.http.HttpServletResponse; -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.continew.admin.system.model.query.LogQuery; +import top.continew.admin.system.model.resp.DashboardAccessTrendResp; +import top.continew.admin.system.model.resp.DashboardPopularModuleResp; +import top.continew.admin.system.model.resp.DashboardTotalResp; +import top.continew.admin.system.model.resp.log.LogDetailResp; +import top.continew.admin.system.model.resp.log.LogResp; 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; 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/continew/admin/system/service/MenuService.java similarity index 82% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/MenuService.java index 4bfc4e96..8f69d6a3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/MenuService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; -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.continew.admin.system.model.entity.MenuDO; +import top.continew.admin.system.model.query.MenuQuery; +import top.continew.admin.system.model.req.MenuReq; +import top.continew.admin.system.model.resp.MenuResp; import top.continew.starter.extension.crud.service.BaseService; import top.continew.starter.data.mybatis.plus.service.IService; 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/continew/admin/system/service/MessageService.java similarity index 82% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/MessageService.java index 07a9e2f4..67fe7f74 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; 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.continew.admin.system.model.query.MessageQuery; +import top.continew.admin.system.model.req.MessageReq; +import top.continew.admin.system.model.resp.MessageResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; @@ -52,8 +52,7 @@ public interface MessageService { /** * 删除 * - * @param ids - * ID 列表 + * @param ids ID 列表 */ void delete(List ids); } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageUserService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java similarity index 87% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageUserService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java index 14db41ca..f53f3140 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MessageUserService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; import java.util.List; -import top.charles7c.continew.admin.system.model.resp.MessageUnreadResp; +import top.continew.admin.system.model.resp.MessageUnreadResp; /** * 消息和用户关联业务接口 @@ -30,7 +30,7 @@ public interface MessageUserService { /** * 根据用户 ID 查询未读消息数量 - * + * * @param userId 用户 ID * @param isDetail 是否查询详情 * @return 未读消息信息 @@ -48,8 +48,7 @@ public interface MessageUserService { /** * 将消息标记已读 * - * @param ids - * 消息ID（为空则将所有消息标记已读） + * @param ids 消息ID（为空则将所有消息标记已读） */ void readMessage(List ids); diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/OptionService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/OptionService.java similarity index 72% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/OptionService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/OptionService.java index 1dd60d7b..4043ea61 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/OptionService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/OptionService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; import java.util.List; -import top.charles7c.continew.admin.system.model.query.OptionQuery; -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.continew.admin.system.model.query.OptionQuery; +import top.continew.admin.system.model.req.OptionReq; +import top.continew.admin.system.model.req.OptionResetValueReq; +import top.continew.admin.system.model.resp.OptionResp; /** * 参数业务接口 @@ -42,16 +42,14 @@ public interface OptionService { /** * 修改参数 * - * @param req - * 参数信息 + * @param req 参数信息 */ void update(List req); /** * 重置参数 * - * @param req - * 重置信息 + * @param req 重置信息 */ void resetValue(OptionResetValueReq req); } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleDeptService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleDeptService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java index 1bf1b471..cb857d78 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleDeptService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleMenuService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java similarity index 96% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleMenuService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java index a18b5703..cd9b5940 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleMenuService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; import java.util.List; 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/continew/admin/system/service/RoleService.java similarity index 76% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java index 81f4daa0..0b8e55cd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service; +package top.continew.admin.system.service; -import top.charles7c.continew.admin.common.model.dto.RoleDTO; -import top.charles7c.continew.admin.common.model.resp.LabelValueResp; -import top.charles7c.continew.admin.system.model.entity.RoleDO; -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.continew.admin.common.model.dto.RoleDTO; +import top.continew.admin.common.model.resp.LabelValueResp; +import top.continew.admin.system.model.entity.RoleDO; +import top.continew.admin.system.model.query.RoleQuery; +import top.continew.admin.system.model.req.RoleReq; +import top.continew.admin.system.model.resp.RoleDetailResp; +import top.continew.admin.system.model.resp.RoleResp; import top.continew.starter.extension.crud.service.BaseService; import top.continew.starter.data.mybatis.plus.service.IService; @@ -48,8 +48,7 @@ public interface RoleService extends BaseService listNameByIds(List ids); @@ -72,7 +71,7 @@ public interface RoleService extends BaseService ids) { 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/continew/admin/system/service/impl/DictItemServiceImpl.java similarity index 82% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictItemServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java index f4343282..609119d5 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/continew/admin/system/service/impl/DictItemServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service.impl; +package top.continew.admin.system.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.charles7c.continew.admin.common.model.resp.LabelValueResp; -import top.charles7c.continew.admin.system.mapper.DictItemMapper; -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.admin.system.service.DictItemService; +import top.continew.admin.common.model.resp.LabelValueResp; +import top.continew.admin.system.mapper.DictItemMapper; +import top.continew.admin.system.model.entity.DictItemDO; +import top.continew.admin.system.model.query.DictItemQuery; +import top.continew.admin.system.model.req.DictItemReq; +import top.continew.admin.system.model.resp.DictItemResp; +import top.continew.admin.system.service.DictItemService; import top.continew.starter.core.util.validate.CheckUtils; 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/DictServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java similarity index 86% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/DictServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java index 44b0a906..567b9d9e 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/continew/admin/system/service/impl/DictServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service.impl; +package top.continew.admin.system.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.charles7c.continew.admin.system.mapper.DictMapper; -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.admin.system.service.DictItemService; -import top.charles7c.continew.admin.system.service.DictService; +import top.continew.admin.system.mapper.DictMapper; +import top.continew.admin.system.model.entity.DictDO; +import top.continew.admin.system.model.query.DictQuery; +import top.continew.admin.system.model.req.DictReq; +import top.continew.admin.system.model.resp.DictResp; +import top.continew.admin.system.service.DictItemService; +import top.continew.admin.system.service.DictService; import top.continew.starter.core.util.validate.CheckUtils; 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/FileServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java similarity index 87% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java index ad7147f2..2fc45dae 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/continew/admin/system/service/impl/FileServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service.impl; +package top.continew.admin.system.service.impl; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; @@ -27,15 +27,15 @@ import org.dromara.x.file.storage.core.ProgressListener; import org.dromara.x.file.storage.core.upload.UploadPretreatment; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import top.charles7c.continew.admin.system.enums.StorageTypeEnum; -import top.charles7c.continew.admin.system.mapper.FileMapper; -import top.charles7c.continew.admin.system.model.entity.FileDO; -import top.charles7c.continew.admin.system.model.entity.StorageDO; -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.admin.system.service.StorageService; +import top.continew.admin.system.enums.StorageTypeEnum; +import top.continew.admin.system.mapper.FileMapper; +import top.continew.admin.system.model.entity.FileDO; +import top.continew.admin.system.model.entity.StorageDO; +import top.continew.admin.system.model.query.FileQuery; +import top.continew.admin.system.model.req.FileReq; +import top.continew.admin.system.model.resp.FileResp; +import top.continew.admin.system.service.FileService; +import top.continew.admin.system.service.StorageService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.URLUtils; import top.continew.starter.core.util.validate.CheckUtils; @@ -56,9 +56,9 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class FileServiceImpl extends BaseServiceImpl implements FileService { + private final FileStorageService fileStorageService; @Resource private StorageService storageService; - private final FileStorageService fileStorageService; @Override protected void beforeDelete(List ids) { 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/continew/admin/system/service/impl/LogServiceImpl.java similarity index 89% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/LogServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java index c9b04615..e31c402e 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/continew/admin/system/service/impl/LogServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service.impl; +package top.continew.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.bean.BeanUtil; @@ -29,15 +29,17 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import top.charles7c.continew.admin.system.mapper.LogMapper; -import top.charles7c.continew.admin.system.model.entity.LogDO; -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.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.continew.admin.system.mapper.LogMapper; +import top.continew.admin.system.model.entity.LogDO; +import top.continew.admin.system.model.query.LogQuery; +import top.continew.admin.system.model.resp.DashboardAccessTrendResp; +import top.continew.admin.system.model.resp.DashboardPopularModuleResp; +import top.continew.admin.system.model.resp.DashboardTotalResp; +import top.continew.admin.system.model.resp.log.LogDetailResp; +import top.continew.admin.system.model.resp.log.LogResp; +import top.continew.admin.system.model.resp.log.LoginLogExportResp; +import top.continew.admin.system.model.resp.log.OperationLogExportResp; +import top.continew.admin.system.service.LogService; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.core.util.validate.ValidationUtils; import top.continew.starter.extension.crud.model.query.PageQuery; 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/continew/admin/system/service/impl/MenuServiceImpl.java similarity index 83% rename from continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java rename to continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java index ff1e582e..69c976d1 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/continew/admin/system/service/impl/MenuServiceImpl.java @@ -14,23 +14,24 @@ * limitations under the License. */ -package top.charles7c.continew.admin.system.service.impl; +package top.continew.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; import com.alicp.jetcache.anno.CacheInvalidate; import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.charles7c.continew.admin.common.constant.CacheConstants; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.admin.common.enums.MenuTypeEnum; -import top.charles7c.continew.admin.system.mapper.MenuMapper; -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.admin.system.service.MenuService; +import top.continew.admin.common.constant.CacheConstants; +import top.continew.admin.common.enums.DisEnableStatusEnum; +import top.continew.admin.common.enums.MenuTypeEnum; +import top.continew.admin.system.mapper.MenuMapper; +import top.continew.admin.system.model.entity.MenuDO; +import top.continew.admin.system.model.query.MenuQuery; +import top.continew.admin.system.model.req.MenuReq; +import top.continew.admin.system.model.resp.MenuResp; +import top.continew.admin.system.service.MenuService; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; @@ -52,8 +53,9 @@ public class MenuServiceImpl extends BaseServiceImpl - + + + + + - SELECT t1.id, t1.description, @@ -41,7 +41,7 @@ ${ew.customSqlSegment} - SELECT (SELECT COUNT(*) FROM sys_log) AS pvCount, (SELECT COUNT(DISTINCT ip) FROM sys_log) AS ipCount, @@ -50,7 +50,7 @@ SELECT DISTINCT t1.permission FROM sys_menu AS t1 @@ -14,7 +14,7 @@ AND t3.status = 1 - SELECT t1.* FROM sys_menu AS t1 LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id diff --git a/continew-admin-system/src/main/resources/mapper/MessageMapper.xml b/continew-admin-system/src/main/resources/mapper/MessageMapper.xml index 4588b8d9..69599648 100644 --- a/continew-admin-system/src/main/resources/mapper/MessageMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/MessageMapper.xml @@ -1,7 +1,7 @@ - - SELECT t1.*, t2.user_id, diff --git a/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml b/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml index 99c5204c..8b6ae76e 100644 --- a/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml @@ -1,6 +1,6 @@ - + SELECT menu_id FROM sys_role_menu diff --git a/continew-admin-system/src/main/resources/mapper/UserMapper.xml b/continew-admin-system/src/main/resources/mapper/UserMapper.xml index b50032d6..b530ced4 100644 --- a/continew-admin-system/src/main/resources/mapper/UserMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/UserMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml b/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml index 8193dc10..56deed3d 100644 --- a/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml @@ -1,8 +1,8 @@ - +