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

common/common-utils/pom.xml

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

common/service-utils/pom.xml

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

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;

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;

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;

dao/pom.xml

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

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;

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;

dao/src/main/java/cn/bunny/pojo/enums/OperationType.java

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

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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 {
     /**

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;

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.*;

module/pom.xml

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

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;

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;

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;

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;

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;

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;

pom.xml

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

service-client/pom.xml

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

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;

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;

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;

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;

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;

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;

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;