- * 用户信息 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -@Getter -@Setter -@Accessors(chain = true) -@Schema(description = "用户信息") -public class User implements Serializable { - - private static final long serialVersionUID = 1L; - - @Schema(description = "用户ID") - @TableId(value = "user_id", type = IdType.AUTO) - private String userId; - - @Schema(description = "昵称") - private String nickName; - - @Schema(description = "邮箱") - private String email; - - @Schema(description = "密码") - private String password; - - @Schema(description = "0:女 1:男") - private Integer sex; - - @Schema(description = "个人描述") - private String personDescription; - - @Schema(description = "加入时间") - private LocalDateTime joinTime; - - @Schema(description = "最后登录时间") - private LocalDateTime lastLoginTime; - - @Schema(description = "最后登录IP") - private String lastLoginIp; - - @Schema(description = "最后登录ip地址") - private String lastLoginIpAddress; - - @Schema(description = "积分") - private Integer totalIntegral; - - @Schema(description = "当前积分") - private Integer currentIntegral; - - @Schema(description = "0:禁用 1:正常") - private Byte status; -} diff --git a/model/src/main/java/cn/bunny/entity/system/UserIntegralRecord.java b/model/src/main/java/cn/bunny/entity/system/UserIntegralRecord.java deleted file mode 100644 index ac5ea9c..0000000 --- a/model/src/main/java/cn/bunny/entity/system/UserIntegralRecord.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.bunny.entity.system; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *- * 用户积分记录表 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("user_integral_record") -@Schema(description = "用户积分记录表") -public class UserIntegralRecord implements Serializable { - - private static final long serialVersionUID = 1L; - - @Schema(description = "记录ID") - @TableId(value = "record_id", type = IdType.AUTO) - private Integer recordId; - - @Schema(description = "用户ID") - private String userId; - - @Schema(description = "操作类型") - private Byte operType; - - @Schema(description = "积分") - private Integer integral; - - @Schema(description = "创建时间") - private LocalDateTime createTime; -} diff --git a/model/src/main/java/cn/bunny/entity/system/admin/AdminPower.java b/model/src/main/java/cn/bunny/entity/system/admin/AdminPower.java new file mode 100644 index 0000000..2544ab8 --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/admin/AdminPower.java @@ -0,0 +1,58 @@ +package cn.bunny.entity.system.admin; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("admin_power") +@ApiModel(value = "AdminPower对象", description = "") +public class AdminPower implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("权限ID") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("权限名称") + private String powerName; + + @ApiModelProperty("权限编码") + private String powerCode; + + @ApiModelProperty("描述") + private String description; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("更新用户") + private String updateUser; + + @ApiModelProperty("是否删除，0-未删除，1-已删除") + private Byte isDelete; +} diff --git a/model/src/main/java/cn/bunny/entity/system/UserRole.java b/model/src/main/java/cn/bunny/entity/system/admin/AdminRole.java similarity index 53% rename from model/src/main/java/cn/bunny/entity/system/UserRole.java rename to model/src/main/java/cn/bunny/entity/system/admin/AdminRole.java index c1ba58c..59c36f4 100644 --- a/model/src/main/java/cn/bunny/entity/system/UserRole.java +++ b/model/src/main/java/cn/bunny/entity/system/admin/AdminRole.java @@ -1,9 +1,10 @@ -package cn.bunny.entity.system; +package cn.bunny.entity.system.admin; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; @@ -17,31 +18,38 @@ import java.time.LocalDateTime; * * * @author Bunny - * @since 2024-05-13 + * @since 2024-05-18 */ @Getter @Setter @Accessors(chain = true) -@TableName("user_role") -@Schema(description = "UserRole对象") -public class UserRole implements Serializable { +@TableName("admin_role") +@ApiModel(value = "AdminRole对象", description = "") +public class AdminRole implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private String id; - private String userId; - + @ApiModelProperty("角色名称") private String roleName; + @ApiModelProperty("描述") private String description; + @ApiModelProperty("角色代码") private String roleCode; - @Schema(description = "创建时间") + @ApiModelProperty("创建时间") private LocalDateTime createTime; - @Schema(description = "更新时间") + @ApiModelProperty("更新时间") private LocalDateTime updateTime; + + @ApiModelProperty("操作用户") + private String updateUser; + + @ApiModelProperty("是否删除") + private Byte isDeleted; } diff --git a/model/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java b/model/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java new file mode 100644 index 0000000..26370de --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java @@ -0,0 +1,56 @@ +package cn.bunny.entity.system.admin; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("admin_role_power") +@ApiModel(value = "AdminRolePower对象", description = "") +public class AdminRolePower implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + @TableId(value = "id", type = IdType.AUTO) + private String id; + + @ApiModelProperty("角色id") + private String roleId; + + @ApiModelProperty("权限id") + private String powerId; + + @ApiModelProperty("描述") + private String description; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("更新用户") + private String updateUser; + + @ApiModelProperty("是否删除，0-未删除，1-已删除") + private Byte isDelete; +} diff --git a/model/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java b/model/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java new file mode 100644 index 0000000..78f954f --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java @@ -0,0 +1,56 @@ +package cn.bunny.entity.system.admin; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("admin_user_role") +@ApiModel(value = "AdminUserRole对象", description = "") +public class AdminUserRole implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + @TableId(value = "id", type = IdType.AUTO) + private String id; + + @ApiModelProperty("用户id") + private String userId; + + @ApiModelProperty("角色id") + private String roleId; + + @ApiModelProperty("描述") + private String description; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("更新用户") + private String updateUser; + + @ApiModelProperty("是否删除，0-未删除，1-已删除") + private Byte isDelete; +} diff --git a/model/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java b/model/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java new file mode 100644 index 0000000..f1b3794 --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java @@ -0,0 +1,21 @@ +package cn.bunny.entity.system.admin.auth; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AuthUserRole { + // 用户id + private Long userId; + // 角色id + private Long roleId; + // 角色代码 + private String roleCode; + // 描述 + private String roleDescription; +} diff --git a/model/src/main/java/cn/bunny/entity/system/article/Article.java b/model/src/main/java/cn/bunny/entity/system/article/Article.java new file mode 100644 index 0000000..fe9f84d --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/article/Article.java @@ -0,0 +1,83 @@ +package cn.bunny.entity.system.article; + +import cn.bunny.entity.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 文章信息 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@Getter +@Setter +@Accessors(chain = true) +@ApiModel(value = "Article对象", description = "文章信息") +public class Article extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("板块ID") + private Integer boardId; + + @ApiModelProperty("板块名称") + private String boardName; + + @ApiModelProperty("父级板块ID") + private Integer pBoardId; + + @ApiModelProperty("父板块名称") + private String pBoardName; + + @ApiModelProperty("用户ID") + private Long userId; + + @ApiModelProperty("昵称") + private String nickName; + + @ApiModelProperty("最后登录ip地址") + private String userIpAddress; + + @ApiModelProperty("标题") + private String title; + + @ApiModelProperty("封面") + private String cover; + + @ApiModelProperty("内容") + private String content; + + @ApiModelProperty("0:富文本编辑器 1:markdown编辑器") + private Byte editorType; + + @ApiModelProperty("摘要") + private String summary; + + @ApiModelProperty("阅读数量") + private Integer readCount; + + @ApiModelProperty("点赞数") + private Integer goodCount; + + @ApiModelProperty("评论数") + private Integer commentCount; + + @ApiModelProperty("0未置顶 1:已置顶") + private Byte topType; + + @ApiModelProperty("0:没有附件 1:有附件") + private Byte attachmentType; + + @ApiModelProperty("-1已删除 0:待审核 1:已审核 ") + private Byte status; +} diff --git a/model/src/main/java/cn/bunny/entity/system/article/ForumComment.java b/model/src/main/java/cn/bunny/entity/system/article/ForumComment.java new file mode 100644 index 0000000..bb3b0ff --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/article/ForumComment.java @@ -0,0 +1,67 @@ +package cn.bunny.entity.system.article; + +import cn.bunny.entity.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 评论 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("forum_comment") +@ApiModel(value = "ForumComment对象", description = "评论") +public class ForumComment extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("父级评论ID") + private Long pCommentId; + + @ApiModelProperty("文章ID") + private String articleId; + + @ApiModelProperty("回复内容") + private String content; + + @ApiModelProperty("图片") + private String imgPath; + + @ApiModelProperty("用户ID") + private Long userId; + + @ApiModelProperty("昵称") + private String nickName; + + @ApiModelProperty("用户ip地址") + private String userIpAddress; + + @ApiModelProperty("回复人ID") + private Long replyUserId; + + @ApiModelProperty("回复人昵称") + private String replyNickName; + + @ApiModelProperty("0:未置顶 1:置顶") + private Integer topType; + + @ApiModelProperty("good数量") + private Integer goodCount; + + @ApiModelProperty("0:待审核 1:已审核") + private Integer status; +} diff --git a/model/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java b/model/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java new file mode 100644 index 0000000..b88f1e8 --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java @@ -0,0 +1,40 @@ +package cn.bunny.entity.system.article; + +import cn.bunny.entity.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 用户积分记录表 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("integral_record") +@ApiModel(value = "IntegralRecord对象", description = "用户积分记录表") +public class IntegralRecord extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("用户ID") + private Long userId; + + @ApiModelProperty("操作类型") + private Byte operType; + + @ApiModelProperty("积分") + private Integer integral; +} diff --git a/model/src/main/java/cn/bunny/entity/system/article/LikeRecord.java b/model/src/main/java/cn/bunny/entity/system/article/LikeRecord.java new file mode 100644 index 0000000..8d27cb9 --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/article/LikeRecord.java @@ -0,0 +1,43 @@ +package cn.bunny.entity.system.article; + +import cn.bunny.entity.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 点赞记录 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("like_record") +@ApiModel(value = "LikeRecord对象", description = "点赞记录") +public class LikeRecord extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("操作类型0:文章点赞 1:评论点赞") + private Byte opType; + + @ApiModelProperty("主体ID") + private String objectId; + + @ApiModelProperty("用户ID") + private Long userId; + + @ApiModelProperty("主体作者ID") + private Long authorUserId; +} diff --git a/model/src/main/java/cn/bunny/entity/system/board/ForumBoard.java b/model/src/main/java/cn/bunny/entity/system/board/ForumBoard.java new file mode 100644 index 0000000..0fad48c --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/board/ForumBoard.java @@ -0,0 +1,49 @@ +package cn.bunny.entity.system.board; + +import cn.bunny.entity.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 文章板块信息 + *
+ * + * @author Bunny + * @since 2024-05-19 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("forum_board") +@ApiModel(value = "ForumBoard对象", description = "文章板块信息") +public class ForumBoard extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("父级板块ID") + private Long parentId; + + @ApiModelProperty("板块名") + private String boardName; + + @ApiModelProperty("封面") + private String cover; + + @ApiModelProperty("描述") + private String boardDesc; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("0:只允许管理员发帖 1:任何人可以发帖") + private Boolean postType; +} diff --git a/model/src/main/java/cn/bunny/entity/email/EmailSend.java b/model/src/main/java/cn/bunny/entity/system/email/EmailSend.java similarity index 93% rename from model/src/main/java/cn/bunny/entity/email/EmailSend.java rename to model/src/main/java/cn/bunny/entity/system/email/EmailSend.java index d3e69b7..1d2e779 100644 --- a/model/src/main/java/cn/bunny/entity/email/EmailSend.java +++ b/model/src/main/java/cn/bunny/entity/system/email/EmailSend.java @@ -1,4 +1,4 @@ -package cn.bunny.entity.email; +package cn.bunny.entity.system.email; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/model/src/main/java/cn/bunny/entity/email/EmailSendInit.java b/model/src/main/java/cn/bunny/entity/system/email/EmailSendInit.java similarity index 90% rename from model/src/main/java/cn/bunny/entity/email/EmailSendInit.java rename to model/src/main/java/cn/bunny/entity/system/email/EmailSendInit.java index acd6fb2..d2b3aa1 100644 --- a/model/src/main/java/cn/bunny/entity/email/EmailSendInit.java +++ b/model/src/main/java/cn/bunny/entity/system/email/EmailSendInit.java @@ -1,4 +1,4 @@ -package cn.bunny.entity.email; +package cn.bunny.entity.system.email; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/model/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java b/model/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java new file mode 100644 index 0000000..18cb9c2 --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java @@ -0,0 +1,42 @@ +package cn.bunny.entity.system.email; + +import cn.bunny.entity.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * + *
+ * + * @author Bunny + * @since 2024-05-19 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("email_template") +@ApiModel(value = "EmailTemplate对象", description = "邮件模板") +public class EmailTemplate extends BaseEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("模板名称") + private String templateName; + + @ApiModelProperty("主题") + private String subject; + + @ApiModelProperty("邮件内容") + private String body; + + @ApiModelProperty("邮件类型") + private String type; +} diff --git a/model/src/main/java/cn/bunny/entity/system/email/EmailUsers.java b/model/src/main/java/cn/bunny/entity/system/email/EmailUsers.java new file mode 100644 index 0000000..def87bb --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/email/EmailUsers.java @@ -0,0 +1,49 @@ +package cn.bunny.entity.system.email; + +import cn.bunny.entity.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 邮箱发送表 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("email_users") +@ApiModel(value = "EmailUsers对象", description = "邮箱发送表") +public class EmailUsers extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("邮箱") + private String email; + + @ApiModelProperty("密码") + private String password; + + @ApiModelProperty("Host地址") + private String host; + + @ApiModelProperty("端口号") + private Integer port; + + @ApiModelProperty("邮箱协议") + private String smtpAgreement; + + @ApiModelProperty("是否为默认邮件") + private Integer isDefault; +} diff --git a/model/src/main/java/cn/bunny/entity/system/file/Files.java b/model/src/main/java/cn/bunny/entity/system/file/Files.java new file mode 100644 index 0000000..2597bb2 --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/file/Files.java @@ -0,0 +1,50 @@ +package cn.bunny.entity.system.file; + +import cn.bunny.entity.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 用于存储文件信息的数据表 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@Getter +@Setter +@Accessors(chain = true) +@ApiModel(value = "Files对象", description = "用于存储文件信息的数据表") +public class Files extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("文章ID") + private Long articleId; + + @ApiModelProperty("文件的名称") + private String filename; + + @ApiModelProperty("文件在服务器上的存储路径") + private String filepath; + + @ApiModelProperty("文件的大小，以字节为单位") + private Long fileSize; + + @ApiModelProperty("文件的MIME类型") + private String fileType; + + @ApiModelProperty("创建用户") + private Long createUser; + + @ApiModelProperty("下载次数") + private Integer downloadCount; +} diff --git a/model/src/main/java/cn/bunny/entity/system/user/User.java b/model/src/main/java/cn/bunny/entity/system/user/User.java new file mode 100644 index 0000000..33c086d --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/user/User.java @@ -0,0 +1,61 @@ +package cn.bunny.entity.system.user; + +import cn.bunny.entity.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * 用户信息 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@ApiModel(value = "User对象", description = "用户信息") +public class User extends BaseEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + @ApiModelProperty("昵称") + private String nickName; + @ApiModelProperty("邮箱") + private String email; + @ApiModelProperty("密码") + private String password; + @ApiModelProperty("头像") + private String avatar; + @ApiModelProperty("0:女 1:男") + private Byte sex; + @ApiModelProperty("个人描述") + private String personDescription; + @ApiModelProperty("加入时间") + private LocalDateTime joinTime; + + @ApiModelProperty("最后登录时间") + private LocalDateTime lastLoginTime; + + @ApiModelProperty("最后登录IP") + private String lastLoginIp; + + @ApiModelProperty("最后登录ip地址") + private String lastLoginIpAddress; + + @ApiModelProperty("积分") + private Integer totalIntegral; + + @ApiModelProperty("当前积分") + private Integer currentIntegral; + + @ApiModelProperty("0:禁用 1:正常") + private Byte status; +} diff --git a/model/src/main/java/cn/bunny/entity/system/user/UserMessage.java b/model/src/main/java/cn/bunny/entity/system/user/UserMessage.java new file mode 100644 index 0000000..faa6cdf --- /dev/null +++ b/model/src/main/java/cn/bunny/entity/system/user/UserMessage.java @@ -0,0 +1,58 @@ +package cn.bunny.entity.system.user; + +import cn.bunny.entity.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + *+ * 用户消息 + *
+ * + * @author Bunny + * @since 2024-05-17 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("user_message") +@ApiModel(value = "UserMessage对象", description = "用户消息") +public class UserMessage extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ApiModelProperty("接收人用户ID") + private Long receivedUserId; + + @ApiModelProperty("文章ID") + private String articleId; + + @ApiModelProperty("文章标题") + private String articleTitle; + + @ApiModelProperty("评论ID") + private Integer commentId; + + @ApiModelProperty("发送人用户ID") + private Long sendUserId; + + @ApiModelProperty("发送人昵称") + private String sendNickName; + + @ApiModelProperty("sys:系统消息 reply:评论 likePost:文章点赞 likeComment:评论点赞 attachment:附件下载") + private String messageType; + + @ApiModelProperty("消息内容") + private String messageContent; + + @ApiModelProperty("1:未读 2:已读") + private Byte status; +} diff --git a/common/common-result/src/main/java/cn/bunny/common/result/utils/Result.java b/model/src/main/java/cn/bunny/result/Result.java similarity index 96% rename from common/common-result/src/main/java/cn/bunny/common/result/utils/Result.java rename to model/src/main/java/cn/bunny/result/Result.java index 80c8119..6484684 100644 --- a/common/common-result/src/main/java/cn/bunny/common/result/utils/Result.java +++ b/model/src/main/java/cn/bunny/result/Result.java @@ -1,6 +1,5 @@ -package cn.bunny.common.result.utils; +package cn.bunny.result; -import cn.bunny.common.result.enums.ResultCodeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -64,7 +63,7 @@ public class Result+ * Mapper 接口 + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +@Mapper +public interface AdminPowerMapper extends BaseMapper+ * Mapper 接口 + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +@Mapper +public interface AdminRoleMapper extends BaseMapper+ * Mapper 接口 + *
+ * + * @author Bunny + * @since 2024-05-14 + */ +@Mapper +public interface EmailUsersMapper extends BaseMapper+ * 用户信息 Mapper 接口 + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +@Mapper +public interface UserMapper extends BaseMapper+ * 用户信息 服务类 + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +public interface UserService extends IService+ * 用户信息 服务实现类 + *
+ * + * @author Bunny + * @since 2024-05-18 + */ +@Service +public class UserServiceImpl extends ServiceImpl- * 用户信息 前端控制器 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -@RestController -@RequestMapping("/user") -public class UserController { - -} diff --git a/service/service-web/src/main/java/cn/bunny/service/web/controller/UserIntegralRecordController.java b/service/service-web/src/main/java/cn/bunny/service/web/controller/UserIntegralRecordController.java deleted file mode 100644 index 727cf66..0000000 --- a/service/service-web/src/main/java/cn/bunny/service/web/controller/UserIntegralRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.web.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *- * 用户积分记录表 前端控制器 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -@RestController -@RequestMapping("/userIntegralRecord") -public class UserIntegralRecordController { - -} diff --git a/service/service-web/src/main/java/cn/bunny/service/web/controller/UserRoleController.java b/service/service-web/src/main/java/cn/bunny/service/web/controller/UserRoleController.java deleted file mode 100644 index c222e9f..0000000 --- a/service/service-web/src/main/java/cn/bunny/service/web/controller/UserRoleController.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.web.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *- * 前端控制器 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -@RestController -@RequestMapping("/userRole") -public class UserRoleController { - -} 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 new file mode 100644 index 0000000..3dbf895 --- /dev/null +++ b/service/service-web/src/main/java/cn/bunny/service/web/interceptor/UserTokenInterceptor.java @@ -0,0 +1,54 @@ +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.common.service.context.BaseContext; +import cn.bunny.common.service.utils.JwtHelper; +import cn.bunny.common.service.utils.ResponseUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.lang.Nullable; +import org.springframework.stereotype.Component; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; + +@Component +@Slf4j +public class UserTokenInterceptor implements HandlerInterceptor { + @Autowired + private RedisTemplate- * 用户积分记录表 Mapper 接口 + * Mapper 接口 *
* * @author Bunny - * @since 2024-05-13 + * @since 2024-05-19 */ @Mapper -public interface UserIntegralRecordMapper extends BaseMapper- * 用户积分记录表 服务类 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -public interface UserIntegralRecordService extends IService- * 服务类 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -public interface UserRoleService extends IService- * 用户积分记录表 服务实现类 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -@Service -public class UserIntegralRecordServiceImpl extends ServiceImpl- * 服务实现类 - *
- * - * @author Bunny - * @since 2024-05-13 - */ -@Service -public class UserRoleServiceImpl extends ServiceImpl
@@ -16,5 +28,78 @@ import org.springframework.stereotype.Service;
*/
@Service
public class UserServiceImpl extends ServiceImpl
+ 感谢您注册我们的产品. 您的账号正在进行电子邮件验证.
+
+ 验证码为:
+
+ 验证码的有效期只有一分钟，请抓紧时间进行验证吧！
+
+ 如果非本人操作,请忽略此邮件
+
+ XXXXX
+ This is an automated email, please do not reply.
+
+
+
+
+
+ BunnyBBS邮箱验证码
+
+
+
+
+
+ 尊敬的用户,
+
+
+
+
+
+
+ Contact us: XXXXXXX@qq.com
+
+ © Company Name
+