From 6b69dd43e1544bd955901d6110fa7d7f65aaa80c Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 1 Aug 2024 22:02:06 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E7=9A=84=E5=8C=85=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew/admin/auth/service/impl/LoginServiceImpl.java | 4 ++-- .../java/top/continew/admin/system}/enums/MenuTypeEnum.java | 2 +- .../top/continew/admin/system}/enums/MessageTypeEnum.java | 2 +- .../top/continew/admin/system}/enums/SocialSourceEnum.java | 2 +- .../java/top/continew/admin/system/model/entity/MenuDO.java | 2 +- .../top/continew/admin/system/model/entity/MessageDO.java | 2 +- .../top/continew/admin/system/model/query/MessageQuery.java | 2 +- .../java/top/continew/admin/system/model/req/MenuReq.java | 2 +- .../java/top/continew/admin/system/model/req/MessageReq.java | 2 +- .../java/top/continew/admin/system/model/resp/MenuResp.java | 2 +- .../top/continew/admin/system/model/resp/MessageResp.java | 2 +- .../admin/system/model/resp/MessageTypeUnreadResp.java | 2 +- .../continew/admin/system/service/impl/MenuServiceImpl.java | 2 +- .../admin/system/service/impl/MessageUserServiceImpl.java | 2 +- .../admin/system/service/impl/UserSocialServiceImpl.java | 2 +- .../admin/controller/system/UserCenterController.java | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename {continew-admin-common/src/main/java/top/continew/admin/common => continew-admin-system/src/main/java/top/continew/admin/system}/enums/MenuTypeEnum.java (96%) rename {continew-admin-common/src/main/java/top/continew/admin/common => continew-admin-system/src/main/java/top/continew/admin/system}/enums/MessageTypeEnum.java (96%) rename {continew-admin-common/src/main/java/top/continew/admin/common => continew-admin-system/src/main/java/top/continew/admin/system}/enums/SocialSourceEnum.java (96%) diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java index c3dc5f3c..da207c48 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -42,8 +42,8 @@ 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.system.enums.MenuTypeEnum; +import top.continew.admin.system.enums.MessageTypeEnum; import top.continew.admin.common.model.dto.LoginUser; import top.continew.admin.common.model.dto.RoleDTO; import top.continew.admin.common.util.helper.LoginHelper; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java index 008cfdcf..70c768fb 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java index 883c9e7b..b1d9b658 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java similarity index 96% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java index dd1872d7..f80a9799 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SocialSourceEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.enums; +package top.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java index 598a4cde..9a0ded73 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.admin.common.enums.MenuTypeEnum; +import top.continew.admin.system.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/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java index 1f5f203e..1e0157a6 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.admin.common.enums.MessageTypeEnum; +import top.continew.admin.system.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java index 9c4fcc13..130fb253 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.MessageTypeEnum; +import top.continew.admin.system.enums.MessageTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.annotation.QueryIgnore; import top.continew.starter.data.core.enums.QueryType; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java index 7f2e8aaa..31b972f0 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java @@ -23,7 +23,7 @@ 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 top.continew.admin.system.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/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java index 0c1126b9..15fa4d37 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java @@ -21,7 +21,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.MessageTypeEnum; +import top.continew.admin.system.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/resp/MenuResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java index 9df9b086..c5b7b0e9 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java @@ -19,7 +19,7 @@ package top.continew.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 top.continew.admin.system.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/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java index dea68407..c16fa523 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java @@ -21,7 +21,7 @@ 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 top.continew.admin.system.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/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java index f272df56..cd5189ba 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.common.enums.MessageTypeEnum; +import top.continew.admin.system.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java index 4d95bf3e..6911cb65 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java @@ -24,7 +24,7 @@ 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.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; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java index 1a1a9d4e..84d4a483 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java @@ -19,7 +19,7 @@ package top.continew.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.common.enums.MessageTypeEnum; +import top.continew.admin.system.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; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java index a1eb5b3b..0b909d80 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; import cn.hutool.json.JSONUtil; -import top.continew.admin.common.enums.SocialSourceEnum; +import top.continew.admin.system.enums.SocialSourceEnum; import top.continew.admin.system.mapper.UserSocialMapper; import top.continew.admin.system.model.entity.UserSocialDO; import top.continew.admin.system.service.UserSocialService; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java index 41991b67..70c3398b 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java @@ -31,7 +31,7 @@ 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.enums.SocialSourceEnum; +import top.continew.admin.system.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;