diff --git a/pom.xml b/pom.xml index a2e0e534..4c1cc0b7 100644 --- a/pom.xml +++ b/pom.xml @@ -15,18 +15,17 @@ 2.0.0 - top.continew - continew-admin + com.zayac + zayac-admin ${revision} pom ContiNew Admin（Continue New Admin）持续迭代优化的前后端分离中后台管理系统框架，开箱即用，持续提供舒适的开发体验。 - https://github.com/Charles7c/continew-admin - continew-admin-webapi - continew-admin-system - continew-admin-generator - continew-admin-common + zayac-admin-webapi + zayac-admin-system + zayac-admin-generator + zayac-admin-common @@ -39,29 +38,29 @@ - top.continew - continew-admin-webapi + com.zayac + zayac-admin-webapi ${revision} - top.continew - continew-admin-generator + com.zayac + zayac-admin-generator ${revision} - top.continew - continew-admin-system + com.zayac + zayac-admin-system ${revision} - top.continew - continew-admin-common + com.zayac + zayac-admin-common ${revision} diff --git a/continew-admin-common/pom.xml b/zayac-admin-common/pom.xml similarity index 97% rename from continew-admin-common/pom.xml rename to zayac-admin-common/pom.xml index 24e9d5dc..293cbcb9 100644 --- a/continew-admin-common/pom.xml +++ b/zayac-admin-common/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew - continew-admin + com.zayac + zayac-admin ${revision} - continew-admin-common + zayac-admin-common 公共模块（存放公共工具类，公共配置等） diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/WebMvcConfiguration.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/WebMvcConfiguration.java similarity index 98% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/WebMvcConfiguration.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/WebMvcConfiguration.java index fa41fd5f..f8114eea 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/WebMvcConfiguration.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/WebMvcConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config; +package com.zayac.admin.common.config; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/BaseEnumDeserializer.java similarity index 98% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/BaseEnumDeserializer.java index 738729a8..b2276353 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumDeserializer.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/BaseEnumDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.jackson; +package com.zayac.admin.common.config.jackson; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/BaseEnumSerializer.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/BaseEnumSerializer.java index c2488006..0c8cd36a 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/BaseEnumSerializer.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/BaseEnumSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.jackson; +package com.zayac.admin.common.config.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/JacksonConfiguration.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/JacksonConfiguration.java index 3d76a9ba..72f6430e 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/JacksonConfiguration.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/JacksonConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.jackson; +package com.zayac.admin.common.config.jackson; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/SimpleDeserializersWrapper.java similarity index 98% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/SimpleDeserializersWrapper.java index 99d6a536..b27ddb89 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/jackson/SimpleDeserializersWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.jackson; +package com.zayac.admin.common.config.jackson; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.DeserializationConfig; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/BCryptEncryptor.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/BCryptEncryptor.java index 2d296ef6..22b21c40 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/BCryptEncryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.mybatis; +package com.zayac.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/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/DataPermissionFilterImpl.java similarity index 92% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/DataPermissionFilterImpl.java index 0916f330..029f1153 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/DataPermissionFilterImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.common.config.mybatis; +package com.zayac.admin.common.config.mybatis; import cn.hutool.core.convert.Convert; -import top.continew.admin.common.model.dto.LoginUser; -import top.continew.admin.common.util.helper.LoginHelper; +import com.zayac.admin.common.model.dto.LoginUser; +import com.zayac.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/continew/admin/common/config/mybatis/DataPermissionMapper.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/DataPermissionMapper.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/DataPermissionMapper.java index 59bfc2a0..fc80a1e4 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/DataPermissionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.mybatis; +package com.zayac.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 1544f523..7a45d4b6 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.common.config.mybatis; +package com.zayac.admin.common.config.mybatis; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.zayac.admin.common.util.helper.LoginHelper; import org.apache.ibatis.reflection.MetaObject; -import top.continew.admin.common.util.helper.LoginHelper; import top.continew.starter.core.exception.BusinessException; import top.continew.starter.extension.crud.model.entity.BaseDO; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/MybatisPlusConfiguration.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/MybatisPlusConfiguration.java index 153b2ca0..32f5e945 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/mybatis/MybatisPlusConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.mybatis; +package com.zayac.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.springframework.context.annotation.Bean; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/properties/CaptchaProperties.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/properties/CaptchaProperties.java index 2b8fc526..675a3c47 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/properties/CaptchaProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.properties; +package com.zayac.admin.common.config.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/properties/RsaProperties.java similarity index 95% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/config/properties/RsaProperties.java index 158f62b6..8eea4c80 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/config/properties/RsaProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.config.properties; +package com.zayac.admin.common.config.properties; import cn.hutool.extra.spring.SpringUtil; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/CacheConstants.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/constant/CacheConstants.java index 79d869d6..a75cb8be 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/CacheConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.constant; +package com.zayac.admin.common.constant; import top.continew.starter.core.constant.StringConstants; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/ContainerConstants.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/constant/ContainerConstants.java index d67070bd..01b15bdd 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/ContainerConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.constant; +package com.zayac.admin.common.constant; import top.continew.starter.extension.crud.constant.ContainerPool; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/RegexConstants.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/constant/RegexConstants.java index af42d93d..7dc0220c 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/RegexConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.constant; +package com.zayac.admin.common.constant; /** * 正则相关常量 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/SysConstants.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/constant/SysConstants.java index 3f82f348..7a8564cd 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/SysConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.constant; +package com.zayac.admin.common.constant; /** * 系统相关常量 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/UiConstants.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/constant/UiConstants.java index 48cadc7a..49d7d83c 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/constant/UiConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.constant; +package com.zayac.admin.common.constant; /** * UI 相关常量 diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/DataScopeEnum.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/enums/DataScopeEnum.java index 7f669caa..9110d307 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/DataScopeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package com.zayac.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/DisEnableStatusEnum.java similarity index 92% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/enums/DisEnableStatusEnum.java index 4996a271..f351f2a3 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/DisEnableStatusEnum.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package com.zayac.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.admin.common.constant.UiConstants; +import com.zayac.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/GenderEnum.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/enums/GenderEnum.java index 24cd8897..568d85bc 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/GenderEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package com.zayac.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/MenuTypeEnum.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/enums/MenuTypeEnum.java index d5659c5e..d85abde8 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/MenuTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package com.zayac.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/MessageTypeEnum.java similarity index 92% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/enums/MessageTypeEnum.java index 8a45b33e..5a10f582 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/MessageTypeEnum.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package com.zayac.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.admin.common.constant.UiConstants; +import com.zayac.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/SocialSourceEnum.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/enums/SocialSourceEnum.java index dd1872d7..efbe87c3 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/SocialSourceEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package com.zayac.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/SuccessFailureStatusEnum.java similarity index 92% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/enums/SuccessFailureStatusEnum.java index 1212653e..17b64669 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/enums/SuccessFailureStatusEnum.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package com.zayac.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.admin.common.constant.UiConstants; +import com.zayac.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/LoginUser.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/dto/LoginUser.java similarity index 95% rename from continew-admin-common/src/main/java/top/continew/admin/common/model/dto/LoginUser.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/model/dto/LoginUser.java index ab6ada69..d415ccea 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/LoginUser.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/dto/LoginUser.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.common.model.dto; +package com.zayac.admin.common.model.dto; import cn.hutool.core.collection.CollUtil; import lombok.Data; -import top.continew.admin.common.constant.SysConstants; +import com.zayac.admin.common.constant.SysConstants; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/RoleDTO.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/dto/RoleDTO.java similarity index 91% rename from continew-admin-common/src/main/java/top/continew/admin/common/model/dto/RoleDTO.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/model/dto/RoleDTO.java index 212c92a8..c7dd7d17 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/model/dto/RoleDTO.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/dto/RoleDTO.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.common.model.dto; +package com.zayac.admin.common.model.dto; import lombok.Data; -import top.continew.admin.common.enums.DataScopeEnum; +import com.zayac.admin.common.enums.DataScopeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/resp/CaptchaResp.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/model/resp/CaptchaResp.java index dd52ad54..258c9d06 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/resp/CaptchaResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.model.resp; +package com.zayac.admin.common.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/LabelValueResp.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/resp/LabelValueResp.java similarity index 97% rename from continew-admin-common/src/main/java/top/continew/admin/common/model/resp/LabelValueResp.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/model/resp/LabelValueResp.java index f2afb83a..35144f67 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/LabelValueResp.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/model/resp/LabelValueResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.model.resp; +package com.zayac.admin.common.model.resp; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/util/SecureUtils.java similarity index 95% rename from continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/util/SecureUtils.java index 0ba46587..4844a903 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/util/SecureUtils.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.common.util; +package com.zayac.admin.common.util; import cn.hutool.core.codec.Base64; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.asymmetric.KeyType; -import top.continew.admin.common.config.properties.RsaProperties; +import com.zayac.admin.common.config.properties.RsaProperties; import top.continew.starter.core.util.validate.ValidationUtils; /** diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java b/zayac-admin-common/src/main/java/com/zayac/admin/common/util/helper/LoginHelper.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java rename to zayac-admin-common/src/main/java/com/zayac/admin/common/util/helper/LoginHelper.java index 9812a7ad..d8143823 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java +++ b/zayac-admin-common/src/main/java/com/zayac/admin/common/util/helper/LoginHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.util.helper; +package com.zayac.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.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.model.dto.LoginUser; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.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/zayac-admin-generator/pom.xml similarity index 70% rename from continew-admin-generator/pom.xml rename to zayac-admin-generator/pom.xml index 7ba680fc..22bb9203 100644 --- a/continew-admin-generator/pom.xml +++ b/zayac-admin-generator/pom.xml @@ -4,19 +4,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew - continew-admin + com.zayac + zayac-admin ${revision} - continew-admin-generator + zayac-admin-generator 代码生成器插件 - top.continew - continew-admin-common + com.zayac + zayac-admin-common \ No newline at end of file diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/config/properties/GeneratorProperties.java similarity index 97% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/config/properties/GeneratorProperties.java index dbd489f8..1f1a41b4 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/config/properties/GeneratorProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.config.properties; +package com.zayac.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/continew/admin/generator/enums/FormTypeEnum.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/enums/FormTypeEnum.java similarity index 96% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/enums/FormTypeEnum.java index e246d8b6..ff40149c 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/enums/FormTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.enums; +package com.zayac.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/enums/QueryTypeEnum.java similarity index 98% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/enums/QueryTypeEnum.java index a5e80098..0efb1e7b 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/enums/QueryTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.enums; +package com.zayac.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/mapper/FieldConfigMapper.java similarity index 92% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/mapper/FieldConfigMapper.java index da2e83d4..ba4ed329 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/mapper/FieldConfigMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.generator.mapper; +package com.zayac.admin.generator.mapper; +import com.zayac.admin.generator.model.entity.FieldConfigDO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.continew.admin.generator.model.entity.FieldConfigDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/mapper/GenConfigMapper.java similarity index 88% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/mapper/GenConfigMapper.java index bc3290cd..2cfcf2a2 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/mapper/GenConfigMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.admin.generator.mapper; +package com.zayac.admin.generator.mapper; -import top.continew.admin.generator.model.entity.GenConfigDO; +import com.zayac.admin.generator.model.entity.GenConfigDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/entity/FieldConfigDO.java similarity index 96% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/entity/FieldConfigDO.java index 3a17c2e8..8c6ba4d8 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/entity/FieldConfigDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.model.entity; +package com.zayac.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.continew.admin.generator.enums.FormTypeEnum; -import top.continew.admin.generator.enums.QueryTypeEnum; +import com.zayac.admin.generator.enums.FormTypeEnum; +import com.zayac.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/continew/admin/generator/model/entity/GenConfigDO.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/entity/GenConfigDO.java similarity index 95% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/entity/GenConfigDO.java index d04e4eef..cd5165b1 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/entity/GenConfigDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.model.entity; +package com.zayac.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.continew.admin.common.constant.RegexConstants; +import com.zayac.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.continew.admin.system") + @Schema(description = "包名称", example = "zayac.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/continew/admin/generator/model/query/TableQuery.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/query/TableQuery.java similarity index 95% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/query/TableQuery.java index 214bf3b5..89f043ba 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/query/TableQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.model.query; +package com.zayac.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/continew/admin/generator/model/req/GenConfigReq.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/req/GenConfigReq.java similarity index 90% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/req/GenConfigReq.java index dc0a258f..5352caa6 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/req/GenConfigReq.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package top.continew.admin.generator.model.req; +package com.zayac.admin.generator.model.req; import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import com.zayac.admin.generator.model.entity.FieldConfigDO; +import com.zayac.admin.generator.model.entity.GenConfigDO; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -29,9 +31,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -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/continew/admin/generator/model/resp/GeneratePreviewResp.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/resp/GeneratePreviewResp.java similarity index 96% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/resp/GeneratePreviewResp.java index a07168a7..4d07824d 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/resp/GeneratePreviewResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.model.resp; +package com.zayac.admin.generator.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/resp/TableResp.java similarity index 97% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/resp/TableResp.java index 81269b22..d219e9c3 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/model/resp/TableResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.model.resp; +package com.zayac.admin.generator.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/service/GeneratorService.java similarity index 85% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/service/GeneratorService.java index baad0745..6382c821 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/service/GeneratorService.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package top.continew.admin.generator.service; +package com.zayac.admin.generator.service; +import com.zayac.admin.generator.model.entity.FieldConfigDO; +import com.zayac.admin.generator.model.entity.GenConfigDO; +import com.zayac.admin.generator.model.query.TableQuery; +import com.zayac.admin.generator.model.req.GenConfigReq; +import com.zayac.admin.generator.model.resp.GeneratePreviewResp; +import com.zayac.admin.generator.model.resp.TableResp; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -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/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/service/impl/GeneratorServiceImpl.java similarity index 96% rename from continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java rename to zayac-admin-generator/src/main/java/com/zayac/admin/generator/service/impl/GeneratorServiceImpl.java index 573eb64a..42dc19fb 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/zayac-admin-generator/src/main/java/com/zayac/admin/generator/service/impl/GeneratorServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.generator.service.impl; +package com.zayac.admin.generator.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -27,23 +27,23 @@ import cn.hutool.core.util.ZipUtil; import cn.hutool.db.meta.Column; import cn.hutool.system.SystemUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zayac.admin.generator.config.properties.GeneratorProperties; +import com.zayac.admin.generator.model.entity.FieldConfigDO; +import com.zayac.admin.generator.model.entity.GenConfigDO; +import com.zayac.admin.generator.model.query.TableQuery; +import com.zayac.admin.generator.model.req.GenConfigReq; +import com.zayac.admin.generator.model.resp.GeneratePreviewResp; +import com.zayac.admin.generator.model.resp.TableResp; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -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 com.zayac.admin.generator.enums.QueryTypeEnum; +import com.zayac.admin.generator.mapper.FieldConfigMapper; +import com.zayac.admin.generator.mapper.GenConfigMapper; +import com.zayac.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; diff --git a/continew-admin-generator/src/main/resources/templates/backend/Controller.ftl b/zayac-admin-generator/src/main/resources/templates/backend/Controller.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/Controller.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/Controller.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/DetailResp.ftl b/zayac-admin-generator/src/main/resources/templates/backend/DetailResp.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/DetailResp.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/DetailResp.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/Entity.ftl b/zayac-admin-generator/src/main/resources/templates/backend/Entity.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/Entity.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/Entity.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl b/zayac-admin-generator/src/main/resources/templates/backend/Mapper.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/Mapper.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/Query.ftl b/zayac-admin-generator/src/main/resources/templates/backend/Query.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/Query.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/Query.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/Req.ftl b/zayac-admin-generator/src/main/resources/templates/backend/Req.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/Req.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/Req.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/Resp.ftl b/zayac-admin-generator/src/main/resources/templates/backend/Resp.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/Resp.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/Resp.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/Service.ftl b/zayac-admin-generator/src/main/resources/templates/backend/Service.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/Service.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/Service.ftl diff --git a/continew-admin-generator/src/main/resources/templates/backend/ServiceImpl.ftl b/zayac-admin-generator/src/main/resources/templates/backend/ServiceImpl.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/backend/ServiceImpl.ftl rename to zayac-admin-generator/src/main/resources/templates/backend/ServiceImpl.ftl diff --git a/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl b/zayac-admin-generator/src/main/resources/templates/frontend/AddModal.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl rename to zayac-admin-generator/src/main/resources/templates/frontend/AddModal.ftl diff --git a/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl b/zayac-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl rename to zayac-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl diff --git a/continew-admin-generator/src/main/resources/templates/frontend/api.ftl b/zayac-admin-generator/src/main/resources/templates/frontend/api.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/frontend/api.ftl rename to zayac-admin-generator/src/main/resources/templates/frontend/api.ftl diff --git a/continew-admin-generator/src/main/resources/templates/frontend/index.ftl b/zayac-admin-generator/src/main/resources/templates/frontend/index.ftl similarity index 100% rename from continew-admin-generator/src/main/resources/templates/frontend/index.ftl rename to zayac-admin-generator/src/main/resources/templates/frontend/index.ftl diff --git a/continew-admin-system/pom.xml b/zayac-admin-system/pom.xml similarity index 79% rename from continew-admin-system/pom.xml rename to zayac-admin-system/pom.xml index 87b4bcd1..b0147ba1 100644 --- a/continew-admin-system/pom.xml +++ b/zayac-admin-system/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew - continew-admin + com.zayac + zayac-admin ${revision} - continew-admin-system + zayac-admin-system 系统管理模块（存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等） @@ -21,8 +21,8 @@ - top.continew - continew-admin-common + com.zayac + zayac-admin-common \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/config/satoken/SaTokenConfiguration.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/config/satoken/SaTokenConfiguration.java index 157b8548..780183f9 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/config/satoken/SaTokenConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.config.satoken; +package com.zayac.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/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/config/satoken/SaTokenPermissionImpl.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/config/satoken/SaTokenPermissionImpl.java index 9c9afa08..eee197ee 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/config/satoken/SaTokenPermissionImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.auth.config.satoken; +package com.zayac.admin.auth.config.satoken; import cn.dev33.satoken.stp.StpInterface; -import top.continew.admin.common.model.dto.LoginUser; -import top.continew.admin.common.util.helper.LoginHelper; +import com.zayac.admin.common.model.dto.LoginUser; +import com.zayac.admin.common.util.helper.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/query/OnlineUserQuery.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/query/OnlineUserQuery.java index aff46021..342f654e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/query/OnlineUserQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.query; +package com.zayac.admin.auth.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/continew/admin/auth/model/req/AccountLoginReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/AccountLoginReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/AccountLoginReq.java index 5e0aa473..2dfcdded 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/AccountLoginReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.req; +package com.zayac.admin.auth.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/continew/admin/auth/model/req/EmailLoginReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/EmailLoginReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/EmailLoginReq.java index 5050dec3..2bca873a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/EmailLoginReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.req; +package com.zayac.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/continew/admin/auth/model/req/PhoneLoginReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/PhoneLoginReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/PhoneLoginReq.java index a7ed7584..a4ec0e48 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/req/PhoneLoginReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.req; +package com.zayac.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/continew/admin/auth/model/resp/LoginResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/LoginResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/LoginResp.java index e890258e..ba30dfb3 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/LoginResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.resp; +package com.zayac.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/continew/admin/auth/model/resp/OnlineUserResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/OnlineUserResp.java similarity index 98% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/OnlineUserResp.java index f86a33c7..fd75b992 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/OnlineUserResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.resp; +package com.zayac.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/RouteResp.java similarity index 98% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/RouteResp.java index 80ead42b..bf8e5dcd 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/RouteResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.resp; +package com.zayac.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/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/SocialAuthAuthorizeResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/SocialAuthAuthorizeResp.java index 60ac7894..2934760b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/SocialAuthAuthorizeResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.model.resp; +package com.zayac.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/continew/admin/auth/model/resp/UserInfoResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/UserInfoResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/UserInfoResp.java index 4656c2ff..fca2da81 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/model/resp/UserInfoResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.auth.model.resp; +package com.zayac.admin.auth.model.resp; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.GenderEnum; +import com.zayac.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/continew/admin/auth/service/LoginService.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/LoginService.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/LoginService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/service/LoginService.java index 8a46565d..915ae5ad 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/LoginService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/LoginService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.auth.service; +package com.zayac.admin.auth.service; +import com.zayac.admin.auth.model.resp.RouteResp; 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/continew/admin/auth/service/OnlineUserService.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/OnlineUserService.java similarity index 88% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/service/OnlineUserService.java index e0cbf2e6..9e15d4a2 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/OnlineUserService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.auth.service; +package com.zayac.admin.auth.service; -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 com.zayac.admin.auth.model.query.OnlineUserQuery; +import com.zayac.admin.auth.model.resp.OnlineUserResp; +import com.zayac.admin.common.model.dto.LoginUser; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/PermissionService.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/PermissionService.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/PermissionService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/service/PermissionService.java index 5536870b..639e5c6c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/PermissionService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/PermissionService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.service; +package com.zayac.admin.auth.service; import java.util.Set; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/LoginServiceImpl.java similarity index 88% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/LoginServiceImpl.java index 1aba3a64..e4a13639 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/LoginServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.service.impl; +package com.zayac.admin.auth.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -25,29 +25,30 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.zayac.admin.auth.model.resp.RouteResp; +import com.zayac.admin.system.service.*; import lombok.RequiredArgsConstructor; import me.zhyd.oauth.model.AuthUser; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.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 com.zayac.admin.auth.service.LoginService; +import com.zayac.admin.auth.service.PermissionService; +import com.zayac.admin.common.constant.RegexConstants; +import com.zayac.admin.common.constant.SysConstants; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.common.enums.GenderEnum; +import com.zayac.admin.common.enums.MenuTypeEnum; +import com.zayac.admin.common.enums.MessageTypeEnum; +import com.zayac.admin.common.model.dto.LoginUser; +import com.zayac.admin.common.util.helper.LoginHelper; +import com.zayac.admin.system.enums.MessageTemplateEnum; +import com.zayac.admin.system.model.entity.DeptDO; +import com.zayac.admin.system.model.entity.RoleDO; +import com.zayac.admin.system.model.entity.UserDO; +import com.zayac.admin.system.model.entity.UserSocialDO; +import com.zayac.admin.system.model.req.MessageReq; +import com.zayac.admin.system.model.resp.MenuResp; +import com.zayac.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; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/OnlineUserServiceImpl.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/OnlineUserServiceImpl.java index acadc394..34378ec2 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/OnlineUserServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.service.impl; +package com.zayac.admin.auth.service.impl; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.exception.NotLoginException; @@ -23,12 +23,12 @@ 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 com.zayac.admin.auth.model.query.OnlineUserQuery; +import com.zayac.admin.auth.model.resp.OnlineUserResp; 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 com.zayac.admin.auth.service.OnlineUserService; +import com.zayac.admin.common.model.dto.LoginUser; +import com.zayac.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; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/PermissionServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/PermissionServiceImpl.java similarity index 85% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/PermissionServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/PermissionServiceImpl.java index c9aeff7b..69928cb7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/PermissionServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/PermissionServiceImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.auth.service.impl; +package com.zayac.admin.auth.service.impl; import cn.hutool.core.collection.CollUtil; +import com.zayac.admin.system.service.MenuService; +import com.zayac.admin.system.service.RoleService; 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 com.zayac.admin.auth.service.PermissionService; +import com.zayac.admin.common.constant.SysConstants; import java.util.Set; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/file/FileRecorderImpl.java similarity index 90% rename from continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/config/file/FileRecorderImpl.java index a8f95079..0266ff92 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/file/FileRecorderImpl.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package top.continew.admin.system.config.file; +package com.zayac.admin.system.config.file; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.EscapeUtil; import cn.hutool.core.util.StrUtil; +import com.zayac.admin.system.enums.FileTypeEnum; +import com.zayac.admin.system.model.entity.FileDO; +import com.zayac.admin.system.model.entity.StorageDO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.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 com.zayac.admin.common.util.helper.LoginHelper; +import com.zayac.admin.system.mapper.FileMapper; +import com.zayac.admin.system.mapper.StorageMapper; import top.continew.starter.core.constant.StringConstants; import java.util.Optional; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/file/FileStorageConfigLoader.java similarity index 83% rename from continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/config/file/FileStorageConfigLoader.java index 5a1634ba..5a8ccf22 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/file/FileStorageConfigLoader.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package top.continew.admin.system.config.file; +package com.zayac.admin.system.config.file; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import com.zayac.admin.system.model.query.StorageQuery; +import com.zayac.admin.system.model.req.StorageReq; +import com.zayac.admin.system.model.resp.StorageResp; +import com.zayac.admin.system.service.StorageService; 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 com.zayac.admin.common.enums.DisEnableStatusEnum; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/log/LogConfiguration.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/log/LogConfiguration.java similarity index 90% rename from continew-admin-system/src/main/java/top/continew/admin/system/config/log/LogConfiguration.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/config/log/LogConfiguration.java index 038c677f..8317b6ff 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/config/log/LogConfiguration.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/log/LogConfiguration.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.config.log; +package com.zayac.admin.system.config.log; +import com.zayac.admin.system.service.UserService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import top.continew.admin.system.mapper.LogMapper; -import top.continew.admin.system.service.UserService; +import com.zayac.admin.system.mapper.LogMapper; 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/continew/admin/system/config/log/LogDaoLocalImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/log/LogDaoLocalImpl.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/config/log/LogDaoLocalImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/config/log/LogDaoLocalImpl.java index b10c874c..aa7547f5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/config/log/LogDaoLocalImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/config/log/LogDaoLocalImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.config.log; +package com.zayac.admin.system.config.log; import cn.dev33.satoken.SaManager; import cn.dev33.satoken.stp.StpUtil; @@ -24,15 +24,15 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpStatus; import cn.hutool.json.JSONUtil; +import com.zayac.admin.auth.model.req.AccountLoginReq; +import com.zayac.admin.system.enums.LogStatusEnum; +import com.zayac.admin.system.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.scheduling.annotation.Async; -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 com.zayac.admin.common.constant.SysConstants; +import com.zayac.admin.system.mapper.LogMapper; +import com.zayac.admin.system.model.entity.LogDO; 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/continew/admin/system/enums/FileTypeEnum.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/FileTypeEnum.java similarity index 98% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/enums/FileTypeEnum.java index dfb55a12..abb2435c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/FileTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.enums; +package com.zayac.admin.system.enums; import cn.hutool.core.util.StrUtil; import lombok.Getter; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/LogStatusEnum.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/enums/LogStatusEnum.java index 97783f93..16fe76ef 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/LogStatusEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.enums; +package com.zayac.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/MessageTemplateEnum.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/enums/MessageTemplateEnum.java index 3ceb34c2..9ae5c8d2 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/MessageTemplateEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.enums; +package com.zayac.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/NoticeStatusEnum.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/enums/NoticeStatusEnum.java index 0d2a7cd9..1b829930 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/NoticeStatusEnum.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.enums; +package com.zayac.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.continew.admin.common.constant.UiConstants; +import com.zayac.admin.common.constant.UiConstants; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/StorageTypeEnum.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/enums/StorageTypeEnum.java index 3a54827b..eedf1e0a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/StorageTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.enums; +package com.zayac.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DeptMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DeptMapper.java index 2061aa77..aff8ee0d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DeptMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; -import top.continew.admin.system.model.entity.DeptDO; +import com.zayac.admin.system.model.entity.DeptDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DictItemMapper.java similarity index 87% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DictItemMapper.java index 02cfd175..ebd2249b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DictItemMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; +import com.zayac.admin.system.model.entity.DictItemDO; import org.apache.ibatis.annotations.Param; -import top.continew.admin.common.model.resp.LabelValueResp; -import top.continew.admin.system.model.entity.DictItemDO; +import com.zayac.admin.common.model.resp.LabelValueResp; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DictMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DictMapper.java index 415afb14..475bf844 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/DictMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; -import top.continew.admin.system.model.entity.DictDO; +import com.zayac.admin.system.model.entity.DictDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/FileMapper.java similarity index 87% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/FileMapper.java index 85cfa327..d12decf5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/FileMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; +import com.zayac.admin.system.model.entity.FileDO; +import com.zayac.admin.system.model.resp.FileStatisticsResp; import org.apache.ibatis.annotations.Select; -import top.continew.admin.system.model.entity.FileDO; -import top.continew.admin.system.model.resp.FileStatisticsResp; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/LogMapper.java similarity index 86% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/LogMapper.java index 7c3f7e4d..173eba7d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/LogMapper.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.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 com.zayac.admin.system.model.entity.LogDO; +import com.zayac.admin.system.model.resp.DashboardAccessTrendResp; +import com.zayac.admin.system.model.resp.DashboardPopularModuleResp; +import com.zayac.admin.system.model.resp.DashboardTotalResp; +import com.zayac.admin.system.model.resp.log.LogResp; import org.apache.ibatis.annotations.Param; -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/continew/admin/system/mapper/MenuMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MenuMapper.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MenuMapper.java index c9084abf..5c9b6396 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MenuMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; +import com.zayac.admin.system.model.entity.MenuDO; 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; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MessageMapper.java similarity index 90% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MessageMapper.java index 653ffcea..15b92823 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MessageMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.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 com.zayac.admin.system.model.entity.MessageDO; +import com.zayac.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/continew/admin/system/mapper/MessageUserMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MessageUserMapper.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MessageUserMapper.java index a00c4629..83537bcb 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/MessageUserMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; +import com.zayac.admin.system.model.entity.MessageUserDO; import org.apache.ibatis.annotations.Param; -import top.continew.admin.system.model.entity.MessageUserDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/NoticeMapper.java similarity index 86% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/NoticeMapper.java index 2305e0d6..ed7c37ee 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/NoticeMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; -import top.continew.admin.system.model.entity.NoticeDO; -import top.continew.admin.system.model.resp.DashboardNoticeResp; +import com.zayac.admin.system.model.entity.NoticeDO; +import com.zayac.admin.system.model.resp.DashboardNoticeResp; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/OptionMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/OptionMapper.java index 77ac0be2..04481ad7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/OptionMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; -import top.continew.admin.system.model.entity.OptionDO; +import com.zayac.admin.system.model.entity.OptionDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleDeptMapper.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleDeptMapper.java index 8085acb7..c2f8fd18 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleDeptMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; +import com.zayac.admin.system.model.entity.RoleDeptDO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.continew.admin.system.model.entity.RoleDeptDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleMapper.java index 3b04e260..ab726405 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; -import top.continew.admin.system.model.entity.RoleDO; +import com.zayac.admin.system.model.entity.RoleDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleMenuMapper.java similarity index 91% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleMenuMapper.java index 2d52b0e9..56f402b6 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/RoleMenuMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; -import top.continew.admin.system.model.entity.RoleMenuDO; +import com.zayac.admin.system.model.entity.RoleMenuDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/StorageMapper.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/StorageMapper.java index 40c6846d..d6d4dfbe 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/StorageMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; -import top.continew.admin.system.model.entity.StorageDO; +import com.zayac.admin.system.model.entity.StorageDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserMapper.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserMapper.java index 6a571925..7e6f0503 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserMapper.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.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 org.apache.ibatis.annotations.Select; -import top.continew.admin.common.config.mybatis.DataPermissionMapper; -import top.continew.admin.system.model.entity.UserDO; +import com.zayac.admin.common.config.mybatis.DataPermissionMapper; +import com.zayac.admin.system.model.entity.UserDO; import top.continew.starter.data.mybatis.plus.datapermission.DataPermission; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserRoleMapper.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserRoleMapper.java index e49f4e8b..9db2bcbd 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserRoleMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; +import com.zayac.admin.system.model.entity.UserRoleDO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.continew.admin.system.model.entity.UserRoleDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserSocialMapper.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserSocialMapper.java index c0b38b83..e32c7b4a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/mapper/UserSocialMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package com.zayac.admin.system.mapper; +import com.zayac.admin.system.model.entity.UserSocialDO; import org.apache.ibatis.annotations.Param; -import top.continew.admin.system.model.entity.UserSocialDO; import top.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DeptDO.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DeptDO.java index 5a8c87af..83673242 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DeptDO.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/entity/DictDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DictDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DictDO.java index 3d4453bb..83415439 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DictDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DictItemDO.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DictItemDO.java index 4a4af79d..9d8546b5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/DictItemDO.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/entity/FileDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/FileDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/FileDO.java index c27d46ca..dc63f425 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/FileDO.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.zayac.admin.system.enums.FileTypeEnum; 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; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/LogDO.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/LogDO.java index 9c77f6fb..76c97a41 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/LogDO.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.zayac.admin.system.enums.LogStatusEnum; import lombok.Data; -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/continew/admin/system/model/entity/MenuDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MenuDO.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MenuDO.java index 598a4cde..de216fc4 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MenuDO.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.enums.MenuTypeEnum; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/entity/MessageDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MessageDO.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MessageDO.java index 707165f2..7970b92e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MessageDO.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.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 com.zayac.admin.common.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MessageUserDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MessageUserDO.java index 6c47f271..761545b3 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/MessageUserDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/NoticeDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/NoticeDO.java index 7758dfed..80506675 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/NoticeDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/OptionDO.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/OptionDO.java index 34d7a874..47fd2ed7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/OptionDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleDO.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleDO.java index a8681901..d6223211 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleDO.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.admin.common.enums.DataScopeEnum; +import com.zayac.admin.common.enums.DataScopeEnum; import top.continew.starter.extension.crud.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleDeptDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleDeptDO.java index ea421d92..a2a576a7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleDeptDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleMenuDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleMenuDO.java index 82eb09b7..54decbf5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/RoleMenuDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/StorageDO.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/StorageDO.java index 9a5f8fe0..6a3c0284 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/StorageDO.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.zayac.admin.system.enums.StorageTypeEnum; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.system.enums.StorageTypeEnum; +import com.zayac.admin.common.enums.DisEnableStatusEnum; 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/continew/admin/system/model/entity/UserDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserDO.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserDO.java index d8f0d3d2..f8009584 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserDO.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.admin.common.config.mybatis.BCryptEncryptor; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.enums.GenderEnum; +import com.zayac.admin.common.config.mybatis.BCryptEncryptor; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/entity/UserRoleDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserRoleDO.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserRoleDO.java index 7d6b937d..fc878708 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserRoleDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserSocialDO.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserSocialDO.java index 053c87b0..f75b1610 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/UserSocialDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package com.zayac.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DeptQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DeptQuery.java index c14e31b6..2a95d1e0 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DeptQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/DictItemQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DictItemQuery.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DictItemQuery.java index 6e999232..d7a3e3b3 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DictItemQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/DictQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DictQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DictQuery.java index 6dcf38af..3a522c04 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/DictQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/FileQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/FileQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/FileQuery.java index 55bd4175..165020ea 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/FileQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/LogQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/LogQuery.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/LogQuery.java index e0c1fd7a..89377428 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/LogQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/MenuQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/MenuQuery.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/MenuQuery.java index 384829fa..fbdb595c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/MenuQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/MessageQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/MessageQuery.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/MessageQuery.java index ea1adf99..c524940a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/MessageQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/NoticeQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/NoticeQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/NoticeQuery.java index 7336c290..13d68356 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/NoticeQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/OptionQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/OptionQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/OptionQuery.java index d84d11f3..b6bb5e97 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/OptionQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/RoleQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/RoleQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/RoleQuery.java index 3fbea7db..8798a965 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/RoleQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/StorageQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/StorageQuery.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/StorageQuery.java index ee699e1f..51702c8f 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/StorageQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/query/UserQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/UserQuery.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/UserQuery.java index 9198eaf2..7295268e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/UserQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.query; +package com.zayac.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/continew/admin/system/model/req/DeptReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DeptReq.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DeptReq.java index cda0dd95..59364d51 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DeptReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.continew.admin.common.constant.RegexConstants; -import top.continew.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.common.constant.RegexConstants; +import com.zayac.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/continew/admin/system/model/req/DictItemReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DictItemReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DictItemReq.java index c8bfbf57..0f5624bd 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DictItemReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.continew.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/req/DictReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DictReq.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DictReq.java index d30faa09..178b8eb3 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/DictReq.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.continew.admin.common.constant.RegexConstants; +import com.zayac.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/continew/admin/system/model/req/FileReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/FileReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/FileReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/FileReq.java index 8bedca3f..81e15446 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/FileReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/FileReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/MenuReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/MenuReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/MenuReq.java index b2b99210..c989ab94 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/MenuReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.enums.MenuTypeEnum; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/req/MessageReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/MessageReq.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/MessageReq.java index 0c1126b9..e2142e34 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/MessageReq.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.continew.admin.common.enums.MessageTypeEnum; +import com.zayac.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/continew/admin/system/model/req/NoticeReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/NoticeReq.java similarity index 98% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/NoticeReq.java index 5daadb3a..ce2ed934 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/NoticeReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/OptionReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/OptionReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/OptionReq.java index 6ec62cf0..bfaeeda7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/OptionReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/OptionResetValueReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/OptionResetValueReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/OptionResetValueReq.java index 831cd5a3..d142abc4 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/OptionResetValueReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/RoleReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/RoleReq.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/RoleReq.java index 41c39515..134cb857 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/RoleReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.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 com.zayac.admin.common.constant.RegexConstants; +import com.zayac.admin.common.enums.DataScopeEnum; import top.continew.starter.extension.crud.model.req.BaseReq; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/StorageReq.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/StorageReq.java index 9e685438..d7815302 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/StorageReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.continew.admin.common.constant.RegexConstants; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.system.enums.StorageTypeEnum; +import com.zayac.admin.common.constant.RegexConstants; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/req/UserBasicInfoUpdateReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserBasicInfoUpdateReq.java similarity index 91% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserBasicInfoUpdateReq.java index c026269b..7e44b414 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserBasicInfoUpdateReq.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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 com.zayac.admin.common.constant.RegexConstants; +import com.zayac.admin.common.enums.GenderEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserEmailUpdateRequest.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserEmailUpdateRequest.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserEmailUpdateRequest.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserEmailUpdateRequest.java index 32f466e2..7e9fe291 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserEmailUpdateRequest.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserEmailUpdateRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/UserPasswordResetReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPasswordResetReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordResetReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPasswordResetReq.java index 41cfcce1..7d1a1ac0 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordResetReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPasswordResetReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/UserPasswordUpdateReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPasswordUpdateReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordUpdateReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPasswordUpdateReq.java index 0b1ed10a..7f8cbb22 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPasswordUpdateReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPasswordUpdateReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/UserPhoneUpdateReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPhoneUpdateReq.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPhoneUpdateReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPhoneUpdateReq.java index 985e8881..9c73fb5e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserPhoneUpdateReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserPhoneUpdateReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/req/UserReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserReq.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserReq.java index 602af6ef..0739ec09 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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.continew.admin.common.constant.RegexConstants; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.enums.GenderEnum; +import com.zayac.admin.common.constant.RegexConstants; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/req/UserRoleUpdateReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserRoleUpdateReq.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserRoleUpdateReq.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserRoleUpdateReq.java index 801b96da..9cda915c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserRoleUpdateReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/UserRoleUpdateReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.req; +package com.zayac.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/continew/admin/system/model/resp/AvatarResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AvatarResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AvatarResp.java index cee92753..af259361 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AvatarResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/DashboardAccessTrendResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardAccessTrendResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAccessTrendResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardAccessTrendResp.java index 911b7dea..cf2db87c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAccessTrendResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardAccessTrendResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/DashboardGeoDistributionResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardGeoDistributionResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardGeoDistributionResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardGeoDistributionResp.java index 1961df57..3e045a08 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardGeoDistributionResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardGeoDistributionResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/DashboardNoticeResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardNoticeResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardNoticeResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardNoticeResp.java index 14f54362..519a498a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardNoticeResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardNoticeResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/DashboardPopularModuleResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardPopularModuleResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardPopularModuleResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardPopularModuleResp.java index 4b4e0244..d1bd53d3 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardPopularModuleResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardPopularModuleResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardTotalResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardTotalResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardTotalResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardTotalResp.java index c033ac68..db70ecb7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardTotalResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DashboardTotalResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DeptResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DeptResp.java index 94eb1b8c..23641677 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DeptResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; @@ -22,10 +22,10 @@ import cn.crane4j.annotation.Mapping; import cn.crane4j.annotation.condition.ConditionOnExpression; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.zayac.admin.system.service.DeptService; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.system.service.DeptService; +import com.zayac.admin.common.enums.DisEnableStatusEnum; 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/continew/admin/system/model/resp/DictItemResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DictItemResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DictItemResp.java index 1a79ce1c..962cc433 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DictItemResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/resp/DictResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DictResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DictResp.java index f7227ed9..eae55dbc 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/DictResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/FileResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileResp.java index 76b35661..555c8f46 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.zayac.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/continew/admin/system/model/resp/FileStatisticsResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileStatisticsResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileStatisticsResp.java index c03d564b..eb2a50a8 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileStatisticsResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import com.fasterxml.jackson.annotation.JsonInclude; +import com.zayac.admin.system.enums.FileTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.system.enums.FileTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileUploadResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileUploadResp.java index 82458136..f048d4c2 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/FileUploadResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/MenuResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MenuResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MenuResp.java index 676c8e72..65d946af 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MenuResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.enums.MenuTypeEnum; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.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/continew/admin/system/model/resp/MessageResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageResp.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageResp.java index 7ed66d6c..7707413b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageResp.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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.continew.admin.common.constant.ContainerConstants; -import top.continew.admin.common.enums.MessageTypeEnum; +import com.zayac.admin.common.constant.ContainerConstants; +import com.zayac.admin.common.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageTypeUnreadResp.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageTypeUnreadResp.java index f272df56..372f3769 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageTypeUnreadResp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.MessageTypeEnum; +import com.zayac.admin.common.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageUnreadResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageUnreadResp.java index 4045aa84..86193da9 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/MessageUnreadResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.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/continew/admin/system/model/resp/NoticeDetailResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/NoticeDetailResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/NoticeDetailResp.java index d61d62b2..480b06ec 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/NoticeDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/NoticeResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/NoticeResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/NoticeResp.java index 8df55fd0..3e0a4708 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/NoticeResp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; +import com.zayac.admin.system.enums.NoticeStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.system.enums.NoticeStatusEnum; import top.continew.starter.extension.crud.model.resp.BaseResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/OptionResp.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/OptionResp.java index 0baee5cd..79522f69 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/OptionResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/RoleDetailResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/RoleDetailResp.java index ef109ed9..70cfe585 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/RoleDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -22,8 +22,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.continew.admin.common.constant.ContainerConstants; -import top.continew.admin.common.enums.DataScopeEnum; +import com.zayac.admin.common.constant.ContainerConstants; +import com.zayac.admin.common.enums.DataScopeEnum; 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/continew/admin/system/model/resp/RoleResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/RoleResp.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/RoleResp.java index d437edd2..370144ff 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/RoleResp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.DataScopeEnum; +import com.zayac.admin.common.enums.DataScopeEnum; import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/StorageResp.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/StorageResp.java index 9bfde352..428d4808 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/StorageResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; +import com.zayac.admin.system.enums.StorageTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.system.enums.StorageTypeEnum; +import com.zayac.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.continew.starter.security.mask.annotation.JsonMask; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserDetailResp.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserDetailResp.java index d9f905ed..bb93c0ea 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.AssembleMethod; @@ -22,13 +22,13 @@ import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.Mapping; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.zayac.admin.system.service.DeptService; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -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 com.zayac.admin.common.constant.ContainerConstants; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.common.enums.GenderEnum; +import com.zayac.admin.common.util.helper.LoginHelper; 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/continew/admin/system/model/resp/UserResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserResp.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserResp.java index 29e4044e..05597819 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserResp.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.admin.system.model.resp; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.Mapping; +import com.zayac.admin.system.service.DeptService; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -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 com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.common.enums.GenderEnum; +import com.zayac.admin.common.util.helper.LoginHelper; 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/continew/admin/system/model/resp/UserSocialBindResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserSocialBindResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserSocialBindResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserSocialBindResp.java index 312a40b9..59ec6df6 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserSocialBindResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/UserSocialBindResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp; +package com.zayac.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/continew/admin/system/model/resp/log/LogDetailResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LogDetailResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LogDetailResp.java index 7bf9ee84..738d88df 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LogDetailResp.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp.log; +package com.zayac.admin.system.model.resp.log; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.zayac.admin.system.enums.LogStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.constant.ContainerConstants; -import top.continew.admin.system.enums.LogStatusEnum; +import com.zayac.admin.common.constant.ContainerConstants; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LogResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LogResp.java index a93ef9af..cc98a5e7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LogResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp.log; +package com.zayac.admin.system.model.resp.log; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.zayac.admin.system.enums.LogStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -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/continew/admin/system/model/resp/log/LoginLogExportResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LoginLogExportResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LoginLogExportResp.java index a3efde02..3079dc7f 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/LoginLogExportResp.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp.log; +package com.zayac.admin.system.model.resp.log; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.zayac.admin.system.enums.LogStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.system.enums.LogStatusEnum; import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/OperationLogExportResp.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/OperationLogExportResp.java index 29233ea4..6b66214b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/log/OperationLogExportResp.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.admin.system.model.resp.log; +package com.zayac.admin.system.model.resp.log; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.zayac.admin.system.enums.LogStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.system.enums.LogStatusEnum; import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DashboardService.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/DashboardService.java index 5d347df0..7d8ca371 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DashboardService.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -import top.continew.admin.system.model.resp.*; +import com.zayac.admin.system.model.resp.*; +import com.zayac.admin.system.model.resp.*; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/DeptService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DeptService.java similarity index 81% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DeptService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/DeptService.java index 82d0a43e..a27eaa17 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/DeptService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DeptService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -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 com.zayac.admin.system.model.entity.DeptDO; +import com.zayac.admin.system.model.query.DeptQuery; +import com.zayac.admin.system.model.req.DeptReq; +import com.zayac.admin.system.model.resp.DeptResp; 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/continew/admin/system/service/DictItemService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DictItemService.java similarity index 80% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DictItemService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/DictItemService.java index c22b45ec..7cf11dbe 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/DictItemService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DictItemService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -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 com.zayac.admin.common.model.resp.LabelValueResp; +import com.zayac.admin.system.model.entity.DictItemDO; +import com.zayac.admin.system.model.query.DictItemQuery; +import com.zayac.admin.system.model.req.DictItemReq; +import com.zayac.admin.system.model.resp.DictItemResp; 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/continew/admin/system/service/DictService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DictService.java similarity index 78% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DictService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/DictService.java index fa70a50b..41b66e52 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/DictService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/DictService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -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 com.zayac.admin.system.model.entity.DictDO; +import com.zayac.admin.system.model.query.DictQuery; +import com.zayac.admin.system.model.req.DictReq; +import com.zayac.admin.system.model.resp.DictResp; 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/continew/admin/system/service/FileService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/FileService.java similarity index 84% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/FileService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/FileService.java index 17ffc882..a41c89aa 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/FileService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/FileService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import org.dromara.x.file.storage.core.FileInfo; import org.springframework.web.multipart.MultipartFile; -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.admin.system.model.resp.FileStatisticsResp; +import com.zayac.admin.system.model.entity.FileDO; +import com.zayac.admin.system.model.query.FileQuery; +import com.zayac.admin.system.model.req.FileReq; +import com.zayac.admin.system.model.resp.FileResp; +import com.zayac.admin.system.model.resp.FileStatisticsResp; 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/continew/admin/system/service/LogService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/LogService.java similarity index 86% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/LogService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/LogService.java index 7539b1b0..51d684e0 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/LogService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/LogService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import jakarta.servlet.http.HttpServletResponse; -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 com.zayac.admin.system.model.query.LogQuery; +import com.zayac.admin.system.model.resp.DashboardAccessTrendResp; +import com.zayac.admin.system.model.resp.DashboardPopularModuleResp; +import com.zayac.admin.system.model.resp.DashboardTotalResp; +import com.zayac.admin.system.model.resp.log.LogDetailResp; +import com.zayac.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/continew/admin/system/service/MenuService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/MenuService.java similarity index 84% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/MenuService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/MenuService.java index 8f69d6a3..2186ecba 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/MenuService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/MenuService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -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 com.zayac.admin.system.model.entity.MenuDO; +import com.zayac.admin.system.model.query.MenuQuery; +import com.zayac.admin.system.model.req.MenuReq; +import com.zayac.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/continew/admin/system/service/MessageService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/MessageService.java similarity index 86% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/MessageService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/MessageService.java index 67fe7f74..914bb472 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/MessageService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import java.util.List; -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 com.zayac.admin.system.model.query.MessageQuery; +import com.zayac.admin.system.model.req.MessageReq; +import com.zayac.admin.system.model.resp.MessageResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/MessageUserService.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/MessageUserService.java index f53f3140..c89f6f3c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/MessageUserService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import java.util.List; -import top.continew.admin.system.model.resp.MessageUnreadResp; +import com.zayac.admin.system.model.resp.MessageUnreadResp; /** * 消息和用户关联业务接口 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/NoticeService.java similarity index 74% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/NoticeService.java index 1f5d276e..094b84d2 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/NoticeService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -import top.continew.admin.system.model.entity.NoticeDO; -import top.continew.admin.system.model.query.NoticeQuery; -import top.continew.admin.system.model.req.NoticeReq; -import top.continew.admin.system.model.resp.NoticeDetailResp; -import top.continew.admin.system.model.resp.NoticeResp; -import top.continew.admin.system.model.resp.DashboardNoticeResp; +import com.zayac.admin.system.model.entity.NoticeDO; +import com.zayac.admin.system.model.query.NoticeQuery; +import com.zayac.admin.system.model.req.NoticeReq; +import com.zayac.admin.system.model.resp.NoticeDetailResp; +import com.zayac.admin.system.model.resp.NoticeResp; +import com.zayac.admin.system.model.resp.DashboardNoticeResp; 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/continew/admin/system/service/OptionService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/OptionService.java similarity index 80% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/OptionService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/OptionService.java index 4043ea61..e51d5956 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/OptionService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/OptionService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import java.util.List; -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; +import com.zayac.admin.system.model.query.OptionQuery; +import com.zayac.admin.system.model.req.OptionReq; +import com.zayac.admin.system.model.req.OptionResetValueReq; +import com.zayac.admin.system.model.resp.OptionResp; /** * 参数业务接口 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleDeptService.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleDeptService.java index cb857d78..81149dba 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleDeptService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleMenuService.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleMenuService.java index cd9b5940..e09584ec 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleMenuService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleService.java similarity index 80% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleService.java index 0b8e55cd..6c604f1e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/RoleService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -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 com.zayac.admin.common.model.dto.RoleDTO; +import com.zayac.admin.common.model.resp.LabelValueResp; +import com.zayac.admin.system.model.entity.RoleDO; +import com.zayac.admin.system.model.query.RoleQuery; +import com.zayac.admin.system.model.req.RoleReq; +import com.zayac.admin.system.model.resp.RoleDetailResp; +import com.zayac.admin.system.model.resp.RoleResp; 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/continew/admin/system/service/StorageService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/StorageService.java similarity index 84% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/StorageService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/StorageService.java index fe8437c2..46ee7cc9 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/StorageService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/StorageService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; -import top.continew.admin.system.model.entity.StorageDO; -import top.continew.admin.system.model.query.StorageQuery; -import top.continew.admin.system.model.req.StorageReq; -import top.continew.admin.system.model.resp.StorageResp; +import com.zayac.admin.system.model.entity.StorageDO; +import com.zayac.admin.system.model.query.StorageQuery; +import com.zayac.admin.system.model.req.StorageReq; +import com.zayac.admin.system.model.resp.StorageResp; 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/continew/admin/system/service/UserRoleService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserRoleService.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/UserRoleService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserRoleService.java index b0d4a0fa..65d5e283 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserRoleService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserRoleService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserService.java similarity index 85% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserService.java index 0c7413ed..accb50df 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserService.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import org.springframework.web.multipart.MultipartFile; -import top.continew.admin.system.model.entity.UserDO; -import top.continew.admin.system.model.query.UserQuery; -import top.continew.admin.system.model.req.UserBasicInfoUpdateReq; -import top.continew.admin.system.model.req.UserPasswordResetReq; -import top.continew.admin.system.model.req.UserReq; -import top.continew.admin.system.model.req.UserRoleUpdateReq; -import top.continew.admin.system.model.resp.UserDetailResp; -import top.continew.admin.system.model.resp.UserResp; +import com.zayac.admin.system.model.entity.UserDO; +import com.zayac.admin.system.model.query.UserQuery; +import com.zayac.admin.system.model.req.UserBasicInfoUpdateReq; +import com.zayac.admin.system.model.req.UserPasswordResetReq; +import com.zayac.admin.system.model.req.UserReq; +import com.zayac.admin.system.model.req.UserRoleUpdateReq; +import com.zayac.admin.system.model.resp.UserDetailResp; +import com.zayac.admin.system.model.resp.UserResp; 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/continew/admin/system/service/UserSocialService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserSocialService.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/UserSocialService.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserSocialService.java index 5a48306d..e0d0d652 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserSocialService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/UserSocialService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.system.service; +package com.zayac.admin.system.service; import java.util.List; -import top.continew.admin.system.model.entity.UserSocialDO; +import com.zayac.admin.system.model.entity.UserSocialDO; import me.zhyd.oauth.model.AuthUser; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DashboardServiceImpl.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DashboardServiceImpl.java index bb1e34e8..d19d4b8f 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DashboardServiceImpl.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.NumberUtil; +import com.zayac.admin.system.model.resp.*; +import com.zayac.admin.system.service.DashboardService; +import com.zayac.admin.system.service.LogService; +import com.zayac.admin.system.service.NoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.system.service.NoticeService; -import top.continew.admin.system.service.DashboardService; -import top.continew.admin.system.service.LogService; -import top.continew.admin.system.model.resp.*; +import com.zayac.admin.system.model.resp.*; import java.math.BigDecimal; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DeptServiceImpl.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DeptServiceImpl.java index ab14a979..41fcc541 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DeptServiceImpl.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.zayac.admin.system.service.DeptService; +import com.zayac.admin.system.service.RoleDeptService; +import com.zayac.admin.system.service.UserService; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.system.mapper.DeptMapper; -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.admin.system.service.DeptService; -import top.continew.admin.system.service.RoleDeptService; -import top.continew.admin.system.service.UserService; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.system.mapper.DeptMapper; +import com.zayac.admin.system.model.entity.DeptDO; +import com.zayac.admin.system.model.query.DeptQuery; +import com.zayac.admin.system.model.req.DeptReq; +import com.zayac.admin.system.model.resp.DeptResp; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.data.core.enums.DatabaseType; import top.continew.starter.data.core.util.MetaUtils; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DictItemServiceImpl.java similarity index 84% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DictItemServiceImpl.java index 609119d5..7774719b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DictItemServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; +import com.zayac.admin.system.service.DictItemService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -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 com.zayac.admin.common.model.resp.LabelValueResp; +import com.zayac.admin.system.mapper.DictItemMapper; +import com.zayac.admin.system.model.entity.DictItemDO; +import com.zayac.admin.system.model.query.DictItemQuery; +import com.zayac.admin.system.model.req.DictItemReq; +import com.zayac.admin.system.model.resp.DictItemResp; 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/continew/admin/system/service/impl/DictServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DictServiceImpl.java similarity index 88% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DictServiceImpl.java index 567b9d9e..f684900d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/DictServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; +import com.zayac.admin.system.service.DictItemService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -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 com.zayac.admin.system.mapper.DictMapper; +import com.zayac.admin.system.model.entity.DictDO; +import com.zayac.admin.system.model.query.DictQuery; +import com.zayac.admin.system.model.req.DictReq; +import com.zayac.admin.system.model.resp.DictResp; +import com.zayac.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/continew/admin/system/service/impl/FileServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/FileServiceImpl.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/FileServiceImpl.java index 52f32607..ff9c570a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/FileServiceImpl.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; +import com.zayac.admin.system.service.FileService; +import com.zayac.admin.system.service.StorageService; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -28,16 +30,14 @@ import org.dromara.x.file.storage.core.ProgressListener; import org.dromara.x.file.storage.core.upload.UploadPretreatment; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import top.continew.admin.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.model.resp.FileStatisticsResp; -import top.continew.admin.system.service.FileService; -import top.continew.admin.system.service.StorageService; +import com.zayac.admin.system.enums.StorageTypeEnum; +import com.zayac.admin.system.mapper.FileMapper; +import com.zayac.admin.system.model.entity.FileDO; +import com.zayac.admin.system.model.entity.StorageDO; +import com.zayac.admin.system.model.query.FileQuery; +import com.zayac.admin.system.model.req.FileReq; +import com.zayac.admin.system.model.resp.FileResp; +import com.zayac.admin.system.model.resp.FileStatisticsResp; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.URLUtils; import top.continew.starter.core.util.validate.CheckUtils; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/LogServiceImpl.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/LogServiceImpl.java index c20f5b13..bc891fa4 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/LogServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.bean.BeanUtil; @@ -24,22 +24,22 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zayac.admin.system.service.LogService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -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 com.zayac.admin.system.mapper.LogMapper; +import com.zayac.admin.system.model.entity.LogDO; +import com.zayac.admin.system.model.query.LogQuery; +import com.zayac.admin.system.model.resp.DashboardAccessTrendResp; +import com.zayac.admin.system.model.resp.DashboardPopularModuleResp; +import com.zayac.admin.system.model.resp.DashboardTotalResp; +import com.zayac.admin.system.model.resp.log.LogDetailResp; +import com.zayac.admin.system.model.resp.log.LogResp; +import com.zayac.admin.system.model.resp.log.LoginLogExportResp; +import com.zayac.admin.system.model.resp.log.OperationLogExportResp; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MenuServiceImpl.java similarity index 87% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MenuServiceImpl.java index 69c976d1..f62b5ec7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MenuServiceImpl.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.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 com.zayac.admin.system.service.MenuService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -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 com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.common.enums.MenuTypeEnum; +import com.zayac.admin.system.mapper.MenuMapper; +import com.zayac.admin.system.model.entity.MenuDO; +import com.zayac.admin.system.model.query.MenuQuery; +import com.zayac.admin.system.model.req.MenuReq; +import com.zayac.admin.system.model.resp.MenuResp; 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/continew/admin/system/service/impl/MessageServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MessageServiceImpl.java similarity index 85% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MessageServiceImpl.java index aa067294..0bccf194 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MessageServiceImpl.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zayac.admin.system.service.MessageService; +import com.zayac.admin.system.service.MessageUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.continew.admin.system.mapper.MessageMapper; -import top.continew.admin.system.model.entity.MessageDO; -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.admin.system.service.MessageService; -import top.continew.admin.system.service.MessageUserService; +import com.zayac.admin.system.mapper.MessageMapper; +import com.zayac.admin.system.model.entity.MessageDO; +import com.zayac.admin.system.model.query.MessageQuery; +import com.zayac.admin.system.model.req.MessageReq; +import com.zayac.admin.system.model.resp.MessageResp; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MessageUserServiceImpl.java similarity index 88% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MessageUserServiceImpl.java index 1a1a9d4e..0cd5d41c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/MessageUserServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; +import com.zayac.admin.system.service.MessageUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.common.enums.MessageTypeEnum; -import top.continew.admin.system.mapper.MessageUserMapper; -import top.continew.admin.system.model.entity.MessageUserDO; -import top.continew.admin.system.model.resp.MessageTypeUnreadResp; -import top.continew.admin.system.model.resp.MessageUnreadResp; -import top.continew.admin.system.service.MessageUserService; +import com.zayac.admin.common.enums.MessageTypeEnum; +import com.zayac.admin.system.mapper.MessageUserMapper; +import com.zayac.admin.system.model.entity.MessageUserDO; +import com.zayac.admin.system.model.resp.MessageTypeUnreadResp; +import com.zayac.admin.system.model.resp.MessageUnreadResp; import top.continew.starter.core.util.validate.CheckUtils; import java.time.LocalDateTime; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/NoticeServiceImpl.java similarity index 70% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/NoticeServiceImpl.java index c6e56a49..79c81950 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/NoticeServiceImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; +import com.zayac.admin.system.service.NoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.system.mapper.NoticeMapper; -import top.continew.admin.system.model.entity.NoticeDO; -import top.continew.admin.system.model.query.NoticeQuery; -import top.continew.admin.system.model.req.NoticeReq; -import top.continew.admin.system.model.resp.DashboardNoticeResp; -import top.continew.admin.system.model.resp.NoticeDetailResp; -import top.continew.admin.system.model.resp.NoticeResp; -import top.continew.admin.system.service.NoticeService; +import com.zayac.admin.system.mapper.NoticeMapper; +import com.zayac.admin.system.model.entity.NoticeDO; +import com.zayac.admin.system.model.query.NoticeQuery; +import com.zayac.admin.system.model.req.NoticeReq; +import com.zayac.admin.system.model.resp.DashboardNoticeResp; +import com.zayac.admin.system.model.resp.NoticeDetailResp; +import com.zayac.admin.system.model.resp.NoticeResp; import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/OptionServiceImpl.java similarity index 79% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/OptionServiceImpl.java index c501b7db..055acc7c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/OptionServiceImpl.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.zayac.admin.system.service.OptionService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.system.mapper.OptionMapper; -import top.continew.admin.system.model.entity.OptionDO; -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; -import top.continew.admin.system.service.OptionService; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.system.mapper.OptionMapper; +import com.zayac.admin.system.model.entity.OptionDO; +import com.zayac.admin.system.model.query.OptionQuery; +import com.zayac.admin.system.model.req.OptionReq; +import com.zayac.admin.system.model.req.OptionResetValueReq; +import com.zayac.admin.system.model.resp.OptionResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleDeptServiceImpl.java similarity index 90% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleDeptServiceImpl.java index b8b2ea34..14d706dc 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleDeptServiceImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; import cn.hutool.core.collection.CollUtil; +import com.zayac.admin.system.service.RoleDeptService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.continew.admin.common.constant.ContainerConstants; -import top.continew.admin.system.mapper.RoleDeptMapper; -import top.continew.admin.system.model.entity.RoleDeptDO; -import top.continew.admin.system.service.RoleDeptService; +import com.zayac.admin.common.constant.ContainerConstants; +import com.zayac.admin.system.mapper.RoleDeptMapper; +import com.zayac.admin.system.model.entity.RoleDeptDO; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleMenuServiceImpl.java similarity index 91% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleMenuServiceImpl.java index f5f3ff0b..587a6448 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleMenuServiceImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; +import com.zayac.admin.system.service.RoleMenuService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.continew.admin.system.mapper.RoleMenuMapper; -import top.continew.admin.system.model.entity.RoleMenuDO; -import top.continew.admin.system.service.RoleMenuService; +import com.zayac.admin.system.mapper.RoleMenuMapper; +import com.zayac.admin.system.model.entity.RoleMenuDO; import java.util.ArrayList; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleServiceImpl.java similarity index 89% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleServiceImpl.java index 4ea69954..510d0d91 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/RoleServiceImpl.java @@ -14,29 +14,30 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.alicp.jetcache.anno.CacheInvalidate; +import com.zayac.admin.system.service.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.continew.admin.auth.service.OnlineUserService; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.constant.SysConstants; -import top.continew.admin.common.enums.DataScopeEnum; -import top.continew.admin.common.model.dto.RoleDTO; -import top.continew.admin.common.model.resp.LabelValueResp; -import top.continew.admin.system.mapper.RoleMapper; -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.MenuResp; -import top.continew.admin.system.model.resp.RoleDetailResp; -import top.continew.admin.system.model.resp.RoleResp; -import top.continew.admin.system.service.*; +import com.zayac.admin.auth.service.OnlineUserService; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.common.constant.SysConstants; +import com.zayac.admin.common.enums.DataScopeEnum; +import com.zayac.admin.common.model.dto.RoleDTO; +import com.zayac.admin.common.model.resp.LabelValueResp; +import com.zayac.admin.system.mapper.RoleMapper; +import com.zayac.admin.system.model.entity.RoleDO; +import com.zayac.admin.system.model.query.RoleQuery; +import com.zayac.admin.system.model.req.RoleReq; +import com.zayac.admin.system.model.resp.MenuResp; +import com.zayac.admin.system.model.resp.RoleDetailResp; +import com.zayac.admin.system.model.resp.RoleResp; +import com.zayac.admin.system.service.*; 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/continew/admin/system/service/impl/StorageServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/StorageServiceImpl.java similarity index 93% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/StorageServiceImpl.java index c515d813..27ff5838 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/StorageServiceImpl.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; +import com.zayac.admin.system.service.FileService; +import com.zayac.admin.system.service.StorageService; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.dromara.x.file.storage.core.FileStorageProperties; @@ -27,16 +29,14 @@ import org.dromara.x.file.storage.core.FileStorageService; import org.dromara.x.file.storage.core.FileStorageServiceBuilder; import org.dromara.x.file.storage.core.platform.FileStorage; import org.springframework.stereotype.Service; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.util.SecureUtils; -import top.continew.admin.system.enums.StorageTypeEnum; -import top.continew.admin.system.mapper.StorageMapper; -import top.continew.admin.system.model.entity.StorageDO; -import top.continew.admin.system.model.query.StorageQuery; -import top.continew.admin.system.model.req.StorageReq; -import top.continew.admin.system.model.resp.StorageResp; -import top.continew.admin.system.service.FileService; -import top.continew.admin.system.service.StorageService; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.common.util.SecureUtils; +import com.zayac.admin.system.enums.StorageTypeEnum; +import com.zayac.admin.system.mapper.StorageMapper; +import com.zayac.admin.system.model.entity.StorageDO; +import com.zayac.admin.system.model.query.StorageQuery; +import com.zayac.admin.system.model.req.StorageReq; +import com.zayac.admin.system.model.resp.StorageResp; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.URLUtils; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserRoleServiceImpl.java similarity index 90% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserRoleServiceImpl.java index dddba4ba..349be223 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserRoleServiceImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; import cn.hutool.core.collection.CollUtil; +import com.zayac.admin.system.service.UserRoleService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.continew.admin.common.constant.ContainerConstants; -import top.continew.admin.system.mapper.UserRoleMapper; -import top.continew.admin.system.model.entity.UserRoleDO; -import top.continew.admin.system.service.UserRoleService; +import com.zayac.admin.common.constant.ContainerConstants; +import com.zayac.admin.system.mapper.UserRoleMapper; +import com.zayac.admin.system.model.entity.UserRoleDO; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserServiceImpl.java similarity index 94% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserServiceImpl.java index c161dd70..05306b79 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -27,6 +27,8 @@ import com.alicp.jetcache.anno.CacheUpdate; import com.alicp.jetcache.anno.Cached; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zayac.admin.system.mapper.UserMapper; +import com.zayac.admin.system.service.*; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.dromara.x.file.storage.core.FileInfo; @@ -36,21 +38,20 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import top.continew.admin.auth.service.OnlineUserService; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.util.helper.LoginHelper; -import top.continew.admin.system.mapper.UserMapper; -import top.continew.admin.system.model.entity.DeptDO; -import top.continew.admin.system.model.entity.UserDO; -import top.continew.admin.system.model.query.UserQuery; -import top.continew.admin.system.model.req.UserBasicInfoUpdateReq; -import top.continew.admin.system.model.req.UserPasswordResetReq; -import top.continew.admin.system.model.req.UserReq; -import top.continew.admin.system.model.req.UserRoleUpdateReq; -import top.continew.admin.system.model.resp.UserDetailResp; -import top.continew.admin.system.model.resp.UserResp; -import top.continew.admin.system.service.*; +import com.zayac.admin.auth.service.OnlineUserService; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.common.enums.DisEnableStatusEnum; +import com.zayac.admin.common.util.helper.LoginHelper; +import com.zayac.admin.system.model.entity.DeptDO; +import com.zayac.admin.system.model.entity.UserDO; +import com.zayac.admin.system.model.query.UserQuery; +import com.zayac.admin.system.model.req.UserBasicInfoUpdateReq; +import com.zayac.admin.system.model.req.UserPasswordResetReq; +import com.zayac.admin.system.model.req.UserReq; +import com.zayac.admin.system.model.req.UserRoleUpdateReq; +import com.zayac.admin.system.model.resp.UserDetailResp; +import com.zayac.admin.system.model.resp.UserResp; +import com.zayac.admin.system.service.*; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.extension.crud.model.query.PageQuery; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserSocialServiceImpl.java similarity index 92% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java rename to zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserSocialServiceImpl.java index a1eb5b3b..1524519a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/UserSocialServiceImpl.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package top.continew.admin.system.service.impl; +package com.zayac.admin.system.service.impl; import java.time.LocalDateTime; import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import com.zayac.admin.system.service.UserSocialService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import cn.hutool.json.JSONUtil; -import top.continew.admin.common.enums.SocialSourceEnum; -import top.continew.admin.system.mapper.UserSocialMapper; -import top.continew.admin.system.model.entity.UserSocialDO; -import top.continew.admin.system.service.UserSocialService; +import com.zayac.admin.common.enums.SocialSourceEnum; +import com.zayac.admin.system.mapper.UserSocialMapper; +import com.zayac.admin.system.model.entity.UserSocialDO; import top.continew.starter.core.util.validate.CheckUtils; import me.zhyd.oauth.model.AuthUser; diff --git a/continew-admin-system/src/main/resources/mapper/DeptMapper.xml b/zayac-admin-system/src/main/resources/mapper/DeptMapper.xml similarity index 70% rename from continew-admin-system/src/main/resources/mapper/DeptMapper.xml rename to zayac-admin-system/src/main/resources/mapper/DeptMapper.xml index f7ce3e49..d272d629 100644 --- a/continew-admin-system/src/main/resources/mapper/DeptMapper.xml +++ b/zayac-admin-system/src/main/resources/mapper/DeptMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/continew-admin-system/src/main/resources/mapper/DictItemMapper.xml b/zayac-admin-system/src/main/resources/mapper/DictItemMapper.xml similarity index 69% rename from continew-admin-system/src/main/resources/mapper/DictItemMapper.xml rename to zayac-admin-system/src/main/resources/mapper/DictItemMapper.xml index 96e5aa5a..fcbf2563 100644 --- a/continew-admin-system/src/main/resources/mapper/DictItemMapper.xml +++ b/zayac-admin-system/src/main/resources/mapper/DictItemMapper.xml @@ -1,7 +1,7 @@ - - SELECT t1.label, t1.value, t1.color FROM sys_dict_item AS t1 LEFT JOIN sys_dict AS t2 ON t1.dict_id = t2.id diff --git a/continew-admin-system/src/main/resources/mapper/LogMapper.xml b/zayac-admin-system/src/main/resources/mapper/LogMapper.xml similarity index 83% rename from continew-admin-system/src/main/resources/mapper/LogMapper.xml rename to zayac-admin-system/src/main/resources/mapper/LogMapper.xml index 2f6d3794..dd878863 100644 --- a/continew-admin-system/src/main/resources/mapper/LogMapper.xml +++ b/zayac-admin-system/src/main/resources/mapper/LogMapper.xml @@ -1,7 +1,7 @@ - - SELECT t1.id, t1.description, @@ -21,7 +21,7 @@ ${ew.customSqlSegment} - 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 @@ -13,7 +13,7 @@ AND t1.permission IS NOT NULL - 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/zayac-admin-system/src/main/resources/mapper/MessageMapper.xml similarity index 71% rename from continew-admin-system/src/main/resources/mapper/MessageMapper.xml rename to zayac-admin-system/src/main/resources/mapper/MessageMapper.xml index 69599648..12977265 100644 --- a/continew-admin-system/src/main/resources/mapper/MessageMapper.xml +++ b/zayac-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/zayac-admin-system/src/main/resources/mapper/MessageUserMapper.xml similarity index 88% rename from continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml rename to zayac-admin-system/src/main/resources/mapper/MessageUserMapper.xml index 8b6ae76e..7aa874a4 100644 --- a/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml +++ b/zayac-admin-system/src/main/resources/mapper/MessageUserMapper.xml @@ -1,6 +1,6 @@ - + + resultType="com.zayac.admin.system.model.resp.DashboardNoticeResp"> SELECT id, title, type FROM sys_notice diff --git a/continew-admin-system/src/main/resources/mapper/RoleMapper.xml b/zayac-admin-system/src/main/resources/mapper/RoleMapper.xml similarity index 70% rename from continew-admin-system/src/main/resources/mapper/RoleMapper.xml rename to zayac-admin-system/src/main/resources/mapper/RoleMapper.xml index 16664e20..9ace45dd 100644 --- a/continew-admin-system/src/main/resources/mapper/RoleMapper.xml +++ b/zayac-admin-system/src/main/resources/mapper/RoleMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/continew-admin-system/src/main/resources/mapper/RoleMenuMapper.xml b/zayac-admin-system/src/main/resources/mapper/RoleMenuMapper.xml similarity index 86% rename from continew-admin-system/src/main/resources/mapper/RoleMenuMapper.xml rename to zayac-admin-system/src/main/resources/mapper/RoleMenuMapper.xml index 0f8bbdea..20fa4c49 100644 --- a/continew-admin-system/src/main/resources/mapper/RoleMenuMapper.xml +++ b/zayac-admin-system/src/main/resources/mapper/RoleMenuMapper.xml @@ -1,6 +1,6 @@ - + + + resultType="com.zayac.admin.system.model.entity.UserSocialDO"> SELECT t1.* FROM sys_user_social AS t1 LEFT JOIN sys_user AS t2 ON t2.id = t1.user_id diff --git a/continew-admin-webapi/pom.xml b/zayac-admin-webapi/pom.xml similarity index 92% rename from continew-admin-webapi/pom.xml rename to zayac-admin-webapi/pom.xml index 31a77954..9ea7c0fc 100644 --- a/continew-admin-webapi/pom.xml +++ b/zayac-admin-webapi/pom.xml @@ -4,18 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.continew - continew-admin + com.zayac + zayac-admin ${revision} - continew-admin-webapi + zayac-admin-webapi API 及打包部署模块 - top.continew.admin.ContiNewAdminApplication + zayac.admin.ContiNewAdminApplication bin @@ -39,14 +39,14 @@ - top.continew - continew-admin-generator + com.zayac + zayac-admin-generator - top.continew - continew-admin-system + com.zayac + zayac-admin-system diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/ContiNewAdminApplication.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/ZayacAdminApplication.java similarity index 93% rename from continew-admin-webapi/src/main/java/top/continew/admin/ContiNewAdminApplication.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/ZayacAdminApplication.java index c829326d..c87425d2 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/ContiNewAdminApplication.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/ZayacAdminApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin; +package com.zayac.admin; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.util.URLUtil; @@ -52,14 +52,14 @@ import java.net.InetAddress; @RequiredArgsConstructor @EnableCrudRestController @EnableGlobalExceptionHandler -@EnableMethodCache(basePackages = "top.continew.admin") -public class ContiNewAdminApplication implements ApplicationRunner { +@EnableMethodCache(basePackages = "com.zayac.admin") +public class ZayacAdminApplication implements ApplicationRunner { private final ProjectProperties projectProperties; private final ServerProperties serverProperties; public static void main(String[] args) { - SpringApplication.run(ContiNewAdminApplication.class, args); + SpringApplication.run(ZayacAdminApplication.class, args); } /** diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/AuthController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/auth/AuthController.java similarity index 87% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/AuthController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/auth/AuthController.java index ac935f40..170daa39 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/AuthController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/auth/AuthController.java @@ -14,11 +14,20 @@ * limitations under the License. */ -package top.continew.admin.webapi.auth; +package com.zayac.admin.webapi.auth; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; +import com.zayac.admin.auth.model.req.AccountLoginReq; +import com.zayac.admin.auth.model.req.EmailLoginReq; +import com.zayac.admin.auth.model.req.PhoneLoginReq; +import com.zayac.admin.auth.model.resp.LoginResp; +import com.zayac.admin.auth.model.resp.RouteResp; +import com.zayac.admin.auth.model.resp.UserInfoResp; +import com.zayac.admin.auth.service.LoginService; +import com.zayac.admin.system.model.resp.UserDetailResp; +import com.zayac.admin.system.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -26,19 +35,10 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.auth.model.req.AccountLoginReq; -import top.continew.admin.auth.model.req.EmailLoginReq; -import top.continew.admin.auth.model.req.PhoneLoginReq; -import top.continew.admin.auth.model.resp.LoginResp; -import top.continew.admin.auth.model.resp.RouteResp; -import top.continew.admin.auth.model.resp.UserInfoResp; -import top.continew.admin.auth.service.LoginService; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.model.dto.LoginUser; -import top.continew.admin.common.util.SecureUtils; -import top.continew.admin.common.util.helper.LoginHelper; -import top.continew.admin.system.model.resp.UserDetailResp; -import top.continew.admin.system.service.UserService; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.common.model.dto.LoginUser; +import com.zayac.admin.common.util.SecureUtils; +import com.zayac.admin.common.util.helper.LoginHelper; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.validate.ValidationUtils; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/SocialAuthController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/auth/SocialAuthController.java similarity index 94% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/SocialAuthController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/auth/SocialAuthController.java index 0e500dd6..60e2528d 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/SocialAuthController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/auth/SocialAuthController.java @@ -14,11 +14,14 @@ * limitations under the License. */ -package top.continew.admin.webapi.auth; +package com.zayac.admin.webapi.auth; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; import com.xkcoding.justauth.AuthRequestFactory; +import com.zayac.admin.auth.model.resp.LoginResp; +import com.zayac.admin.auth.model.resp.SocialAuthAuthorizeResp; +import com.zayac.admin.auth.service.LoginService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -30,9 +33,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.utils.AuthStateUtils; import org.springframework.web.bind.annotation.*; -import top.continew.admin.auth.model.resp.LoginResp; -import top.continew.admin.auth.model.resp.SocialAuthAuthorizeResp; -import top.continew.admin.auth.service.LoginService; import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.util.validate.ValidationUtils; import top.continew.starter.log.core.annotation.Log; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CaptchaController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CaptchaController.java similarity index 97% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CaptchaController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CaptchaController.java index 35b997b5..0905dfc6 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CaptchaController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CaptchaController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.common; +package com.zayac.admin.webapi.common; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.LocalDateTimeUtil; @@ -44,9 +44,9 @@ import org.redisson.api.RateType; import org.springframework.http.HttpHeaders; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.common.config.properties.CaptchaProperties; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.model.resp.CaptchaResp; +import com.zayac.admin.common.config.properties.CaptchaProperties; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.common.model.resp.CaptchaResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.captcha.graphic.core.GraphicCaptchaService; import top.continew.starter.core.autoconfigure.project.ProjectProperties; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CommonController.java similarity index 92% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CommonController.java index b287edaf..3faa3ad9 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CommonController.java @@ -14,13 +14,19 @@ * limitations under the License. */ -package top.continew.admin.webapi.common; +package com.zayac.admin.webapi.common; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.StrUtil; import com.alicp.jetcache.anno.Cached; +import com.zayac.admin.system.model.query.DeptQuery; +import com.zayac.admin.system.model.query.MenuQuery; +import com.zayac.admin.system.model.query.OptionQuery; +import com.zayac.admin.system.model.query.RoleQuery; +import com.zayac.admin.system.model.resp.FileUploadResp; +import com.zayac.admin.system.service.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -31,14 +37,9 @@ import org.dromara.x.file.storage.core.FileInfo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.model.resp.LabelValueResp; -import top.continew.admin.system.model.query.DeptQuery; -import top.continew.admin.system.model.query.MenuQuery; -import top.continew.admin.system.model.query.OptionQuery; -import top.continew.admin.system.model.query.RoleQuery; -import top.continew.admin.system.model.resp.FileUploadResp; -import top.continew.admin.system.service.*; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.common.model.resp.LabelValueResp; +import com.zayac.admin.system.service.*; import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.core.util.validate.ValidationUtils; import top.continew.starter.data.mybatis.plus.base.IBaseEnum; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/DashboardController.java similarity index 87% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/DashboardController.java index d4523dba..ffc79377 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/DashboardController.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package top.continew.admin.webapi.common; +package com.zayac.admin.webapi.common; import com.alicp.jetcache.anno.CachePenetrationProtect; import com.alicp.jetcache.anno.CacheRefresh; import com.alicp.jetcache.anno.CacheType; import com.alicp.jetcache.anno.Cached; +import com.zayac.admin.system.service.DashboardService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -30,13 +31,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.system.model.resp.DashboardAccessTrendResp; -import top.continew.admin.system.model.resp.DashboardGeoDistributionResp; -import top.continew.admin.system.model.resp.DashboardPopularModuleResp; -import top.continew.admin.system.model.resp.DashboardTotalResp; -import top.continew.admin.system.service.DashboardService; -import top.continew.admin.system.model.resp.DashboardNoticeResp; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.system.model.resp.DashboardAccessTrendResp; +import com.zayac.admin.system.model.resp.DashboardGeoDistributionResp; +import com.zayac.admin.system.model.resp.DashboardPopularModuleResp; +import com.zayac.admin.system.model.resp.DashboardTotalResp; +import com.zayac.admin.system.model.resp.DashboardNoticeResp; import top.continew.starter.core.util.validate.ValidationUtils; import top.continew.starter.web.model.R; import top.continew.starter.log.core.annotation.Log; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/monitor/OnlineUserController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/monitor/OnlineUserController.java similarity index 92% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/monitor/OnlineUserController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/monitor/OnlineUserController.java index 85e89a06..24f1929c 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/monitor/OnlineUserController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/monitor/OnlineUserController.java @@ -14,8 +14,11 @@ * limitations under the License. */ -package top.continew.admin.webapi.monitor; +package com.zayac.admin.webapi.monitor; +import com.zayac.admin.auth.model.query.OnlineUserQuery; +import com.zayac.admin.auth.model.resp.OnlineUserResp; +import com.zayac.admin.auth.service.OnlineUserService; import lombok.RequiredArgsConstructor; import io.swagger.v3.oas.annotations.Operation; @@ -29,9 +32,6 @@ import org.springframework.web.bind.annotation.*; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.stp.StpUtil; -import top.continew.admin.auth.model.query.OnlineUserQuery; -import top.continew.admin.auth.model.resp.OnlineUserResp; -import top.continew.admin.auth.service.OnlineUserService; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DeptController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DeptController.java similarity index 83% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DeptController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DeptController.java index 49420760..1f0cce9f 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DeptController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DeptController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; +import com.zayac.admin.system.model.query.DeptQuery; +import com.zayac.admin.system.model.req.DeptReq; +import com.zayac.admin.system.model.resp.DeptResp; +import com.zayac.admin.system.service.DeptService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -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.admin.system.service.DeptService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.controller.BaseController; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DictController.java similarity index 83% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DictController.java index e011684c..664a2fa3 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DictController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; +import com.zayac.admin.system.model.query.DictQuery; +import com.zayac.admin.system.model.req.DictReq; +import com.zayac.admin.system.model.resp.DictResp; +import com.zayac.admin.system.service.DictService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -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.DictService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.controller.BaseController; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictItemController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DictItemController.java similarity index 82% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictItemController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DictItemController.java index 7d17a3de..9a676d2b 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictItemController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/DictItemController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; +import com.zayac.admin.system.model.query.DictItemQuery; +import com.zayac.admin.system.model.req.DictItemReq; +import com.zayac.admin.system.model.resp.DictItemResp; +import com.zayac.admin.system.service.DictItemService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -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.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.controller.BaseController; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/FileController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/FileController.java similarity index 84% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/FileController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/FileController.java index 3eb25ecf..404dc6cf 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/FileController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/FileController.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.zayac.admin.system.model.query.FileQuery; +import com.zayac.admin.system.model.req.FileReq; +import com.zayac.admin.system.model.resp.FileResp; +import com.zayac.admin.system.model.resp.FileStatisticsResp; +import com.zayac.admin.system.service.FileService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -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.model.resp.FileStatisticsResp; -import top.continew.admin.system.service.FileService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.controller.BaseController; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/LogController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/LogController.java similarity index 91% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/LogController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/LogController.java index bba40228..e9abc902 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/LogController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/LogController.java @@ -14,9 +14,13 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.zayac.admin.system.model.query.LogQuery; +import com.zayac.admin.system.model.resp.log.LogDetailResp; +import com.zayac.admin.system.model.resp.log.LogResp; +import com.zayac.admin.system.service.LogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -28,10 +32,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.system.model.query.LogQuery; -import top.continew.admin.system.model.resp.log.LogDetailResp; -import top.continew.admin.system.model.resp.log.LogResp; -import top.continew.admin.system.service.LogService; 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-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/MenuController.java similarity index 92% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/MenuController.java index d6df9605..492c2e75 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/MenuController.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.zayac.admin.system.model.query.MenuQuery; +import com.zayac.admin.system.model.req.MenuReq; +import com.zayac.admin.system.model.resp.MenuResp; +import com.zayac.admin.system.service.MenuService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -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.constant.StringConstants; import top.continew.starter.core.util.URLUtils; import top.continew.starter.core.util.validate.ValidationUtils; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MessageController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/MessageController.java similarity index 88% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MessageController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/MessageController.java index 10dd1d2a..c242934d 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MessageController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/MessageController.java @@ -14,8 +14,13 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; +import com.zayac.admin.system.model.query.MessageQuery; +import com.zayac.admin.system.model.resp.MessageResp; +import com.zayac.admin.system.model.resp.MessageUnreadResp; +import com.zayac.admin.system.service.MessageService; +import com.zayac.admin.system.service.MessageUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -23,12 +28,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.common.util.helper.LoginHelper; -import top.continew.admin.system.model.query.MessageQuery; -import top.continew.admin.system.model.resp.MessageResp; -import top.continew.admin.system.model.resp.MessageUnreadResp; -import top.continew.admin.system.service.MessageService; -import top.continew.admin.system.service.MessageUserService; +import com.zayac.admin.common.util.helper.LoginHelper; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.web.model.R; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/NoticeController.java similarity index 88% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/NoticeController.java index 3f616401..22c20b1d 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/NoticeController.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; +import com.zayac.admin.system.model.query.NoticeQuery; +import com.zayac.admin.system.model.req.NoticeReq; +import com.zayac.admin.system.model.resp.NoticeDetailResp; +import com.zayac.admin.system.model.resp.NoticeResp; +import com.zayac.admin.system.service.NoticeService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.system.model.query.NoticeQuery; -import top.continew.admin.system.model.req.NoticeReq; -import top.continew.admin.system.model.resp.NoticeDetailResp; -import top.continew.admin.system.model.resp.NoticeResp; -import top.continew.admin.system.service.NoticeService; import top.continew.starter.core.util.validate.ValidationUtils; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.controller.BaseController; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/OptionController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/OptionController.java similarity index 86% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/OptionController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/OptionController.java index b549797f..5b7b15ff 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/OptionController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/OptionController.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.zayac.admin.system.model.query.OptionQuery; +import com.zayac.admin.system.model.req.OptionReq; +import com.zayac.admin.system.model.req.OptionResetValueReq; +import com.zayac.admin.system.model.resp.OptionResp; +import com.zayac.admin.system.service.OptionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.system.model.query.OptionQuery; -import top.continew.admin.system.model.req.OptionReq; -import top.continew.admin.system.model.req.OptionResetValueReq; -import top.continew.admin.system.model.resp.OptionResp; -import top.continew.admin.system.service.OptionService; import top.continew.starter.web.model.R; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/RoleController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/RoleController.java similarity index 80% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/RoleController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/RoleController.java index 394fff0d..03a69722 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/RoleController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/RoleController.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; +import com.zayac.admin.system.model.query.RoleQuery; +import com.zayac.admin.system.model.req.RoleReq; +import com.zayac.admin.system.model.resp.RoleDetailResp; +import com.zayac.admin.system.model.resp.RoleResp; +import com.zayac.admin.system.service.RoleService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -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.admin.system.service.RoleService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.controller.BaseController; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/StorageController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/StorageController.java similarity index 82% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/StorageController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/StorageController.java index 3cd17f47..d957bb51 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/StorageController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/StorageController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; +import com.zayac.admin.system.model.query.StorageQuery; +import com.zayac.admin.system.model.req.StorageReq; +import com.zayac.admin.system.model.resp.StorageResp; +import com.zayac.admin.system.service.StorageService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; -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.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.continew.starter.extension.crud.controller.BaseController; import top.continew.starter.extension.crud.enums.Api; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserCenterController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/UserCenterController.java similarity index 89% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserCenterController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/UserCenterController.java index c95e18ca..5d415d70 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserCenterController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/UserCenterController.java @@ -14,10 +14,19 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; import cn.hutool.core.util.ReUtil; import com.xkcoding.justauth.AuthRequestFactory; +import com.zayac.admin.system.model.entity.UserSocialDO; +import com.zayac.admin.system.model.req.UserBasicInfoUpdateReq; +import com.zayac.admin.system.model.req.UserEmailUpdateRequest; +import com.zayac.admin.system.model.req.UserPasswordUpdateReq; +import com.zayac.admin.system.model.req.UserPhoneUpdateReq; +import com.zayac.admin.system.model.resp.AvatarResp; +import com.zayac.admin.system.model.resp.UserSocialBindResp; +import com.zayac.admin.system.service.UserService; +import com.zayac.admin.system.service.UserSocialService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -31,20 +40,11 @@ import me.zhyd.oauth.request.AuthRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.common.constant.RegexConstants; -import top.continew.admin.common.enums.SocialSourceEnum; -import top.continew.admin.common.util.SecureUtils; -import top.continew.admin.common.util.helper.LoginHelper; -import top.continew.admin.system.model.entity.UserSocialDO; -import top.continew.admin.system.model.req.UserBasicInfoUpdateReq; -import top.continew.admin.system.model.req.UserEmailUpdateRequest; -import top.continew.admin.system.model.req.UserPasswordUpdateReq; -import top.continew.admin.system.model.req.UserPhoneUpdateReq; -import top.continew.admin.system.model.resp.AvatarResp; -import top.continew.admin.system.model.resp.UserSocialBindResp; -import top.continew.admin.system.service.UserService; -import top.continew.admin.system.service.UserSocialService; +import com.zayac.admin.common.constant.CacheConstants; +import com.zayac.admin.common.constant.RegexConstants; +import com.zayac.admin.common.enums.SocialSourceEnum; +import com.zayac.admin.common.util.SecureUtils; +import com.zayac.admin.common.util.helper.LoginHelper; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.validate.ValidationUtils; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/UserController.java similarity index 87% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/UserController.java index 250396a1..a8b0fc8c 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/UserController.java @@ -14,10 +14,17 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package com.zayac.admin.webapi.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ReUtil; +import com.zayac.admin.system.model.query.UserQuery; +import com.zayac.admin.system.model.req.UserPasswordResetReq; +import com.zayac.admin.system.model.req.UserReq; +import com.zayac.admin.system.model.req.UserRoleUpdateReq; +import com.zayac.admin.system.model.resp.UserDetailResp; +import com.zayac.admin.system.model.resp.UserResp; +import com.zayac.admin.system.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -27,15 +34,8 @@ import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import top.continew.admin.common.constant.RegexConstants; -import top.continew.admin.common.util.SecureUtils; -import top.continew.admin.system.model.query.UserQuery; -import top.continew.admin.system.model.req.UserPasswordResetReq; -import top.continew.admin.system.model.req.UserReq; -import top.continew.admin.system.model.req.UserRoleUpdateReq; -import top.continew.admin.system.model.resp.UserDetailResp; -import top.continew.admin.system.model.resp.UserResp; -import top.continew.admin.system.service.UserService; +import com.zayac.admin.common.constant.RegexConstants; +import com.zayac.admin.common.util.SecureUtils; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.validate.ValidationUtils; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/tool/GeneratorController.java similarity index 90% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java rename to zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/tool/GeneratorController.java index d3da0c7b..3cbc8d24 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/tool/GeneratorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.tool; +package com.zayac.admin.webapi.tool; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; @@ -26,13 +26,13 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.generator.model.entity.FieldConfigDO; -import top.continew.admin.generator.model.entity.GenConfigDO; -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 com.zayac.admin.generator.model.entity.FieldConfigDO; +import com.zayac.admin.generator.model.entity.GenConfigDO; +import com.zayac.admin.generator.model.query.TableQuery; +import com.zayac.admin.generator.model.req.GenConfigReq; +import com.zayac.admin.generator.model.resp.GeneratePreviewResp; +import com.zayac.admin.generator.model.resp.TableResp; +import com.zayac.admin.generator.service.GeneratorService; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.web.model.R; diff --git a/continew-admin-webapi/src/main/resources/banner.txt b/zayac-admin-webapi/src/main/resources/banner.txt similarity index 100% rename from continew-admin-webapi/src/main/resources/banner.txt rename to zayac-admin-webapi/src/main/resources/banner.txt diff --git a/continew-admin-webapi/src/main/resources/config/application-dev.yml b/zayac-admin-webapi/src/main/resources/config/application-dev.yml similarity index 92% rename from continew-admin-webapi/src/main/resources/config/application-dev.yml rename to zayac-admin-webapi/src/main/resources/config/application-dev.yml index d93c3b0c..80c744fd 100644 --- a/continew-admin-webapi/src/main/resources/config/application-dev.yml +++ b/zayac-admin-webapi/src/main/resources/config/application-dev.yml @@ -22,14 +22,14 @@ spring.datasource: datasource: # 主库配置（可配多个，构成多主） master: - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false - username: ${DB_USER:root} - password: ${DB_PWD:123456} + url: jdbc:mysql://${DB_HOST:45.89.233.228}:${DB_PORT:3306}/${DB_NAME:zayac_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false + username: ${DB_USER:zayac_admin} + password: ${DB_PWD:2hMtBRzZrDAkRynX} driver-class-name: com.mysql.cj.jdbc.Driver type: ${spring.datasource.type} # 从库配置（可配多个，构成多从） slave_1: - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false + url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:zayac_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false username: password: lazy: true @@ -67,11 +67,11 @@ spring.data: ## Redis 配置（单机模式） redis: # 地址 - host: ${REDIS_HOST:127.0.0.1} + host: ${REDIS_HOST:38.6.218.29} # 端口（默认 6379） port: ${REDIS_PORT:6379} # 密码（未设置密码时可为空或注释掉） - password: ${REDIS_PWD:123456} + password: ${REDIS_PWD:jhkdjhkjdhsIUTYURTU_mWHmDY} # 数据库索引 database: ${REDIS_DB:0} # 连接超时时间 diff --git a/continew-admin-webapi/src/main/resources/config/application-generator.yml b/zayac-admin-webapi/src/main/resources/config/application-generator.yml similarity index 100% rename from continew-admin-webapi/src/main/resources/config/application-generator.yml rename to zayac-admin-webapi/src/main/resources/config/application-generator.yml diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/zayac-admin-webapi/src/main/resources/config/application-prod.yml similarity index 100% rename from continew-admin-webapi/src/main/resources/config/application-prod.yml rename to zayac-admin-webapi/src/main/resources/config/application-prod.yml diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/zayac-admin-webapi/src/main/resources/config/application.yml similarity index 99% rename from continew-admin-webapi/src/main/resources/config/application.yml rename to zayac-admin-webapi/src/main/resources/config/application.yml index 54e77d89..172971de 100644 --- a/continew-admin-webapi/src/main/resources/config/application.yml +++ b/zayac-admin-webapi/src/main/resources/config/application.yml @@ -9,7 +9,7 @@ project: # 描述 description: 持续迭代优化的前后端分离中后台管理系统框架，开箱即用，持续提供舒适的开发体验。 # 基本包 - base-package: top.continew.admin + base-package: com.zayac ## 作者信息配置 contact: name: Charles7c diff --git a/continew-admin-webapi/src/main/resources/db/changelog/db.changelog-master.yaml b/zayac-admin-webapi/src/main/resources/db/changelog/db.changelog-master.yaml similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/db.changelog-master.yaml rename to zayac-admin-webapi/src/main/resources/db/changelog/db.changelog-master.yaml diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql b/zayac-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql rename to zayac-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql b/zayac-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql rename to zayac-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql b/zayac-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql rename to zayac-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql b/zayac-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql rename to zayac-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql b/zayac-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql rename to zayac-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql b/zayac-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql rename to zayac-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql diff --git a/continew-admin-webapi/src/main/resources/favicon.ico b/zayac-admin-webapi/src/main/resources/favicon.ico similarity index 100% rename from continew-admin-webapi/src/main/resources/favicon.ico rename to zayac-admin-webapi/src/main/resources/favicon.ico diff --git a/continew-admin-webapi/src/main/resources/logback-spring.xml b/zayac-admin-webapi/src/main/resources/logback-spring.xml similarity index 100% rename from continew-admin-webapi/src/main/resources/logback-spring.xml rename to zayac-admin-webapi/src/main/resources/logback-spring.xml diff --git a/continew-admin-webapi/src/main/resources/templates/mail/captcha.ftl b/zayac-admin-webapi/src/main/resources/templates/mail/captcha.ftl similarity index 100% rename from continew-admin-webapi/src/main/resources/templates/mail/captcha.ftl rename to zayac-admin-webapi/src/main/resources/templates/mail/captcha.ftl diff --git a/continew-admin-webapi/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java b/zayac-admin-webapi/src/test/java/com/zayac/admin/ContiNewAdminApplicationTests.java similarity index 96% rename from continew-admin-webapi/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java rename to zayac-admin-webapi/src/test/java/com/zayac/admin/ContiNewAdminApplicationTests.java index d42bdcd4..95667c41 100644 --- a/continew-admin-webapi/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java +++ b/zayac-admin-webapi/src/test/java/com/zayac/admin/ContiNewAdminApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin; +package com.zayac.admin; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;