From de39351b9e731f15fdbe96d10dfc6434781beb62 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sat, 27 Jul 2024 16:14:30 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20feat(=E4=BF=AE=E6=94=B9):=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E7=94=A8=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/context/BaseContext.java | 13 +-- .../bunny/dto/{quartz => }/QuartzAddDto.java | 2 +- dao/src/main/java/cn/bunny/dto/QuartzDto.java | 24 ++++++ .../dto/{quartz => }/QuartzOperationDto.java | 2 +- .../cn/bunny/dto/email/EmailTemplateDto.java | 21 ----- .../cn/bunny/dto/email/EmailUsersDto.java | 30 ------- .../java/cn/bunny/dto/quartz/QuartzDto.java | 24 ------ .../main/java/cn/bunny/dto/user/LoginDto.java | 19 ----- .../entity/{system => }/quartz/JobList.java | 2 +- .../bunny/entity/system/admin/AdminPower.java | 58 -------------- .../bunny/entity/system/admin/AdminRole.java | 55 ------------- .../entity/system/admin/AdminRolePower.java | 56 ------------- .../entity/system/admin/AdminUserRole.java | 56 ------------- .../system/admin/auth/AuthUserRole.java | 21 ----- .../entity/system/email/EmailTemplate.java | 42 ---------- .../bunny/entity/system/email/EmailUsers.java | 49 ------------ .../cn/bunny/entity/system/log/SystemLog.java | 78 ------------------ .../cn/bunny/entity/system/user/User.java | 61 -------------- .../java/cn/bunny/pojo/email/EmailSend.java | 29 ------- .../cn/bunny/pojo/email/EmailSendInit.java | 20 ----- .../cn/bunny/pojo/enums/OperationType.java | 8 -- .../cn/bunny/pojo/file/MinioFIlePath.java | 18 ----- .../constant/LocalDateTimeConstant.java | 11 --- .../result/constant/MailMessageConstant.java | 15 ---- .../pojo/result/constant/MinioConstant.java | 39 --------- .../result/constant/RedisUserConstant.java | 67 ---------------- .../result/constant/SQLAutoFillConstant.java | 14 ---- .../result/constant/SecurityConstant.java | 13 --- .../pojo/result/constant/StatusConstant.java | 14 ---- .../pojo/result/constant/UserConstant.java | 8 -- .../cn/bunny/vo/{page => }/PageResult.java | 2 +- .../cn/bunny/vo/email/EmailTemplateVo.java | 19 ----- .../cn/bunny/vo/system/login/LoginVo.java | 48 ----------- .../bunny/vo/system/login/ValidateCodeVo.java | 20 ----- .../cn/bunny/vo/system/user/UserInfoVo.java | 43 ---------- .../service/controller/JobController.java | 10 +-- .../service/controller/LoginController.java | 29 ------- .../service/mapper/AdminPowerMapper.java | 34 -------- .../bunny/service/mapper/AdminRoleMapper.java | 26 ------ .../service/mapper/EmailUsersMapper.java | 24 ------ .../bunny/service/mapper/JobListMapper.java | 2 +- .../bunny/service/mapper/SystemLogMapper.java | 18 ----- .../cn/bunny/service/mapper/UserMapper.java | 25 ------ .../cn/bunny/service/service/JobService.java | 8 +- .../cn/bunny/service/service/UserService.java | 24 ------ .../service/service/impl/JobServiceImpl.java | 8 +- .../service/service/impl/UserServiceImpl.java | 80 ------------------- .../resources/mapper/AdminPowerMapper.xml | 41 ---------- .../main/resources/mapper/AdminRoleMapper.xml | 29 ------- .../resources/mapper/EmailUsersMapper.xml | 30 ------- .../mapper/{quartz => }/JobListMapper.xml | 2 +- .../main/resources/mapper/SystemLogMapper.xml | 28 ------- .../src/main/resources/mapper/UserMapper.xml | 39 --------- 53 files changed, 44 insertions(+), 1414 deletions(-) rename dao/src/main/java/cn/bunny/dto/{quartz => }/QuartzAddDto.java (94%) create mode 100644 dao/src/main/java/cn/bunny/dto/QuartzDto.java rename dao/src/main/java/cn/bunny/dto/{quartz => }/QuartzOperationDto.java (91%) delete mode 100644 dao/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java delete mode 100644 dao/src/main/java/cn/bunny/dto/email/EmailUsersDto.java delete mode 100644 dao/src/main/java/cn/bunny/dto/quartz/QuartzDto.java delete mode 100644 dao/src/main/java/cn/bunny/dto/user/LoginDto.java rename dao/src/main/java/cn/bunny/entity/{system => }/quartz/JobList.java (95%) delete mode 100644 dao/src/main/java/cn/bunny/entity/system/admin/AdminPower.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/admin/AdminRole.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/email/EmailUsers.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/log/SystemLog.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/user/User.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/email/EmailSend.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/enums/OperationType.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/file/MinioFIlePath.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/MinioConstant.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java delete mode 100644 dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java rename dao/src/main/java/cn/bunny/vo/{page => }/PageResult.java (94%) delete mode 100644 dao/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java delete mode 100644 dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java delete mode 100644 dao/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java delete mode 100644 dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java delete mode 100644 service/src/main/java/cn/bunny/service/controller/LoginController.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/AdminPowerMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/AdminRoleMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/EmailUsersMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/SystemLogMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/UserMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/service/UserService.java delete mode 100644 service/src/main/java/cn/bunny/service/service/impl/UserServiceImpl.java delete mode 100644 service/src/main/resources/mapper/AdminPowerMapper.xml delete mode 100644 service/src/main/resources/mapper/AdminRoleMapper.xml delete mode 100644 service/src/main/resources/mapper/EmailUsersMapper.xml rename service/src/main/resources/mapper/{quartz => }/JobListMapper.xml (91%) delete mode 100644 service/src/main/resources/mapper/SystemLogMapper.xml delete mode 100644 service/src/main/resources/mapper/UserMapper.xml diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/context/BaseContext.java b/common/service-utils/src/main/java/cn/bunny/common/service/context/BaseContext.java index aaae16c..82b1072 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/context/BaseContext.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/context/BaseContext.java @@ -1,13 +1,11 @@ package cn.bunny.common.service.context; -import cn.bunny.vo.system.login.LoginVo; public class BaseContext { private static final ThreadLocal userId = new ThreadLocal<>(); - private static final ThreadLocal username = new ThreadLocal(); + private static final ThreadLocal username = new ThreadLocal<>(); private static final ThreadLocal adminId = new ThreadLocal<>(); private static final ThreadLocal adminName = new ThreadLocal<>(); - private static final ThreadLocal loginVo = new ThreadLocal<>(); // 用户id相关 public static Long getUserId() { @@ -26,18 +24,9 @@ public class BaseContext { username.set(_username); } - public static LoginVo getLoginVo() { - return loginVo.get(); - } - - public static void setLoginVo(LoginVo _loginVo) { - loginVo.set(_loginVo); - } - public static void removeUser() { username.remove(); userId.remove(); - loginVo.remove(); } // adminId 相关 diff --git a/dao/src/main/java/cn/bunny/dto/quartz/QuartzAddDto.java b/dao/src/main/java/cn/bunny/dto/QuartzAddDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dto/quartz/QuartzAddDto.java rename to dao/src/main/java/cn/bunny/dto/QuartzAddDto.java index 5bfeeec..6c4c6e0 100644 --- a/dao/src/main/java/cn/bunny/dto/quartz/QuartzAddDto.java +++ b/dao/src/main/java/cn/bunny/dto/QuartzAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dto.quartz; +package cn.bunny.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dao/src/main/java/cn/bunny/dto/QuartzDto.java b/dao/src/main/java/cn/bunny/dto/QuartzDto.java new file mode 100644 index 0000000..3666534 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dto/QuartzDto.java @@ -0,0 +1,24 @@ +package cn.bunny.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class QuartzDto { + private String jobName;// 任务名称 + private String jobGroup;// 任务分组 + private String description;// 任务描述 + private String jobClassName;// 执行类 + private String jobMethodName;// 执行方法 + private String cronExpression;// 执行时间 + private String triggerName;// 执行时间 + private String triggerState;// 任务状态 + + private String oldJobName;// 任务名称 用于修改 + private String oldJobGroup;// 任务分组 用于修改 +} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dto/quartz/QuartzOperationDto.java b/dao/src/main/java/cn/bunny/dto/QuartzOperationDto.java similarity index 91% rename from dao/src/main/java/cn/bunny/dto/quartz/QuartzOperationDto.java rename to dao/src/main/java/cn/bunny/dto/QuartzOperationDto.java index 621aac4..14c3c5f 100644 --- a/dao/src/main/java/cn/bunny/dto/quartz/QuartzOperationDto.java +++ b/dao/src/main/java/cn/bunny/dto/QuartzOperationDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dto.quartz; +package cn.bunny.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dao/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java b/dao/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java deleted file mode 100644 index 734a1c0..0000000 --- a/dao/src/main/java/cn/bunny/dto/email/EmailTemplateDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bunny.dto.email; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class EmailTemplateDto { - // 模板名称 - private String templateName; - // 主题 - private String subject; - // 邮件内容 - private String body; - // 邮件类型 - private String type; -} diff --git a/dao/src/main/java/cn/bunny/dto/email/EmailUsersDto.java b/dao/src/main/java/cn/bunny/dto/email/EmailUsersDto.java deleted file mode 100644 index be3b1b4..0000000 --- a/dao/src/main/java/cn/bunny/dto/email/EmailUsersDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bunny.dto.email; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 添加邮箱用户 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class EmailUsersDto { - // 修改时需要传 - private Long id; - // 邮箱 - private String email; - // 密码 - private String password; - // SMTP服务器 - private String host; - // 端口号 - private Integer port; - // 邮箱协议 - private Integer smtpAgreement; - // 是否为默认邮件 - private Boolean isDefault; -} diff --git a/dao/src/main/java/cn/bunny/dto/quartz/QuartzDto.java b/dao/src/main/java/cn/bunny/dto/quartz/QuartzDto.java deleted file mode 100644 index 90ab24f..0000000 --- a/dao/src/main/java/cn/bunny/dto/quartz/QuartzDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bunny.dto.quartz; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class QuartzDto { - private String jobName;// 任务名称 - private String jobGroup;// 任务分组 - private String description;// 任务描述 - private String jobClassName;// 执行类 - private String jobMethodName;// 执行方法 - private String cronExpression;// 执行时间 - private String triggerName;// 执行时间 - private String triggerState;// 任务状态 - - private String oldJobName;// 任务名称 用于修改 - private String oldJobGroup;// 任务分组 用于修改 -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dto/user/LoginDto.java b/dao/src/main/java/cn/bunny/dto/user/LoginDto.java deleted file mode 100644 index 1f4213b..0000000 --- a/dao/src/main/java/cn/bunny/dto/user/LoginDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bunny.dto.user; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class LoginDto { - // 用户名 - private String username; - // 密码 - private String password; - // 邮箱验证码 - private String emailCode; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/JobList.java b/dao/src/main/java/cn/bunny/entity/quartz/JobList.java similarity index 95% rename from dao/src/main/java/cn/bunny/entity/system/quartz/JobList.java rename to dao/src/main/java/cn/bunny/entity/quartz/JobList.java index d82238a..949edb3 100644 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/JobList.java +++ b/dao/src/main/java/cn/bunny/entity/quartz/JobList.java @@ -1,4 +1,4 @@ -package cn.bunny.entity.system.quartz; +package cn.bunny.entity.quartz; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/dao/src/main/java/cn/bunny/entity/system/admin/AdminPower.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminPower.java deleted file mode 100644 index 2544ab8..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/admin/AdminPower.java +++ /dev/null @@ -1,58 +0,0 @@ -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/dao/src/main/java/cn/bunny/entity/system/admin/AdminRole.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminRole.java deleted file mode 100644 index 59c36f4..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/admin/AdminRole.java +++ /dev/null @@ -1,55 +0,0 @@ -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") -@ApiModel(value = "AdminRole对象", description = "") -public class AdminRole implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private String id; - - @ApiModelProperty("角色名称") - private String roleName; - - @ApiModelProperty("描述") - private String description; - - @ApiModelProperty("角色代码") - private String roleCode; - - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - @ApiModelProperty("更新时间") - private LocalDateTime updateTime; - - @ApiModelProperty("操作用户") - private String updateUser; - - @ApiModelProperty("是否删除") - private Byte isDeleted; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java deleted file mode 100644 index 26370de..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/admin/AdminRolePower.java +++ /dev/null @@ -1,56 +0,0 @@ -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/dao/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java b/dao/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java deleted file mode 100644 index 78f954f..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/admin/AdminUserRole.java +++ /dev/null @@ -1,56 +0,0 @@ -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/dao/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java b/dao/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java deleted file mode 100644 index f1b3794..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/admin/auth/AuthUserRole.java +++ /dev/null @@ -1,21 +0,0 @@ -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/dao/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java b/dao/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java deleted file mode 100644 index 18cb9c2..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/email/EmailTemplate.java +++ /dev/null @@ -1,42 +0,0 @@ -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/dao/src/main/java/cn/bunny/entity/system/email/EmailUsers.java b/dao/src/main/java/cn/bunny/entity/system/email/EmailUsers.java deleted file mode 100644 index def87bb..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/email/EmailUsers.java +++ /dev/null @@ -1,49 +0,0 @@ -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/dao/src/main/java/cn/bunny/entity/system/log/SystemLog.java b/dao/src/main/java/cn/bunny/entity/system/log/SystemLog.java deleted file mode 100644 index 58d7308..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/log/SystemLog.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.bunny.entity.system.log; - -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-31 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("system_log") -@ApiModel(value = "SystemLog对象", description = "系统日志表") -public class SystemLog implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - @ApiModelProperty("所在类路径") - private String classPath; - - @ApiModelProperty("执行方法名称") - private String methodName; - - @ApiModelProperty("入参内容") - private String args; - - @ApiModelProperty("返回参数") - private String result; - - @ApiModelProperty("报错堆栈") - private String errorStack; - - @ApiModelProperty("报错") - private String errorMessage; - - @ApiModelProperty("邮箱") - private String email; - - @ApiModelProperty("用户名") - private String nickname; - - @ApiModelProperty("当前用户token") - private String token; - - @ApiModelProperty("当前用户IP地址") - private String ipAddress; - - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - @ApiModelProperty("更新时间") - private LocalDateTime updateTime; - - @ApiModelProperty("更新用户") - private Long updateUser; - - @ApiModelProperty("是否被删除") - private Boolean isDeleted; -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/entity/system/user/User.java b/dao/src/main/java/cn/bunny/entity/system/user/User.java deleted file mode 100644 index 33c086d..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/user/User.java +++ /dev/null @@ -1,61 +0,0 @@ -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/dao/src/main/java/cn/bunny/pojo/email/EmailSend.java b/dao/src/main/java/cn/bunny/pojo/email/EmailSend.java deleted file mode 100644 index 247da00..0000000 --- a/dao/src/main/java/cn/bunny/pojo/email/EmailSend.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bunny.pojo.email; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.web.multipart.MultipartFile; - -/** - * 邮件发送对象 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class EmailSend { - // 给谁发送 - private String sendTo; - // 发送主题 - private String subject; - // 是否为富文本 - private Boolean isRichText; - // 发送内容 - private String message; - // 抄送人 - private String ccParam; - // 发送的文件 - private MultipartFile[] file; -} diff --git a/dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java b/dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java deleted file mode 100644 index ca084e1..0000000 --- a/dao/src/main/java/cn/bunny/pojo/email/EmailSendInit.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bunny.pojo.email; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 邮箱发送初始化参数 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class EmailSendInit { - private Integer port; - private String host; - private String username; - private String password; -} diff --git a/dao/src/main/java/cn/bunny/pojo/enums/OperationType.java b/dao/src/main/java/cn/bunny/pojo/enums/OperationType.java deleted file mode 100644 index e15d341..0000000 --- a/dao/src/main/java/cn/bunny/pojo/enums/OperationType.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.bunny.pojo.enums; - -/** - * 数据库操作类型 - */ -public enum OperationType { - UPDATE, INSERT -} diff --git a/dao/src/main/java/cn/bunny/pojo/file/MinioFIlePath.java b/dao/src/main/java/cn/bunny/pojo/file/MinioFIlePath.java deleted file mode 100644 index f283278..0000000 --- a/dao/src/main/java/cn/bunny/pojo/file/MinioFIlePath.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.pojo.file; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class MinioFIlePath { - private String filename; - private String uuidFilename; - private String timeUuidFilename; - private String filepath; - private String bucketNameFilepath; -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java deleted file mode 100644 index afda4da..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/LocalDateTimeConstant.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -@Data -public class LocalDateTimeConstant { - public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd"; - public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm"; - public static final String DEFAULT_DATE_TIME_SECOND_FORMAT = "yyyy-MM-dd HH:mm:ss"; - public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss"; -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java deleted file mode 100644 index 9a13a7f..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/MailMessageConstant.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -/** - * 邮箱消息 - */ -@Data -public class MailMessageConstant { - public static final String EMPTY_SEND_OBJECT = "空发送对象"; - public static final String ADDRESS_NOT_NULL = "收件人不能为空"; - public static final String TITLE_NOT_NULL = "标题不能为空"; - public static final String SEND_MESSAGE_NOT_NULL = "发送消息不能为空"; - public static final String EMAIL_CONFIG_NOT_FOUND = "邮箱配置为空"; -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/MinioConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/MinioConstant.java deleted file mode 100644 index c080b1f..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/MinioConstant.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class MinioConstant { - public static final String favicon = "favicon"; - public static final String avatar = "avatar"; - public static final String article = "article"; - public static final String carousel = "carousel"; - public static final String feedback = "feedback"; - public static final String articleCovers = "articleCovers"; - public static final String articleAttachment = "articleAttachment"; - private static final Map typeMap = new HashMap<>(); - - static { - typeMap.put(favicon, "/favicon/"); - typeMap.put(avatar, "/avatar/"); - typeMap.put(article, "/article/"); - typeMap.put(carousel, "/carousel/"); - typeMap.put(feedback, "/feedback/"); - typeMap.put("articleImages", "/articleImages/"); - typeMap.put("articleVideo", "/articleVideo/"); - typeMap.put(articleCovers, "/articleCovers/"); - typeMap.put(articleAttachment, "/articleAttachment/"); - typeMap.put("images", "/images/"); - typeMap.put("video", "/video/"); - typeMap.put("default", "/default/"); - } - - public static String getType(String type) { - String value = typeMap.get(type); - if (value != null) return value; - throw new RuntimeException(FileMessageConstant.COMPOSE_OBJECT_EXCEPTION); - } -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java deleted file mode 100644 index 9ddf241..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/RedisUserConstant.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -/** - * Redis用户前缀设置 - */ -@Data -public class RedisUserConstant { - // 管理员用户 - public static final String ADMIN_LOGIN_INFO_PREFIX = "ADMIN::LOGIN_INFO::"; - public static final String ADMIN_EMAIL_CODE_PREFIX = "ADMIN::EMAIL_CODE::"; - // 普通用户 - public static final String USER_LOGIN_INFO_PREFIX = "USER::LOGIN_INFO::"; - public static final String USER_EMAIL_CODE_PREFIX = "USER::EMAIL_CODE::"; - public static final String USER_DO_LIKE_PREFIX = "USER::doLike::"; - - /** - * * 管理员用户登录信息 - * - * @param adminUser 管理员用户 - * @return 登录信息key - */ - public static String getAdminLoginInfoPrefix(String adminUser) { - return ADMIN_LOGIN_INFO_PREFIX + adminUser; - } - - /** - * * 管理员用户邮箱验证码 - * - * @param adminUser 管理员用户 - * @return 管理员用户邮箱验证码key - */ - public static String getAdminUserEmailCodePrefix(String adminUser) { - return ADMIN_EMAIL_CODE_PREFIX + adminUser; - } - - /** - * * 用户登录信息 - * - * @param user 用户名 - * @return 登录信息key - */ - public static String getUserLoginInfoPrefix(String user) { - return USER_LOGIN_INFO_PREFIX + user; - } - - /** - * * 用户邮箱验证码 - * - * @param user 用户名 - * @return 用户邮箱验证码key - */ - public static String getUserEmailCodePrefix(String user) { - return USER_EMAIL_CODE_PREFIX + user; - } - - /** - * * 用户点赞操作 - * - * @param user 用户名 - * @return 用户点赞key - */ - public static String getUserDoLikePrefix(String user) { - return USER_DO_LIKE_PREFIX + user; - } -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java deleted file mode 100644 index d2ebde4..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/SQLAutoFillConstant.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -/** - * 数据库中自动填充字段 - */ -@Data -public class SQLAutoFillConstant { - public static final String SET_CREATE_TIME = "setCreateTime"; - public static final String SET_UPDATE_TIME = "setUpdateTime"; - public static final String SET_CREATE_USER = "setCreateUser"; - public static final String SET_UPDATE_USER = "setUpdateUser"; -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java deleted file mode 100644 index 4d21335..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/SecurityConstant.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -import java.util.Arrays; -import java.util.List; - -@Data -public class SecurityConstant { - public static String[] annotations = {"/", "/test/**", "/diagram-viewer/**", "/editor-app/**", "/*.html", - "/*/*/noAuth/**", "/*/noAuth/**", "/favicon.ico", "/swagger-resources/**", "/webjars/**", "/v3/**", "/swagger-ui.html/**", "/doc.html"}; - public static List annotationsList = Arrays.asList(annotations); -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java deleted file mode 100644 index 333531e..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/StatusConstant.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -/** - * 状态常量，启用或者禁用 - */ -@Data -public class StatusConstant { - // 启用为1 - public static final Integer ENABLE = 1; - // 禁用为0 - public static final Integer DISABLE = 0; -} diff --git a/dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java b/dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java deleted file mode 100644 index b36248a..0000000 --- a/dao/src/main/java/cn/bunny/pojo/result/constant/UserConstant.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.bunny.pojo.result.constant; - -import lombok.Data; - -@Data -public class UserConstant { - public static final String USER_AVATAR = "https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83eoj0hHXhgJNOTSOFsS4uZs8x1ConecaVOB8eIl115xmJZcT4oCicvia7wMEufibKtTLqiaJeanU2Lpg3w/132"; -} diff --git a/dao/src/main/java/cn/bunny/vo/page/PageResult.java b/dao/src/main/java/cn/bunny/vo/PageResult.java similarity index 94% rename from dao/src/main/java/cn/bunny/vo/page/PageResult.java rename to dao/src/main/java/cn/bunny/vo/PageResult.java index feb66b2..e16815e 100644 --- a/dao/src/main/java/cn/bunny/vo/page/PageResult.java +++ b/dao/src/main/java/cn/bunny/vo/PageResult.java @@ -1,4 +1,4 @@ -package cn.bunny.vo.page; +package cn.bunny.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dao/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java b/dao/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java deleted file mode 100644 index 8cc34d0..0000000 --- a/dao/src/main/java/cn/bunny/vo/email/EmailTemplateVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bunny.vo.email; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class EmailTemplateVo { - // 模板名称 - private String templateName; - // 主题 - private String subject; - // 邮件内容 - private String body; -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java b/dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java deleted file mode 100644 index 087e7de..0000000 --- a/dao/src/main/java/cn/bunny/vo/system/login/LoginVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.bunny.vo.system.login; - -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; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * 用户登录返回内容 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class LoginVo { - private Long id; - private String nickName; - private String email; - private String password; - private String avatar; - private Byte sex; - private String personDescription; - @JsonFormat(pattern = LocalDateTimeConstant.DEFAULT_DATE_TIME_SECOND_FORMAT) - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private LocalDateTime joinTime; - @JsonFormat(pattern = LocalDateTimeConstant.DEFAULT_DATE_TIME_SECOND_FORMAT) - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private LocalDateTime lastLoginTime; - private String lastLoginIp; - private String lastLoginIpAddress; - private Integer totalIntegral; - private Integer currentIntegral; - private Byte status; - private String token; - private List roleList; - private List powerList; -} diff --git a/dao/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java b/dao/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java deleted file mode 100644 index 21c7ae4..0000000 --- a/dao/src/main/java/cn/bunny/vo/system/login/ValidateCodeVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bunny.vo.system.login; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Schema(description = "验证码响应结果实体类") -public class ValidateCodeVo { - @Schema(description = "验证码key") - private String codeKey; // 验证码的key - - @Schema(description = "验证码value") - private String codeValue; // 图片验证码对应的字符串数据 -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java b/dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java deleted file mode 100644 index 78e954d..0000000 --- a/dao/src/main/java/cn/bunny/vo/system/user/UserInfoVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bunny.vo.system.user; - -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; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -/** - * 获取用户信息返回参数 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class UserInfoVo { - private Long userId; - private String nickName; - private String email; - private String avatar; - private Byte sex; - private String personDescription; - @JsonFormat(pattern = LocalDateTimeConstant.DEFAULT_DATE_TIME_SECOND_FORMAT) - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private LocalDateTime joinTime; - @JsonFormat(pattern = LocalDateTimeConstant.DEFAULT_DATE_TIME_SECOND_FORMAT) - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private LocalDateTime lastLoginTime; - private String lastLoginIp; - private String lastLoginIpAddress; - private Integer totalIntegral; - private Integer currentIntegral; - private Byte status; -} diff --git a/service/src/main/java/cn/bunny/service/controller/JobController.java b/service/src/main/java/cn/bunny/service/controller/JobController.java index d4affb6..70ffb59 100644 --- a/service/src/main/java/cn/bunny/service/controller/JobController.java +++ b/service/src/main/java/cn/bunny/service/controller/JobController.java @@ -1,11 +1,11 @@ package cn.bunny.service.controller; -import cn.bunny.dto.quartz.QuartzAddDto; -import cn.bunny.dto.quartz.QuartzOperationDto; -import cn.bunny.entity.system.quartz.JobList; +import cn.bunny.dto.QuartzAddDto; +import cn.bunny.dto.QuartzOperationDto; +import cn.bunny.entity.quartz.JobList; import cn.bunny.pojo.result.Result; import cn.bunny.service.service.JobService; -import cn.bunny.vo.page.PageResult; +import cn.bunny.vo.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -26,7 +26,7 @@ public class JobController { @PathVariable Integer page, @PathVariable Integer limit ) { - Page pageParams = new Page<>(page,limit); + Page pageParams = new Page<>(page, limit); PageResult pageResult = jobService.pageQuery(pageParams); return Result.success(pageResult); } diff --git a/service/src/main/java/cn/bunny/service/controller/LoginController.java b/service/src/main/java/cn/bunny/service/controller/LoginController.java deleted file mode 100644 index 76d1491..0000000 --- a/service/src/main/java/cn/bunny/service/controller/LoginController.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bunny.service.controller; - - -import cn.bunny.dto.user.LoginDto; -import cn.bunny.pojo.result.Result; -import cn.bunny.service.service.UserService; -import cn.bunny.vo.system.login.LoginVo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Tag(name = "登录相关接口") -@RestController -@RequestMapping("/admin") -public class LoginController { - @Autowired - private UserService userService; - - @Operation(summary = "登录接口", description = "后台用户登录接口") - @PostMapping("login") - public Result login(@RequestBody LoginDto loginDto) { - LoginVo vo = userService.login(loginDto); - return Result.success(vo); - } -} diff --git a/service/src/main/java/cn/bunny/service/mapper/AdminPowerMapper.java b/service/src/main/java/cn/bunny/service/mapper/AdminPowerMapper.java deleted file mode 100644 index 0fc1686..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/AdminPowerMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.bunny.service.mapper; - -import cn.bunny.entity.system.admin.AdminPower; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-05-18 - */ -@Mapper -public interface AdminPowerMapper extends BaseMapper { - /** - * 查询用户权限信息 - * - * @param roleIdList 角色id 列表 - * @return 用户对应的权限 - */ - AdminPower[] selectByPowerWithRoleIdList(List roleIdList); - - /** - * 查询用户权限 - * - * @param userId 用户id - * @return 用户权限列表 - */ - List queryByUserIdWithPower(Long userId); -} diff --git a/service/src/main/java/cn/bunny/service/mapper/AdminRoleMapper.java b/service/src/main/java/cn/bunny/service/mapper/AdminRoleMapper.java deleted file mode 100644 index 6616caf..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/AdminRoleMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bunny.service.mapper; - -import cn.bunny.entity.system.admin.AdminRole; -import cn.bunny.entity.system.admin.auth.AuthUserRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-05-18 - */ -@Mapper -public interface AdminRoleMapper extends BaseMapper { - - /** - * 查询用户所有的角色信息 - * - * @param userId 用户id - * @return 用户对应的角色 - */ - AuthUserRole[] selectByRoleWithUserId(Long userId); -} diff --git a/service/src/main/java/cn/bunny/service/mapper/EmailUsersMapper.java b/service/src/main/java/cn/bunny/service/mapper/EmailUsersMapper.java deleted file mode 100644 index ab8b865..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/EmailUsersMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bunny.service.mapper; - -import cn.bunny.entity.system.email.EmailUsers; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-05-14 - */ -@Mapper -public interface EmailUsersMapper extends BaseMapper { - - /** - * 彻底删除邮箱用户 - * - * @param id 用户ID - */ - void thoroughDeleteById(Long id); -} diff --git a/service/src/main/java/cn/bunny/service/mapper/JobListMapper.java b/service/src/main/java/cn/bunny/service/mapper/JobListMapper.java index 520a305..bb4a941 100644 --- a/service/src/main/java/cn/bunny/service/mapper/JobListMapper.java +++ b/service/src/main/java/cn/bunny/service/mapper/JobListMapper.java @@ -1,6 +1,6 @@ package cn.bunny.service.mapper; -import cn.bunny.entity.system.quartz.JobList; +import cn.bunny.entity.quartz.JobList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/service/src/main/java/cn/bunny/service/mapper/SystemLogMapper.java b/service/src/main/java/cn/bunny/service/mapper/SystemLogMapper.java deleted file mode 100644 index 2741252..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/SystemLogMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper; - -import cn.bunny.entity.system.log.SystemLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 系统日志表 Mapper 接口 - *

- * - * @author Bunny - * @since 2024-05-31 - */ -@Mapper -public interface SystemLogMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/UserMapper.java b/service/src/main/java/cn/bunny/service/mapper/UserMapper.java deleted file mode 100644 index 83ac911..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/UserMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.bunny.service.mapper; - -import cn.bunny.entity.system.user.User; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 用户信息 Mapper 接口 - *

- * - * @author Bunny - * @since 2024-05-18 - */ -@Mapper -public interface UserMapper extends BaseMapper { - /** - * 前台用户登录接口 - * - * @param username 邮箱/昵称 - * @param password 吗，Image - * @return 登录参数 - */ - User login(String username, String password); -} diff --git a/service/src/main/java/cn/bunny/service/service/JobService.java b/service/src/main/java/cn/bunny/service/service/JobService.java index fac71ff..f747b92 100644 --- a/service/src/main/java/cn/bunny/service/service/JobService.java +++ b/service/src/main/java/cn/bunny/service/service/JobService.java @@ -1,9 +1,9 @@ package cn.bunny.service.service; -import cn.bunny.dto.quartz.QuartzAddDto; -import cn.bunny.dto.quartz.QuartzOperationDto; -import cn.bunny.entity.system.quartz.JobList; -import cn.bunny.vo.page.PageResult; +import cn.bunny.dto.QuartzAddDto; +import cn.bunny.dto.QuartzOperationDto; +import cn.bunny.entity.quartz.JobList; +import cn.bunny.vo.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/service/service/UserService.java b/service/src/main/java/cn/bunny/service/service/UserService.java deleted file mode 100644 index 2cd615f..0000000 --- a/service/src/main/java/cn/bunny/service/service/UserService.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bunny.service.service; - -import cn.bunny.dto.user.LoginDto; -import cn.bunny.entity.system.user.User; -import cn.bunny.vo.system.login.LoginVo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 用户信息 服务类 - *

- * - * @author Bunny - * @since 2024-05-18 - */ -public interface UserService extends IService { - /** - * 前台用户登录接口 - * - * @param loginDto 登录参数 - * @return 登录后结果返回 - */ - LoginVo login(LoginDto loginDto); -} diff --git a/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java b/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java index 40c360e..5a3017b 100644 --- a/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java +++ b/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.service.service.impl; -import cn.bunny.dto.quartz.QuartzAddDto; -import cn.bunny.dto.quartz.QuartzOperationDto; -import cn.bunny.entity.system.quartz.JobList; +import cn.bunny.dto.QuartzAddDto; +import cn.bunny.dto.QuartzOperationDto; +import cn.bunny.entity.quartz.JobList; import cn.bunny.service.mapper.JobListMapper; import cn.bunny.service.service.JobService; -import cn.bunny.vo.page.PageResult; +import cn.bunny.vo.PageResult; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/service/service/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/service/service/impl/UserServiceImpl.java deleted file mode 100644 index c72619c..0000000 --- a/service/src/main/java/cn/bunny/service/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.bunny.service.service.impl; - -import cn.bunny.common.service.utils.EmptyUtil; -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.user.User; -import cn.bunny.pojo.result.constant.ExceptionConstant; -import cn.bunny.service.mapper.AdminPowerMapper; -import cn.bunny.service.mapper.AdminRoleMapper; -import cn.bunny.service.mapper.EmailUsersMapper; -import cn.bunny.service.mapper.UserMapper; -import cn.bunny.service.service.UserService; -import cn.bunny.vo.system.login.LoginVo; -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.DigestUtils; - -import java.util.Arrays; -import java.util.List; - -/** - *

- * 用户信息 服务实现类 - *

- * - * @author Bunny - * @since 2024-05-18 - */ -@Service -@DS("master") -public class UserServiceImpl extends ServiceImpl implements UserService { - @Autowired - private AdminRoleMapper roleMapper; - @Autowired - private AdminPowerMapper powerMapper; - @Autowired - private EmailUsersMapper emailUsersMapper; - - /** - * 前台用户登录接口 - * - * @param loginDto 登录参数 - * @return 登录后结果返回 - */ - @Override - public LoginVo login(LoginDto loginDto) { - // 判断用户和密码是否为空 - String username = loginDto.getUsername(); - EmptyUtil.isEmpty(username, ExceptionConstant.USERNAME_IS_EMPTY_Exception); - // 密码不能为空 - EmptyUtil.isEmpty(loginDto.getPassword(), ExceptionConstant.PASSWORD_NOT_EMPTY_Exception); - String password = DigestUtils.md5DigestAsHex(loginDto.getPassword().getBytes()); - // 查询数据库，用户对应的角色、权限 - User user = baseMapper.login(username, password); - Long userId = user.getId(); - - // 查询用户所有的角色信息 - AuthUserRole[] roleList = roleMapper.selectByRoleWithUserId(userId); - List roleCodeList = Arrays.stream(roleList).map(AuthUserRole::getRoleCode).toList(); - List roleIdList = Arrays.stream(roleList).map(AuthUserRole::getRoleId).toList(); - // 查询用户权限信息 - AdminPower[] adminPowerList = powerMapper.selectByPowerWithRoleIdList(roleIdList); - List powerCodeList = Arrays.stream(adminPowerList).map(AdminPower::getPowerCode).toList(); - - // 设置返回类型 - LoginVo loginVo = new LoginVo(); - BeanUtils.copyProperties(user, loginVo); - String token = JwtHelper.createToken(loginVo.getId(), loginVo.getEmail(), 7); - loginVo.setToken(token); - loginVo.setRoleList(roleCodeList); - loginVo.setPowerList(powerCodeList); - - return loginVo; - } -} diff --git a/service/src/main/resources/mapper/AdminPowerMapper.xml b/service/src/main/resources/mapper/AdminPowerMapper.xml deleted file mode 100644 index 842029f..0000000 --- a/service/src/main/resources/mapper/AdminPowerMapper.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, power_name, power_code, description, create_time, update_time, update_user, is_delete - - - - - - - - diff --git a/service/src/main/resources/mapper/AdminRoleMapper.xml b/service/src/main/resources/mapper/AdminRoleMapper.xml deleted file mode 100644 index 8e11472..0000000 --- a/service/src/main/resources/mapper/AdminRoleMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, role_name, description, role_code, create_time, update_time, update_user, is_deleted - - - - - diff --git a/service/src/main/resources/mapper/EmailUsersMapper.xml b/service/src/main/resources/mapper/EmailUsersMapper.xml deleted file mode 100644 index 29b04db..0000000 --- a/service/src/main/resources/mapper/EmailUsersMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id, email, password, host, port, create_time, update_time, update_user, is_delete - - - - - delete - from email_users - where id = #{id} - - - diff --git a/service/src/main/resources/mapper/quartz/JobListMapper.xml b/service/src/main/resources/mapper/JobListMapper.xml similarity index 91% rename from service/src/main/resources/mapper/quartz/JobListMapper.xml rename to service/src/main/resources/mapper/JobListMapper.xml index 2d05d6e..4a1d722 100644 --- a/service/src/main/resources/mapper/quartz/JobListMapper.xml +++ b/service/src/main/resources/mapper/JobListMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/SystemLogMapper.xml b/service/src/main/resources/mapper/SystemLogMapper.xml deleted file mode 100644 index c7c0feb..0000000 --- a/service/src/main/resources/mapper/SystemLogMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - id, class_path, method_name, args, result, error_stack, error_message, email, nickname, token, create_time, update_time, update_user, is_deleted - - - diff --git a/service/src/main/resources/mapper/UserMapper.xml b/service/src/main/resources/mapper/UserMapper.xml deleted file mode 100644 index 6ee63e7..0000000 --- a/service/src/main/resources/mapper/UserMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, nick_name, email, password, avatar, sex, person_description, join_time, last_login_time, last_login_ip, last_login_ip_address, total_integral, current_integral, status, create_time, update_time, update_user, is_deleted - - - - -