Bunny-Cli/java-mirror-server
Bunny-Cli
/
java-mirror-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(修改): 🚀 调整model结构，拆分出数据库实体和Java邮件实体

This commit is contained in:
bunny 2024-05-24 14:26:24 +08:00
parent 324b9f2c29
commit 23b7797951
82 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common-utils/pom.xml
View File

@ -20,7 +20,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.bunny</groupId> <groupId>cn.bunny</groupId>
<artifactId>model</artifactId> <artifactId>dao</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
common/service-utils/pom.xml
View File

@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.bunny</groupId> <groupId>cn.bunny</groupId>
<artifactId>model</artifactId> <artifactId>dao</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- httpclient --> <!-- httpclient -->

2
common/service-utils/src/main/java/cn/bunny/common/service/exception/BunnyException.java
View File

@ -1,6 +1,6 @@
package cn.bunny.common.service.exception; package cn.bunny.common.service.exception;
import cn.bunny.result.ResultCodeEnum; import cn.bunny.pojo.result.ResultCodeEnum;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;

6
common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java
View File

@ -1,9 +1,9 @@
package cn.bunny.common.service.exception; package cn.bunny.common.service.exception;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import cn.bunny.result.ResultCodeEnum; import cn.bunny.pojo.result.ResultCodeEnum;
import cn.bunny.result.constant.ExceptionConstant; import cn.bunny.pojo.result.constant.ExceptionConstant;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;

2
common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java
View File

@ -1,6 +1,6 @@
package cn.bunny.common.service.utils; 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.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

2
model/pom.xml → dao/pom.xml
View File

@ -7,7 +7,7 @@
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>model</artifactId> <artifactId>dao</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>model</name> <name>model</name>

0
model/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java → dao/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java
View File

0
model/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java → dao/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java
View File

0
model/src/main/java/cn/bunny/dto/common/CommentPostDto.java → dao/src/main/java/cn/bunny/dto/common/CommentPostDto.java
View File

0
model/src/main/java/cn/bunny/dto/common/CommentQueryDto.java → dao/src/main/java/cn/bunny/dto/common/CommentQueryDto.java
View File

0
model/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java → dao/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java
View File

0
model/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java → dao/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java
View File

0
model/src/main/java/cn/bunny/dto/email/EmailUsersDto.java → dao/src/main/java/cn/bunny/dto/email/EmailUsersDto.java
View File

0
model/src/main/java/cn/bunny/dto/user/LoginDto.java → dao/src/main/java/cn/bunny/dto/user/LoginDto.java
View File

0
model/src/main/java/cn/bunny/dto/user/RegisterDto.java → dao/src/main/java/cn/bunny/dto/user/RegisterDto.java
View File

0
model/src/main/java/cn/bunny/dto/user/ResetPwdDto.java → dao/src/main/java/cn/bunny/dto/user/ResetPwdDto.java
View File

0
model/src/main/java/cn/bunny/dto/user/UserInfoDto.java → dao/src/main/java/cn/bunny/dto/user/UserInfoDto.java
View File

0
model/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java → dao/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java
View File

0
model/src/main/java/cn/bunny/dto/user/UserMessageDto.java → dao/src/main/java/cn/bunny/dto/user/UserMessageDto.java
View File

0
model/src/main/java/cn/bunny/entity/base/BaseEntity.java → dao/src/main/java/cn/bunny/entity/base/BaseEntity.java
View File

0
model/src/main/java/cn/bunny/entity/system/admin/AdminPower.java → dao/src/main/java/cn/bunny/entity/system/admin/AdminPower.java
View File

0
model/src/main/java/cn/bunny/entity/system/admin/AdminRole.java → dao/src/main/java/cn/bunny/entity/system/admin/AdminRole.java
View File

0
model/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java → dao/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java
View File

0
model/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java → dao/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java
View File

0
model/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java → dao/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java
View File

0
model/src/main/java/cn/bunny/entity/system/article/Article.java → dao/src/main/java/cn/bunny/entity/system/article/Article.java
View File

0
model/src/main/java/cn/bunny/entity/system/article/ForumComment.java → dao/src/main/java/cn/bunny/entity/system/article/ForumComment.java
View File

0
model/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java → dao/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java
View File

