From 23b77979510ceeb4c162d9a12016031a783a617f Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Fri, 24 May 2024 14:26:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E6=94=B9):=20:rocket:=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4model=E7=BB=93=E6=9E=84=EF=BC=8C=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=87=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=92=8CJava=E9=82=AE=E4=BB=B6=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/common-utils/pom.xml | 2 +- common/service-utils/pom.xml | 2 +- .../common/service/exception/BunnyException.java | 2 +- .../service/exception/GlobalExceptionHandler.java | 6 +++--- .../cn/bunny/common/service/utils/ResponseUtil.java | 2 +- {model => dao}/pom.xml | 2 +- .../cn/bunny/dto/article/LoadArticleListDto.java | 0 .../cn/bunny/dto/article/LoadUserArticleDto.java | 0 .../java/cn/bunny/dto/common/CommentPostDto.java | 0 .../java/cn/bunny/dto/common/CommentQueryDto.java | 0 .../java/cn/bunny/dto/common/QueryTopTypeDto.java | 0 .../java/cn/bunny/dto/email/EmailTemplateDto.java | 0 .../main/java/cn/bunny/dto/email/EmailUsersDto.java | 0 .../src/main/java/cn/bunny/dto/user/LoginDto.java | 0 .../src/main/java/cn/bunny/dto/user/RegisterDto.java | 0 .../src/main/java/cn/bunny/dto/user/ResetPwdDto.java | 0 .../src/main/java/cn/bunny/dto/user/UserInfoDto.java | 0 .../cn/bunny/dto/user/UserIntegralRecordDto.java | 0 .../main/java/cn/bunny/dto/user/UserMessageDto.java | 0 .../main/java/cn/bunny/entity/base/BaseEntity.java | 0 .../cn/bunny/entity/system/admin/AdminPower.java | 0 .../java/cn/bunny/entity/system/admin/AdminRole.java | 0 .../cn/bunny/entity/system/admin/AdminRolePower.java | 0 .../cn/bunny/entity/system/admin/AdminUserRole.java | 0 .../bunny/entity/system/admin/auth/AuthUserRole.java | 0 .../java/cn/bunny/entity/system/article/Article.java | 0 .../cn/bunny/entity/system/article/ForumComment.java | 0 .../bunny/entity/system/article/IntegralRecord.java | 0 .../cn/bunny/entity/system/article/LikeRecord.java | 0 .../cn/bunny/entity/system/board/ForumBoard.java | 0 .../cn/bunny/entity/system/email/EmailTemplate.java | 0 .../cn/bunny/entity/system/email/EmailUsers.java | 0 .../main/java/cn/bunny/entity/system/file/Files.java | 0 .../main/java/cn/bunny/entity/system/user/User.java | 0 .../cn/bunny/entity/system/user/UserMessage.java | 0 .../main/java/cn/bunny/pojo}/email/EmailSend.java | 2 +- .../java/cn/bunny/pojo}/email/EmailSendInit.java | 2 +- .../java/cn/bunny/pojo}/enums/OperationType.java | 2 +- .../src/main/java/cn/bunny/pojo}/result/Result.java | 2 +- .../java/cn/bunny/pojo}/result/ResultCodeEnum.java | 2 +- .../pojo}/result/constant/ExceptionConstant.java | 2 +- .../pojo}/result/constant/FileMessageConstant.java | 2 +- .../pojo}/result/constant/LocalDateTimeConstant.java | 2 +- .../pojo}/result/constant/MailMessageConstant.java | 2 +- .../pojo}/result/constant/RedisUserConstant.java | 2 +- .../pojo}/result/constant/SQLAutoFillConstant.java | 2 +- .../pojo}/result/constant/SecurityConstant.java | 2 +- .../bunny/pojo}/result/constant/StatusConstant.java | 2 +- .../cn/bunny/pojo}/result/constant/UserConstant.java | 2 +- .../java/cn/bunny/pojo}/tree/AbstractTreeNode.java | 2 +- .../main/java/cn/bunny/pojo}/tree/TreeBuilder.java | 2 +- .../main/java/cn/bunny/vo/email/EmailTemplateVo.java | 0 .../src/main/java/cn/bunny/vo/file/FileInfoVo.java | 0 .../src/main/java/cn/bunny/vo/page/PageResult.java | 0 .../cn/bunny/vo/system/article/ForumArticleVo.java | 0 .../java/cn/bunny/vo/system/board/ForumBoardVo.java | 2 +- .../java/cn/bunny/vo/system/comment/CommentVo.java | 0 .../main/java/cn/bunny/vo/system/login/LoginVo.java | 2 +- .../cn/bunny/vo/system/login/ValidateCodeVo.java | 0 .../java/cn/bunny/vo/system/user/UserInfoVo.java | 2 +- .../bunny/vo/system/user/UserIntegralRecordVo.java | 0 .../cn/bunny/vo/system/user/UserMessageCountVo.java | 0 .../java/cn/bunny/vo/system/user/UserMessageVo.java | 0 .../bunny/module/mail/utils/MailSendCheckUtil.java | 4 ++-- .../cn/bunny/module/mail/utils/MailSenderUtil.java | 4 ++-- .../java/cn/bunny/module/minio/utils/MinioUtil.java | 2 +- module/pom.xml | 1 + .../security/filter/TokenAuthenticationFilter.java | 6 +++--- .../security/filter/TokenLoginFilterService.java | 6 +++--- .../handelr/SecurityAccessDeniedHandler.java | 4 ++-- .../handelr/SecurityAuthenticationEntryPoint.java | 4 ++-- .../SecurityAuthenticationFailureHandler.java | 2 +- .../SecurityAuthenticationSuccessHandler.java | 2 +- pom.xml | 2 +- service-client/pom.xml | 2 +- .../service/admin/controller/LoginController.java | 2 +- .../service/admin/service/impl/UserServiceImpl.java | 10 +++++----- .../bunny/service/web/aop/annotation/AutoFill.java | 2 +- .../service/web/controller/LoginController.java | 2 +- .../web/interceptor/UserTokenInterceptor.java | 6 +++--- .../service/web/service/impl/LoginServiceImpl.java | 12 ++++++------ .../service/web/service/impl/UserServiceImpl.java | 4 ++-- 82 files changed, 66 insertions(+), 65 deletions(-) rename {model => dao}/pom.xml (98%) rename {model => dao}/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/common/CommentPostDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/common/CommentQueryDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/email/EmailUsersDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/user/LoginDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/user/RegisterDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/user/ResetPwdDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/user/UserInfoDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/dto/user/UserMessageDto.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/base/BaseEntity.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/admin/AdminPower.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/admin/AdminRole.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/article/Article.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/article/ForumComment.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/article/LikeRecord.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/board/ForumBoard.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/email/EmailUsers.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/file/Files.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/user/User.java (100%) rename {model => dao}/src/main/java/cn/bunny/entity/system/user/UserMessage.java (100%) rename {model/src/main/java/cn/bunny/entity/system => dao/src/main/java/cn/bunny/pojo}/email/EmailSend.java (93%) rename {model/src/main/java/cn/bunny/entity/system => dao/src/main/java/cn/bunny/pojo}/email/EmailSendInit.java (90%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/enums/OperationType.java (74%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/Result.java (99%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/ResultCodeEnum.java (98%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/ExceptionConstant.java (98%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/FileMessageConstant.java (96%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/LocalDateTimeConstant.java (90%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/MailMessageConstant.java (92%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/RedisUserConstant.java (97%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/SQLAutoFillConstant.java (90%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/SecurityConstant.java (91%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/StatusConstant.java (85%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/result/constant/UserConstant.java (85%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/tree/AbstractTreeNode.java (86%) rename {model/src/main/java/cn/bunny => dao/src/main/java/cn/bunny/pojo}/tree/TreeBuilder.java (96%) rename {model => dao}/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/file/FileInfoVo.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/page/PageResult.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java (93%) rename {model => dao}/src/main/java/cn/bunny/vo/system/comment/CommentVo.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/system/login/LoginVo.java (96%) rename {model => dao}/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java (96%) rename {model => dao}/src/main/java/cn/bunny/vo/system/user/UserIntegralRecordVo.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/system/user/UserMessageCountVo.java (100%) rename {model => dao}/src/main/java/cn/bunny/vo/system/user/UserMessageVo.java (100%) diff --git a/common/common-utils/pom.xml b/common/common-utils/pom.xml index f832c59..943745a 100644 --- a/common/common-utils/pom.xml +++ b/common/common-utils/pom.xml @@ -20,7 +20,7 @@ cn.bunny - model + dao 0.0.1-SNAPSHOT diff --git a/common/service-utils/pom.xml b/common/service-utils/pom.xml index 3a326b2..0405330 100644 --- a/common/service-utils/pom.xml +++ b/common/service-utils/pom.xml @@ -19,7 +19,7 @@ cn.bunny - model + dao 0.0.1-SNAPSHOT diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/BunnyException.java b/common/service-utils/src/main/java/cn/bunny/common/service/exception/BunnyException.java index 1012971..680c503 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/BunnyException.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/exception/BunnyException.java @@ -1,6 +1,6 @@ package cn.bunny.common.service.exception; -import cn.bunny.result.ResultCodeEnum; +import cn.bunny.pojo.result.ResultCodeEnum; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java index 345d29b..30ec51c 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ package cn.bunny.common.service.exception; -import cn.bunny.result.Result; -import cn.bunny.result.ResultCodeEnum; -import cn.bunny.result.constant.ExceptionConstant; +import cn.bunny.pojo.result.Result; +import cn.bunny.pojo.result.ResultCodeEnum; +import cn.bunny.pojo.result.constant.ExceptionConstant; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java index 2f3f1f2..d6f2019 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java @@ -1,6 +1,6 @@ package cn.bunny.common.service.utils; -import cn.bunny.result.Result; +import cn.bunny.pojo.result.Result; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.servlet.http.HttpServletResponse; diff --git a/model/pom.xml b/dao/pom.xml similarity index 98% rename from model/pom.xml rename to dao/pom.xml index 4fff05a..f2cdc0c 100644 --- a/model/pom.xml +++ b/dao/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT - model + dao jar model diff --git a/model/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java b/dao/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java rename to dao/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java diff --git a/model/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java b/dao/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java rename to dao/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java diff --git a/model/src/main/java/cn/bunny/dto/common/CommentPostDto.java b/dao/src/main/java/cn/bunny/dto/common/CommentPostDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/common/CommentPostDto.java rename to dao/src/main/java/cn/bunny/dto/common/CommentPostDto.java diff --git a/model/src/main/java/cn/bunny/dto/common/CommentQueryDto.java b/dao/src/main/java/cn/bunny/dto/common/CommentQueryDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/common/CommentQueryDto.java rename to dao/src/main/java/cn/bunny/dto/common/CommentQueryDto.java diff --git a/model/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java b/dao/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java rename to dao/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java diff --git a/model/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java b/dao/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java rename to dao/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java diff --git a/model/src/main/java/cn/bunny/dto/email/EmailUsersDto.java b/dao/src/main/java/cn/bunny/dto/email/EmailUsersDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/email/EmailUsersDto.java rename to dao/src/main/java/cn/bunny/dto/email/EmailUsersDto.java diff --git a/model/src/main/java/cn/bunny/dto/user/LoginDto.java b/dao/src/main/java/cn/bunny/dto/user/LoginDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/user/LoginDto.java rename to dao/src/main/java/cn/bunny/dto/user/LoginDto.java diff --git a/model/src/main/java/cn/bunny/dto/user/RegisterDto.java b/dao/src/main/java/cn/bunny/dto/user/RegisterDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/user/RegisterDto.java rename to dao/src/main/java/cn/bunny/dto/user/RegisterDto.java diff --git a/model/src/main/java/cn/bunny/dto/user/ResetPwdDto.java b/dao/src/main/java/cn/bunny/dto/user/ResetPwdDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/user/ResetPwdDto.java rename to dao/src/main/java/cn/bunny/dto/user/ResetPwdDto.java diff --git a/model/src/main/java/cn/bunny/dto/user/UserInfoDto.java b/dao/src/main/java/cn/bunny/dto/user/UserInfoDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/user/UserInfoDto.java rename to dao/src/main/java/cn/bunny/dto/user/UserInfoDto.java diff --git a/model/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java b/dao/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java rename to dao/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java diff --git a/model/src/main/java/cn/bunny/dto/user/UserMessageDto.java b/dao/src/main/java/cn/bunny/dto/user/UserMessageDto.java similarity index 100% rename from model/src/main/java/cn/bunny/dto/user/UserMessageDto.java rename to dao/src/main/java/cn/bunny/dto/user/UserMessageDto.java diff --git a/model/src/main/java/cn/bunny/entity/base/BaseEntity.java b/dao/src/main/java/cn/bunny/entity/base/BaseEntity.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/base/BaseEntity.java rename to dao/src/main/java/cn/bunny/entity/base/BaseEntity.java diff --git a/model/src/main/java/cn/bunny/entity/system/admin/AdminPower.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminPower.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/admin/AdminPower.java rename to dao/src/main/java/cn/bunny/entity/system/admin/AdminPower.java diff --git a/model/src/main/java/cn/bunny/entity/system/admin/AdminRole.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminRole.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/admin/AdminRole.java rename to dao/src/main/java/cn/bunny/entity/system/admin/AdminRole.java diff --git a/model/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java rename to dao/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java diff --git a/model/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java rename to dao/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java diff --git a/model/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java b/dao/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java rename to dao/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java diff --git a/model/src/main/java/cn/bunny/entity/system/article/Article.java b/dao/src/main/java/cn/bunny/entity/system/article/Article.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/article/Article.java rename to dao/src/main/java/cn/bunny/entity/system/article/Article.java diff --git a/model/src/main/java/cn/bunny/entity/system/article/ForumComment.java b/dao/src/main/java/cn/bunny/entity/system/article/ForumComment.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/article/ForumComment.java rename to dao/src/main/java/cn/bunny/entity/system/article/ForumComment.java diff --git a/model/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java b/dao/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java rename to dao/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java diff --git a/model/src/main/java/cn/bunny/entity/system/article/LikeRecord.java b/dao/src/main/java/cn/bunny/entity/system/article/LikeRecord.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/article/LikeRecord.java rename to dao/src/main/java/cn/bunny/entity/system/article/LikeRecord.java diff --git a/model/src/main/java/cn/bunny/entity/system/board/ForumBoard.java b/dao/src/main/java/cn/bunny/entity/system/board/ForumBoard.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/board/ForumBoard.java rename to dao/src/main/java/cn/bunny/entity/system/board/ForumBoard.java diff --git a/model/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java b/dao/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java rename to dao/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java diff --git a/model/src/main/java/cn/bunny/entity/system/email/EmailUsers.java b/dao/src/main/java/cn/bunny/entity/system/email/EmailUsers.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/email/EmailUsers.java rename to dao/src/main/java/cn/bunny/entity/system/email/EmailUsers.java diff --git a/model/src/main/java/cn/bunny/entity/system/file/Files.java b/dao/src/main/java/cn/bunny/entity/system/file/Files.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/file/Files.java rename to dao/src/main/java/cn/bunny/entity/system/file/Files.java diff --git a/model/src/main/java/cn/bunny/entity/system/user/User.java b/dao/src/main/java/cn/bunny/entity/system/user/User.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/user/User.java rename to dao/src/main/java/cn/bunny/entity/system/user/User.java diff --git a/model/src/main/java/cn/bunny/entity/system/user/UserMessage.java b/dao/src/main/java/cn/bunny/entity/system/user/UserMessage.java similarity index 100% rename from model/src/main/java/cn/bunny/entity/system/user/UserMessage.java rename to dao/src/main/java/cn/bunny/entity/system/user/UserMessage.java diff --git a/model/src/main/java/cn/bunny/entity/system/email/EmailSend.java b/dao/src/main/java/cn/bunny/pojo/email/EmailSend.java similarity index 93% rename from model/src/main/java/cn/bunny/entity/system/email/EmailSend.java rename to dao/src/main/java/cn/bunny/pojo/email/EmailSend.java index 1d2e779..247da00 100644 --- a/model/src/main/java/cn/bunny/entity/system/email/EmailSend.java +++ b/dao/src/main/java/cn/bunny/pojo/email/EmailSend.java @@ -1,4 +1,4 @@ -package cn.bunny.entity.system.email; +package cn.bunny.pojo.email; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/model/src/main/java/cn/bunny/entity/system/email/EmailSendInit.java b/dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java similarity index 90% rename from model/src/main/java/cn/bunny/entity/system/email/EmailSendInit.java rename to dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java index d2b3aa1..ca084e1 100644 --- a/model/src/main/java/cn/bunny/entity/system/email/EmailSendInit.java +++ b/dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java @@ -1,4 +1,4 @@ -package cn.bunny.entity.system.email; +package cn.bunny.pojo.email; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/model/src/main/java/cn/bunny/enums/OperationType.java b/dao/src/main/java/cn/bunny/pojo/enums/OperationType.java similarity index 74% rename from model/src/main/java/cn/bunny/enums/OperationType.java rename to dao/src/main/java/cn/bunny/pojo/enums/OperationType.java index 7e0999e..e15d341 100644 --- a/model/src/main/java/cn/bunny/enums/OperationType.java +++ b/dao/src/main/java/cn/bunny/pojo/enums/OperationType.java @@ -1,4 +1,4 @@ -package cn.bunny.enums; +package cn.bunny.pojo.enums; /** * 数据库操作类型 diff --git a/model/src/main/java/cn/bunny/result/Result.java b/dao/src/main/java/cn/bunny/pojo/result/Result.java similarity index 99% rename from model/src/main/java/cn/bunny/result/Result.java rename to dao/src/main/java/cn/bunny/pojo/result/Result.java index 6484684..d85b26d 100644 --- a/model/src/main/java/cn/bunny/result/Result.java +++ b/dao/src/main/java/cn/bunny/pojo/result/Result.java @@ -1,4 +1,4 @@ -package cn.bunny.result; +package cn.bunny.pojo.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/ResultCodeEnum.java b/dao/src/main/java/cn/bunny/pojo/result/ResultCodeEnum.java similarity index 98% rename from model/src/main/java/cn/bunny/result/ResultCodeEnum.java rename to dao/src/main/java/cn/bunny/pojo/result/ResultCodeEnum.java index d391b55..d2a98d7 100644 --- a/model/src/main/java/cn/bunny/result/ResultCodeEnum.java +++ b/dao/src/main/java/cn/bunny/pojo/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package cn.bunny.result; +package cn.bunny.pojo.result; import lombok.Getter; diff --git a/model/src/main/java/cn/bunny/result/constant/ExceptionConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/ExceptionConstant.java similarity index 98% rename from model/src/main/java/cn/bunny/result/constant/ExceptionConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/ExceptionConstant.java index 7662b0e..cdb8945 100644 --- a/model/src/main/java/cn/bunny/result/constant/ExceptionConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/ExceptionConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/FileMessageConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/FileMessageConstant.java similarity index 96% rename from model/src/main/java/cn/bunny/result/constant/FileMessageConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/FileMessageConstant.java index db799c7..d608a30 100644 --- a/model/src/main/java/cn/bunny/result/constant/FileMessageConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/FileMessageConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/LocalDateTimeConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java similarity index 90% rename from model/src/main/java/cn/bunny/result/constant/LocalDateTimeConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java index b0c4d40..afda4da 100644 --- a/model/src/main/java/cn/bunny/result/constant/LocalDateTimeConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/MailMessageConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java similarity index 92% rename from model/src/main/java/cn/bunny/result/constant/MailMessageConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java index c2410ac..9a13a7f 100644 --- a/model/src/main/java/cn/bunny/result/constant/MailMessageConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/RedisUserConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java similarity index 97% rename from model/src/main/java/cn/bunny/result/constant/RedisUserConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java index 9772191..9ddf241 100644 --- a/model/src/main/java/cn/bunny/result/constant/RedisUserConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/SQLAutoFillConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java similarity index 90% rename from model/src/main/java/cn/bunny/result/constant/SQLAutoFillConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java index 6b09482..d2ebde4 100644 --- a/model/src/main/java/cn/bunny/result/constant/SQLAutoFillConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/SecurityConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java similarity index 91% rename from model/src/main/java/cn/bunny/result/constant/SecurityConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java index a26c0b4..4d21335 100644 --- a/model/src/main/java/cn/bunny/result/constant/SecurityConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/StatusConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java similarity index 85% rename from model/src/main/java/cn/bunny/result/constant/StatusConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java index c530625..333531e 100644 --- a/model/src/main/java/cn/bunny/result/constant/StatusConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/result/constant/UserConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java similarity index 85% rename from model/src/main/java/cn/bunny/result/constant/UserConstant.java rename to dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java index d9f4832..b36248a 100644 --- a/model/src/main/java/cn/bunny/result/constant/UserConstant.java +++ b/dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.result.constant; +package cn.bunny.pojo.result.constant; import lombok.Data; diff --git a/model/src/main/java/cn/bunny/tree/AbstractTreeNode.java b/dao/src/main/java/cn/bunny/pojo/tree/AbstractTreeNode.java similarity index 86% rename from model/src/main/java/cn/bunny/tree/AbstractTreeNode.java rename to dao/src/main/java/cn/bunny/pojo/tree/AbstractTreeNode.java index d5e7770..643a62e 100644 --- a/model/src/main/java/cn/bunny/tree/AbstractTreeNode.java +++ b/dao/src/main/java/cn/bunny/pojo/tree/AbstractTreeNode.java @@ -1,4 +1,4 @@ -package cn.bunny.tree; +package cn.bunny.pojo.tree; import java.util.List; diff --git a/model/src/main/java/cn/bunny/tree/TreeBuilder.java b/dao/src/main/java/cn/bunny/pojo/tree/TreeBuilder.java similarity index 96% rename from model/src/main/java/cn/bunny/tree/TreeBuilder.java rename to dao/src/main/java/cn/bunny/pojo/tree/TreeBuilder.java index f85d419..0b6214f 100644 --- a/model/src/main/java/cn/bunny/tree/TreeBuilder.java +++ b/dao/src/main/java/cn/bunny/pojo/tree/TreeBuilder.java @@ -1,4 +1,4 @@ -package cn.bunny.tree; +package cn.bunny.pojo.tree; import java.util.ArrayList; import java.util.List; diff --git a/model/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java b/dao/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java rename to dao/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java diff --git a/model/src/main/java/cn/bunny/vo/file/FileInfoVo.java b/dao/src/main/java/cn/bunny/vo/file/FileInfoVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/file/FileInfoVo.java rename to dao/src/main/java/cn/bunny/vo/file/FileInfoVo.java diff --git a/model/src/main/java/cn/bunny/vo/page/PageResult.java b/dao/src/main/java/cn/bunny/vo/page/PageResult.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/page/PageResult.java rename to dao/src/main/java/cn/bunny/vo/page/PageResult.java diff --git a/model/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java b/dao/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java rename to dao/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java diff --git a/model/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java b/dao/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java similarity index 93% rename from model/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java rename to dao/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java index 66c79e0..42b86a4 100644 --- a/model/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java +++ b/dao/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java @@ -1,6 +1,6 @@ package cn.bunny.vo.system.board; -import cn.bunny.tree.AbstractTreeNode; +import cn.bunny.pojo.tree.AbstractTreeNode; import lombok.Data; import java.util.List; diff --git a/model/src/main/java/cn/bunny/vo/system/comment/CommentVo.java b/dao/src/main/java/cn/bunny/vo/system/comment/CommentVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/system/comment/CommentVo.java rename to dao/src/main/java/cn/bunny/vo/system/comment/CommentVo.java diff --git a/model/src/main/java/cn/bunny/vo/system/login/LoginVo.java b/dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java similarity index 96% rename from model/src/main/java/cn/bunny/vo/system/login/LoginVo.java rename to dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java index 9bda0ae..087e7de 100644 --- a/model/src/main/java/cn/bunny/vo/system/login/LoginVo.java +++ b/dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java @@ -1,6 +1,6 @@ package cn.bunny.vo.system.login; -import cn.bunny.result.constant.LocalDateTimeConstant; +import cn.bunny.pojo.result.constant.LocalDateTimeConstant; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/model/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java b/dao/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java rename to dao/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java diff --git a/model/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java b/dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java similarity index 96% rename from model/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java rename to dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java index fa60a87..78e954d 100644 --- a/model/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java +++ b/dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java @@ -1,6 +1,6 @@ package cn.bunny.vo.system.user; -import cn.bunny.result.constant.LocalDateTimeConstant; +import cn.bunny.pojo.result.constant.LocalDateTimeConstant; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/model/src/main/java/cn/bunny/vo/system/user/UserIntegralRecordVo.java b/dao/src/main/java/cn/bunny/vo/system/user/UserIntegralRecordVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/system/user/UserIntegralRecordVo.java rename to dao/src/main/java/cn/bunny/vo/system/user/UserIntegralRecordVo.java diff --git a/model/src/main/java/cn/bunny/vo/system/user/UserMessageCountVo.java b/dao/src/main/java/cn/bunny/vo/system/user/UserMessageCountVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/system/user/UserMessageCountVo.java rename to dao/src/main/java/cn/bunny/vo/system/user/UserMessageCountVo.java diff --git a/model/src/main/java/cn/bunny/vo/system/user/UserMessageVo.java b/dao/src/main/java/cn/bunny/vo/system/user/UserMessageVo.java similarity index 100% rename from model/src/main/java/cn/bunny/vo/system/user/UserMessageVo.java rename to dao/src/main/java/cn/bunny/vo/system/user/UserMessageVo.java diff --git a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java index 6829253..f386346 100644 --- a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java +++ b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java @@ -1,8 +1,8 @@ package cn.bunny.module.mail.utils; import cn.bunny.common.service.utils.EmptyUtil; -import cn.bunny.entity.system.email.EmailSend; -import cn.bunny.result.constant.MailMessageConstant; +import cn.bunny.pojo.email.EmailSend; +import cn.bunny.pojo.result.constant.MailMessageConstant; public class MailSendCheckUtil { /** diff --git a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java index 0975c97..85ee281 100644 --- a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java +++ b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java @@ -1,7 +1,7 @@ package cn.bunny.module.mail.utils; -import cn.bunny.entity.system.email.EmailSend; -import cn.bunny.entity.system.email.EmailSendInit; +import cn.bunny.pojo.email.EmailSend; +import cn.bunny.pojo.email.EmailSendInit; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.springframework.mail.SimpleMailMessage; diff --git a/module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java b/module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java index 8fc332d..f180fb2 100644 --- a/module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java +++ b/module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java @@ -1,6 +1,6 @@ package cn.bunny.module.minio.utils; -import cn.bunny.result.constant.FileMessageConstant; +import cn.bunny.pojo.result.constant.FileMessageConstant; import cn.bunny.common.service.exception.BunnyException; import io.minio.*; import io.minio.messages.*; diff --git a/module/pom.xml b/module/pom.xml index 2804f9c..e042973 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -17,6 +17,7 @@ module-mail module-rabbitMQ module-websocket + spring-security module-task diff --git a/module/spring-security/src/main/java/cn/bunny/security/filter/TokenAuthenticationFilter.java b/module/spring-security/src/main/java/cn/bunny/security/filter/TokenAuthenticationFilter.java index bea057b..cb10849 100644 --- a/module/spring-security/src/main/java/cn/bunny/security/filter/TokenAuthenticationFilter.java +++ b/module/spring-security/src/main/java/cn/bunny/security/filter/TokenAuthenticationFilter.java @@ -4,9 +4,9 @@ import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.exception.BunnyException; import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.common.service.utils.ResponseUtil; -import cn.bunny.result.Result; -import cn.bunny.result.ResultCodeEnum; -import cn.bunny.result.constant.RedisUserConstant; +import cn.bunny.pojo.result.Result; +import cn.bunny.pojo.result.ResultCodeEnum; +import cn.bunny.pojo.result.constant.RedisUserConstant; import cn.bunny.vo.system.login.LoginVo; import com.alibaba.fastjson2.JSON; import jakarta.servlet.FilterChain; diff --git a/module/spring-security/src/main/java/cn/bunny/security/filter/TokenLoginFilterService.java b/module/spring-security/src/main/java/cn/bunny/security/filter/TokenLoginFilterService.java index 9eadac3..47bcf59 100644 --- a/module/spring-security/src/main/java/cn/bunny/security/filter/TokenLoginFilterService.java +++ b/module/spring-security/src/main/java/cn/bunny/security/filter/TokenLoginFilterService.java @@ -3,9 +3,9 @@ package cn.bunny.security.filter; import cn.bunny.common.service.utils.ResponseUtil; import cn.bunny.dto.user.LoginDto; -import cn.bunny.result.Result; -import cn.bunny.result.ResultCodeEnum; -import cn.bunny.result.constant.RedisUserConstant; +import cn.bunny.pojo.result.Result; +import cn.bunny.pojo.result.ResultCodeEnum; +import cn.bunny.pojo.result.constant.RedisUserConstant; import cn.bunny.security.handelr.SecurityAuthenticationFailureHandler; import cn.bunny.security.handelr.SecurityAuthenticationSuccessHandler; import cn.bunny.security.service.CustomUserDetailsService; diff --git a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAccessDeniedHandler.java b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAccessDeniedHandler.java index b14a8d7..6dc7ea8 100644 --- a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAccessDeniedHandler.java +++ b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ package cn.bunny.security.handelr; -import cn.bunny.result.Result; -import cn.bunny.result.ResultCodeEnum; +import cn.bunny.pojo.result.Result; +import cn.bunny.pojo.result.ResultCodeEnum; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationEntryPoint.java b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationEntryPoint.java index cd82558..39801f9 100644 --- a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationEntryPoint.java +++ b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationEntryPoint.java @@ -1,8 +1,8 @@ package cn.bunny.security.handelr; import cn.bunny.common.service.utils.ResponseUtil; -import cn.bunny.result.Result; -import cn.bunny.result.ResultCodeEnum; +import cn.bunny.pojo.result.Result; +import cn.bunny.pojo.result.ResultCodeEnum; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationFailureHandler.java b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationFailureHandler.java index e48ad49..e6eba91 100644 --- a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationFailureHandler.java +++ b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationFailureHandler.java @@ -1,6 +1,6 @@ package cn.bunny.security.handelr; -import cn.bunny.result.Result; +import cn.bunny.pojo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationSuccessHandler.java b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationSuccessHandler.java index e5bd0fd..fb6605e 100644 --- a/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationSuccessHandler.java +++ b/module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationSuccessHandler.java @@ -1,6 +1,6 @@ package cn.bunny.security.handelr; -import cn.bunny.result.Result; +import cn.bunny.pojo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/pom.xml b/pom.xml index 96c519e..5a7506a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ common - model + dao service module server-gateway diff --git a/service-client/pom.xml b/service-client/pom.xml index 1552d44..8ef5227 100644 --- a/service-client/pom.xml +++ b/service-client/pom.xml @@ -20,7 +20,7 @@ cn.bunny - model + dao 0.0.1-SNAPSHOT diff --git a/service/service-admin/src/main/java/cn/bunny/service/admin/controller/LoginController.java b/service/service-admin/src/main/java/cn/bunny/service/admin/controller/LoginController.java index ad7468c..4d6fe5c 100644 --- a/service/service-admin/src/main/java/cn/bunny/service/admin/controller/LoginController.java +++ b/service/service-admin/src/main/java/cn/bunny/service/admin/controller/LoginController.java @@ -2,7 +2,7 @@ package cn.bunny.service.admin.controller; import cn.bunny.dto.user.LoginDto; -import cn.bunny.result.Result; +import cn.bunny.pojo.result.Result; import cn.bunny.service.admin.service.UserService; import cn.bunny.vo.system.login.LoginVo; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/service-admin/src/main/java/cn/bunny/service/admin/service/impl/UserServiceImpl.java b/service/service-admin/src/main/java/cn/bunny/service/admin/service/impl/UserServiceImpl.java index 158725f..9d3cd19 100644 --- a/service/service-admin/src/main/java/cn/bunny/service/admin/service/impl/UserServiceImpl.java +++ b/service/service-admin/src/main/java/cn/bunny/service/admin/service/impl/UserServiceImpl.java @@ -5,14 +5,14 @@ import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.dto.user.LoginDto; import cn.bunny.entity.system.admin.AdminPower; import cn.bunny.entity.system.admin.auth.AuthUserRole; -import cn.bunny.entity.system.email.EmailSend; -import cn.bunny.entity.system.email.EmailSendInit; +import cn.bunny.pojo.email.EmailSend; +import cn.bunny.pojo.email.EmailSendInit; import cn.bunny.entity.system.email.EmailUsers; import cn.bunny.entity.system.user.User; import cn.bunny.module.mail.utils.MailSenderUtil; -import cn.bunny.result.constant.ExceptionConstant; -import cn.bunny.result.constant.MailMessageConstant; -import cn.bunny.result.constant.RedisUserConstant; +import cn.bunny.pojo.result.constant.ExceptionConstant; +import cn.bunny.pojo.result.constant.MailMessageConstant; +import cn.bunny.pojo.result.constant.RedisUserConstant; import cn.bunny.service.admin.mapper.AdminPowerMapper; import cn.bunny.service.admin.mapper.AdminRoleMapper; import cn.bunny.service.admin.mapper.EmailUsersMapper; diff --git a/service/service-web/src/main/java/cn/bunny/service/web/aop/annotation/AutoFill.java b/service/service-web/src/main/java/cn/bunny/service/web/aop/annotation/AutoFill.java index 8c26d32..cf2b292 100644 --- a/service/service-web/src/main/java/cn/bunny/service/web/aop/annotation/AutoFill.java +++ b/service/service-web/src/main/java/cn/bunny/service/web/aop/annotation/AutoFill.java @@ -1,6 +1,6 @@ package cn.bunny.service.aop.annotation; -import cn.bunny.enums.OperationType; +import cn.bunny.pojo.enums.OperationType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/service/service-web/src/main/java/cn/bunny/service/web/controller/LoginController.java b/service/service-web/src/main/java/cn/bunny/service/web/controller/LoginController.java index c44781d..89a4b3a 100644 --- a/service/service-web/src/main/java/cn/bunny/service/web/controller/LoginController.java +++ b/service/service-web/src/main/java/cn/bunny/service/web/controller/LoginController.java @@ -2,7 +2,7 @@ package cn.bunny.service.web.controller; import cn.bunny.dto.user.LoginDto; import cn.bunny.dto.user.RegisterDto; -import cn.bunny.result.Result; +import cn.bunny.pojo.result.Result; import cn.bunny.service.web.service.LoginService; import cn.bunny.vo.system.login.LoginVo; import cn.bunny.vo.system.login.ValidateCodeVo; diff --git a/service/service-web/src/main/java/cn/bunny/service/web/interceptor/UserTokenInterceptor.java b/service/service-web/src/main/java/cn/bunny/service/web/interceptor/UserTokenInterceptor.java index 3dbf895..719e924 100644 --- a/service/service-web/src/main/java/cn/bunny/service/web/interceptor/UserTokenInterceptor.java +++ b/service/service-web/src/main/java/cn/bunny/service/web/interceptor/UserTokenInterceptor.java @@ -1,8 +1,8 @@ package cn.bunny.service.web.interceptor; -import cn.bunny.result.constant.RedisUserConstant; -import cn.bunny.result.ResultCodeEnum; -import cn.bunny.result.Result; +import cn.bunny.pojo.result.constant.RedisUserConstant; +import cn.bunny.pojo.result.ResultCodeEnum; +import cn.bunny.pojo.result.Result; import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.common.service.utils.ResponseUtil; diff --git a/service/service-web/src/main/java/cn/bunny/service/web/service/impl/LoginServiceImpl.java b/service/service-web/src/main/java/cn/bunny/service/web/service/impl/LoginServiceImpl.java index 057b182..d499e14 100644 --- a/service/service-web/src/main/java/cn/bunny/service/web/service/impl/LoginServiceImpl.java +++ b/service/service-web/src/main/java/cn/bunny/service/web/service/impl/LoginServiceImpl.java @@ -6,16 +6,16 @@ import cn.bunny.common.service.utils.EmptyUtil; import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.dto.user.LoginDto; import cn.bunny.dto.user.RegisterDto; -import cn.bunny.entity.system.email.EmailSend; -import cn.bunny.entity.system.email.EmailSendInit; +import cn.bunny.pojo.email.EmailSend; +import cn.bunny.pojo.email.EmailSendInit; import cn.bunny.entity.system.email.EmailTemplate; import cn.bunny.entity.system.email.EmailUsers; import cn.bunny.entity.system.user.User; import cn.bunny.module.mail.utils.MailSenderUtil; -import cn.bunny.result.constant.ExceptionConstant; -import cn.bunny.result.constant.MailMessageConstant; -import cn.bunny.result.constant.RedisUserConstant; -import cn.bunny.result.constant.UserConstant; +import cn.bunny.pojo.result.constant.ExceptionConstant; +import cn.bunny.pojo.result.constant.MailMessageConstant; +import cn.bunny.pojo.result.constant.RedisUserConstant; +import cn.bunny.pojo.result.constant.UserConstant; import cn.bunny.service.web.mapper.EmailTemplateMapper; import cn.bunny.service.web.mapper.EmailUsersMapper; import cn.bunny.service.web.mapper.UserMapper; diff --git a/service/service-web/src/main/java/cn/bunny/service/web/service/impl/UserServiceImpl.java b/service/service-web/src/main/java/cn/bunny/service/web/service/impl/UserServiceImpl.java index 038df86..c9a9b0d 100644 --- a/service/service-web/src/main/java/cn/bunny/service/web/service/impl/UserServiceImpl.java +++ b/service/service-web/src/main/java/cn/bunny/service/web/service/impl/UserServiceImpl.java @@ -5,8 +5,8 @@ import cn.bunny.common.service.exception.BunnyException; import cn.bunny.common.service.utils.EmptyUtil; import cn.bunny.dto.user.ResetPwdDto; import cn.bunny.entity.system.user.User; -import cn.bunny.result.constant.ExceptionConstant; -import cn.bunny.result.constant.RedisUserConstant; +import cn.bunny.pojo.result.constant.ExceptionConstant; +import cn.bunny.pojo.result.constant.RedisUserConstant; import cn.bunny.service.web.mapper.UserMapper; import cn.bunny.service.web.service.UserService; import cn.bunny.vo.system.user.UserInfoVo;