0
model/src/main/java/cn/bunny/entity/system/article/LikeRecord.java → dao/src/main/java/cn/bunny/entity/system/article/LikeRecord.java
View File

0
model/src/main/java/cn/bunny/entity/system/board/ForumBoard.java → dao/src/main/java/cn/bunny/entity/system/board/ForumBoard.java
View File

0
model/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java → dao/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java
View File

0
model/src/main/java/cn/bunny/entity/system/email/EmailUsers.java → dao/src/main/java/cn/bunny/entity/system/email/EmailUsers.java
View File

0
model/src/main/java/cn/bunny/entity/system/file/Files.java → dao/src/main/java/cn/bunny/entity/system/file/Files.java
View File

0
model/src/main/java/cn/bunny/entity/system/user/User.java → dao/src/main/java/cn/bunny/entity/system/user/User.java
View File

0
model/src/main/java/cn/bunny/entity/system/user/UserMessage.java → dao/src/main/java/cn/bunny/entity/system/user/UserMessage.java
View File

2
model/src/main/java/cn/bunny/entity/system/email/EmailSend.java → dao/src/main/java/cn/bunny/pojo/email/EmailSend.java
View File

@ -1,4 +1,4 @@
package cn.bunny.entity.system.email; package cn.bunny.pojo.email;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;

2
model/src/main/java/cn/bunny/entity/system/email/EmailSendInit.java → dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java
View File

@ -1,4 +1,4 @@
package cn.bunny.entity.system.email; package cn.bunny.pojo.email;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;

2
model/src/main/java/cn/bunny/enums/OperationType.java → dao/src/main/java/cn/bunny/pojo/enums/OperationType.java
View File

@ -1,4 +1,4 @@
package cn.bunny.enums; package cn.bunny.pojo.enums;
/** /**
* 数据库操作类型 * 数据库操作类型

2
model/src/main/java/cn/bunny/result/Result.java → dao/src/main/java/cn/bunny/pojo/result/Result.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result; package cn.bunny.pojo.result;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/ResultCodeEnum.java → dao/src/main/java/cn/bunny/pojo/result/ResultCodeEnum.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result; package cn.bunny.pojo.result;
import lombok.Getter; import lombok.Getter;

2
model/src/main/java/cn/bunny/result/constant/ExceptionConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/ExceptionConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/FileMessageConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/FileMessageConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/LocalDateTimeConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/MailMessageConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/RedisUserConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/SQLAutoFillConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/SecurityConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/StatusConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/result/constant/UserConstant.java → dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.result.constant; package cn.bunny.pojo.result.constant;
import lombok.Data; import lombok.Data;

2
model/src/main/java/cn/bunny/tree/AbstractTreeNode.java → dao/src/main/java/cn/bunny/pojo/tree/AbstractTreeNode.java
View File

@ -1,4 +1,4 @@
package cn.bunny.tree; package cn.bunny.pojo.tree;
import java.util.List; import java.util.List;

2
model/src/main/java/cn/bunny/tree/TreeBuilder.java → dao/src/main/java/cn/bunny/pojo/tree/TreeBuilder.java
View File

@ -1,4 +1,4 @@
package cn.bunny.tree; package cn.bunny.pojo.tree;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

0
model/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java → dao/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java
View File

0
model/src/main/java/cn/bunny/vo/file/FileInfoVo.java → dao/src/main/java/cn/bunny/vo/file/FileInfoVo.java
View File

0
model/src/main/java/cn/bunny/vo/page/PageResult.java → dao/src/main/java/cn/bunny/vo/page/PageResult.java
View File

0
model/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java → dao/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java
View File

2
model/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java → dao/src/main/java/cn/bunny/vo/system/board/ForumBoardVo.java
View File

@ -1,6 +1,6 @@
package cn.bunny.vo.system.board; package cn.bunny.vo.system.board;
import cn.bunny.tree.AbstractTreeNode; import cn.bunny.pojo.tree.AbstractTreeNode;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

0
model/src/main/java/cn/bunny/vo/system/comment/CommentVo.java → dao/src/main/java/cn/bunny/vo/system/comment/CommentVo.java
View File

2
model/src/main/java/cn/bunny/vo/system/login/LoginVo.java → dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java
View File

@ -1,6 +1,6 @@
package cn.bunny.vo.system.login; 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.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;

0
model/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java → dao/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java
View File

2
model/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java → dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java
View File

@ -1,6 +1,6 @@
package cn.bunny.vo.system.user; 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.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;

0
model/src/main/java/cn/bunny/vo/system/user/UserIntegralRecordVo.java → dao/src/main/java/cn/bunny/vo/system/user/UserIntegralRecordVo.java
View File

0
model/src/main/java/cn/bunny/vo/system/user/UserMessageCountVo.java → dao/src/main/java/cn/bunny/vo/system/user/UserMessageCountVo.java
View File

0
model/src/main/java/cn/bunny/vo/system/user/UserMessageVo.java → dao/src/main/java/cn/bunny/vo/system/user/UserMessageVo.java
View File

4
module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java
View File

@ -1,8 +1,8 @@
package cn.bunny.module.mail.utils; package cn.bunny.module.mail.utils;
import cn.bunny.common.service.utils.EmptyUtil; import cn.bunny.common.service.utils.EmptyUtil;
import cn.bunny.entity.system.email.EmailSend; import cn.bunny.pojo.email.EmailSend;
import cn.bunny.result.constant.MailMessageConstant; import cn.bunny.pojo.result.constant.MailMessageConstant;
public class MailSendCheckUtil { public class MailSendCheckUtil {
/** /**

4
module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java
View File

@ -1,7 +1,7 @@
package cn.bunny.module.mail.utils; package cn.bunny.module.mail.utils;
import cn.bunny.entity.system.email.EmailSend; import cn.bunny.pojo.email.EmailSend;
import cn.bunny.entity.system.email.EmailSendInit; import cn.bunny.pojo.email.EmailSendInit;
import jakarta.mail.MessagingException; import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMessage;
import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.SimpleMailMessage;

2
module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java
View File

@ -1,6 +1,6 @@
package cn.bunny.module.minio.utils; 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 cn.bunny.common.service.exception.BunnyException;
import io.minio.*; import io.minio.*;
import io.minio.messages.*; import io.minio.messages.*;

1
module/pom.xml
View File

@ -17,6 +17,7 @@
<module>module-mail</module> <module>module-mail</module>
<module>module-rabbitMQ</module> <module>module-rabbitMQ</module>
<module>module-websocket</module> <module>module-websocket</module>
<module>spring-security</module>
<module>module-task</module> <module>module-task</module>
</modules> </modules>

6
module/spring-security/src/main/java/cn/bunny/security/filter/TokenAuthenticationFilter.java
View File

@ -4,9 +4,9 @@ import cn.bunny.common.service.context.BaseContext;
import cn.bunny.common.service.exception.BunnyException; import cn.bunny.common.service.exception.BunnyException;
import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.common.service.utils.JwtHelper;
import cn.bunny.common.service.utils.ResponseUtil; import cn.bunny.common.service.utils.ResponseUtil;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import cn.bunny.result.ResultCodeEnum; import cn.bunny.pojo.result.ResultCodeEnum;
import cn.bunny.result.constant.RedisUserConstant; import cn.bunny.pojo.result.constant.RedisUserConstant;
import cn.bunny.vo.system.login.LoginVo; import cn.bunny.vo.system.login.LoginVo;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;

6
module/spring-security/src/main/java/cn/bunny/security/filter/TokenLoginFilterService.java
View File

@ -3,9 +3,9 @@ package cn.bunny.security.filter;
import cn.bunny.common.service.utils.ResponseUtil; import cn.bunny.common.service.utils.ResponseUtil;
import cn.bunny.dto.user.LoginDto; import cn.bunny.dto.user.LoginDto;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import cn.bunny.result.ResultCodeEnum; import cn.bunny.pojo.result.ResultCodeEnum;
import cn.bunny.result.constant.RedisUserConstant; import cn.bunny.pojo.result.constant.RedisUserConstant;
import cn.bunny.security.handelr.SecurityAuthenticationFailureHandler; import cn.bunny.security.handelr.SecurityAuthenticationFailureHandler;
import cn.bunny.security.handelr.SecurityAuthenticationSuccessHandler; import cn.bunny.security.handelr.SecurityAuthenticationSuccessHandler;
import cn.bunny.security.service.CustomUserDetailsService; import cn.bunny.security.service.CustomUserDetailsService;

4
module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAccessDeniedHandler.java
View File

@ -1,7 +1,7 @@
package cn.bunny.security.handelr; package cn.bunny.security.handelr;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import cn.bunny.result.ResultCodeEnum; import cn.bunny.pojo.result.ResultCodeEnum;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

4
module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationEntryPoint.java
View File

@ -1,8 +1,8 @@
package cn.bunny.security.handelr; package cn.bunny.security.handelr;
import cn.bunny.common.service.utils.ResponseUtil; import cn.bunny.common.service.utils.ResponseUtil;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import cn.bunny.result.ResultCodeEnum; import cn.bunny.pojo.result.ResultCodeEnum;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationFailureHandler.java
View File

@ -1,6 +1,6 @@
package cn.bunny.security.handelr; package cn.bunny.security.handelr;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;

2
module/spring-security/src/main/java/cn/bunny/security/handelr/SecurityAuthenticationSuccessHandler.java
View File

@ -1,6 +1,6 @@
package cn.bunny.security.handelr; package cn.bunny.security.handelr;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

2
pom.xml
View File

@ -19,7 +19,7 @@
<modules> <modules>
<module>common</module> <module>common</module>
<module>model</module> <module>dao</module>
<module>service</module> <module>service</module>
<module>module</module> <module>module</module>
<module>server-gateway</module> <module>server-gateway</module>

2
service-client/pom.xml
View File

@ -20,7 +20,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.bunny</groupId> <groupId>cn.bunny</groupId>
<artifactId>model</artifactId> <artifactId>dao</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- openfeign依赖 --> <!-- openfeign依赖 -->

2
service/service-admin/src/main/java/cn/bunny/service/admin/controller/LoginController.java
View File

@ -2,7 +2,7 @@ package cn.bunny.service.admin.controller;
import cn.bunny.dto.user.LoginDto; 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.service.admin.service.UserService;
import cn.bunny.vo.system.login.LoginVo; import cn.bunny.vo.system.login.LoginVo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

10
service/service-admin/src/main/java/cn/bunny/service/admin/service/impl/UserServiceImpl.java
View File

@ -5,14 +5,14 @@ import cn.bunny.common.service.utils.JwtHelper;
import cn.bunny.dto.user.LoginDto; import cn.bunny.dto.user.LoginDto;
import cn.bunny.entity.system.admin.AdminPower; import cn.bunny.entity.system.admin.AdminPower;
import cn.bunny.entity.system.admin.auth.AuthUserRole; import cn.bunny.entity.system.admin.auth.AuthUserRole;
import cn.bunny.entity.system.email.EmailSend; import cn.bunny.pojo.email.EmailSend;
import cn.bunny.entity.system.email.EmailSendInit; import cn.bunny.pojo.email.EmailSendInit;
import cn.bunny.entity.system.email.EmailUsers; import cn.bunny.entity.system.email.EmailUsers;
import cn.bunny.entity.system.user.User; import cn.bunny.entity.system.user.User;
import cn.bunny.module.mail.utils.MailSenderUtil; import cn.bunny.module.mail.utils.MailSenderUtil;
import cn.bunny.result.constant.ExceptionConstant; import cn.bunny.pojo.result.constant.ExceptionConstant;
import cn.bunny.result.constant.MailMessageConstant; import cn.bunny.pojo.result.constant.MailMessageConstant;
import cn.bunny.result.constant.RedisUserConstant; import cn.bunny.pojo.result.constant.RedisUserConstant;
import cn.bunny.service.admin.mapper.AdminPowerMapper; import cn.bunny.service.admin.mapper.AdminPowerMapper;
import cn.bunny.service.admin.mapper.AdminRoleMapper; import cn.bunny.service.admin.mapper.AdminRoleMapper;
import cn.bunny.service.admin.mapper.EmailUsersMapper; import cn.bunny.service.admin.mapper.EmailUsersMapper;

2
service/service-web/src/main/java/cn/bunny/service/web/aop/annotation/AutoFill.java
View File

@ -1,6 +1,6 @@
package cn.bunny.service.aop.annotation; 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.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
service/service-web/src/main/java/cn/bunny/service/web/controller/LoginController.java
View File

@ -2,7 +2,7 @@ package cn.bunny.service.web.controller;
import cn.bunny.dto.user.LoginDto; import cn.bunny.dto.user.LoginDto;
import cn.bunny.dto.user.RegisterDto; 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.service.web.service.LoginService;
import cn.bunny.vo.system.login.LoginVo; import cn.bunny.vo.system.login.LoginVo;
import cn.bunny.vo.system.login.ValidateCodeVo; import cn.bunny.vo.system.login.ValidateCodeVo;

6
service/service-web/src/main/java/cn/bunny/service/web/interceptor/UserTokenInterceptor.java
View File

@ -1,8 +1,8 @@
package cn.bunny.service.web.interceptor; package cn.bunny.service.web.interceptor;
import cn.bunny.result.constant.RedisUserConstant; import cn.bunny.pojo.result.constant.RedisUserConstant;
import cn.bunny.result.ResultCodeEnum; import cn.bunny.pojo.result.ResultCodeEnum;
import cn.bunny.result.Result; import cn.bunny.pojo.result.Result;
import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.context.BaseContext;
import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.common.service.utils.JwtHelper;
import cn.bunny.common.service.utils.ResponseUtil; import cn.bunny.common.service.utils.ResponseUtil;

12
service/service-web/src/main/java/cn/bunny/service/web/service/impl/LoginServiceImpl.java
View File

@ -6,16 +6,16 @@ import cn.bunny.common.service.utils.EmptyUtil;
import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.common.service.utils.JwtHelper;
import cn.bunny.dto.user.LoginDto; import cn.bunny.dto.user.LoginDto;
import cn.bunny.dto.user.RegisterDto; import cn.bunny.dto.user.RegisterDto;
import cn.bunny.entity.system.email.EmailSend; import cn.bunny.pojo.email.EmailSend;
import cn.bunny.entity.system.email.EmailSendInit; import cn.bunny.pojo.email.EmailSendInit;
import cn.bunny.entity.system.email.EmailTemplate; import cn.bunny.entity.system.email.EmailTemplate;
import cn.bunny.entity.system.email.EmailUsers; import cn.bunny.entity.system.email.EmailUsers;
import cn.bunny.entity.system.user.User; import cn.bunny.entity.system.user.User;
import cn.bunny.module.mail.utils.MailSenderUtil; import cn.bunny.module.mail.utils.MailSenderUtil;
import cn.bunny.result.constant.ExceptionConstant; import cn.bunny.pojo.result.constant.ExceptionConstant;
import cn.bunny.result.constant.MailMessageConstant; import cn.bunny.pojo.result.constant.MailMessageConstant;
import cn.bunny.result.constant.RedisUserConstant; import cn.bunny.pojo.result.constant.RedisUserConstant;
import cn.bunny.result.constant.UserConstant; import cn.bunny.pojo.result.constant.UserConstant;
import cn.bunny.service.web.mapper.EmailTemplateMapper; import cn.bunny.service.web.mapper.EmailTemplateMapper;
import cn.bunny.service.web.mapper.EmailUsersMapper; import cn.bunny.service.web.mapper.EmailUsersMapper;
import cn.bunny.service.web.mapper.UserMapper; import cn.bunny.service.web.mapper.UserMapper;

4
service/service-web/src/main/java/cn/bunny/service/web/service/impl/UserServiceImpl.java
View File

@ -5,8 +5,8 @@ import cn.bunny.common.service.exception.BunnyException;
import cn.bunny.common.service.utils.EmptyUtil; import cn.bunny.common.service.utils.EmptyUtil;
import cn.bunny.dto.user.ResetPwdDto; import cn.bunny.dto.user.ResetPwdDto;
import cn.bunny.entity.system.user.User; import cn.bunny.entity.system.user.User;
import cn.bunny.result.constant.ExceptionConstant; import cn.bunny.pojo.result.constant.ExceptionConstant;
import cn.bunny.result.constant.RedisUserConstant; import cn.bunny.pojo.result.constant.RedisUserConstant;
import cn.bunny.service.web.mapper.UserMapper; import cn.bunny.service.web.mapper.UserMapper;
import cn.bunny.service.web.service.UserService; import cn.bunny.service.web.service.UserService;
import cn.bunny.vo.system.user.UserInfoVo; import cn.bunny.vo.system.user.UserInfoVo;